|
@@ -47,10 +47,8 @@ router.beforeEach(async(to, from, next) => {
|
|
next()
|
|
next()
|
|
} else {
|
|
} else {
|
|
|
|
|
|
-
|
|
|
|
store.commit('getMiddleConfig')
|
|
store.commit('getMiddleConfig')
|
|
|
|
|
|
-
|
|
|
|
try {
|
|
try {
|
|
if (loginInterception) {
|
|
if (loginInterception) {
|
|
await store.dispatch('user/getUserInfo')
|
|
await store.dispatch('user/getUserInfo')
|
|
@@ -74,23 +72,21 @@ router.beforeEach(async(to, from, next) => {
|
|
console.log(accessRoutes)
|
|
console.log(accessRoutes)
|
|
|
|
|
|
// alert('判断是否显示中间页的middleStatus值' + store.state.middleStatus)
|
|
// alert('判断是否显示中间页的middleStatus值' + store.state.middleStatus)
|
|
- var flag = false
|
|
|
|
|
|
|
|
- // alert(flag)
|
|
|
|
-
|
|
|
|
- if (store.state.middleStatus == 1 && flag == false) {
|
|
|
|
|
|
+ // alert(store.state.firstMiddleState)
|
|
|
|
+ if (store.state.middleStatus == 1 && store.state.firstMiddleState == true) {
|
|
next('/middle')
|
|
next('/middle')
|
|
- flag = true
|
|
|
|
} else {
|
|
} else {
|
|
|
|
+ // alert(store.state.homePageUrl)
|
|
|
|
+ next(accessRoutes[0].children[0].path)
|
|
|
|
+ // if (store.state.homePageUrl) {
|
|
|
|
+ // var pathUrl = (store.state.homePageUrl).slice(8);
|
|
|
|
+ // next(pathUrl)
|
|
|
|
|
|
- if (store.state.homePageUrl) {
|
|
|
|
- var pathUrl = (store.state.homePageUrl).slice(8);
|
|
|
|
- next(pathUrl)
|
|
|
|
-
|
|
|
|
- } else {
|
|
|
|
- next(accessRoutes[0].children[0].path)
|
|
|
|
|
|
+ // } else {
|
|
|
|
+ // next(accessRoutes[0].children[0].path)
|
|
|
|
|
|
- }
|
|
|
|
|
|
+ // }
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|