|
@@ -4,11 +4,11 @@ import getPageTitle from '@/utils/page'
|
|
|
|
|
|
let asyncRouterFlag = 0
|
|
let asyncRouterFlag = 0
|
|
|
|
|
|
-const whiteList = ['login','init']
|
|
|
|
-router.beforeEach(async(to, from, next) => {
|
|
|
|
|
|
+const whiteList = ['login', 'init']
|
|
|
|
+router.beforeEach(async (to, from, next) => {
|
|
const token = store.getters['user/token']
|
|
const token = store.getters['user/token']
|
|
- // 在白名单中的判断情况
|
|
|
|
- //修改网页标签名称
|
|
|
|
|
|
+ // 在白名单中的判断情况
|
|
|
|
+ //修改网页标签名称
|
|
document.title = getPageTitle(to.meta.title)
|
|
document.title = getPageTitle(to.meta.title)
|
|
if (whiteList.indexOf(to.name) > -1) {
|
|
if (whiteList.indexOf(to.name) > -1) {
|
|
if (token) {
|
|
if (token) {
|
|
@@ -24,10 +24,16 @@ router.beforeEach(async(to, from, next) => {
|
|
asyncRouterFlag++
|
|
asyncRouterFlag++
|
|
await store.dispatch('router/SetAsyncRouter')
|
|
await store.dispatch('router/SetAsyncRouter')
|
|
const asyncRouters = store.getters['router/asyncRouters']
|
|
const asyncRouters = store.getters['router/asyncRouters']
|
|
- router.addRoutes(asyncRouters)
|
|
|
|
- next({...to, replace: true })
|
|
|
|
|
|
+ asyncRouters.forEach(item => {
|
|
|
|
+ router.addRoute(item)
|
|
|
|
+ })
|
|
|
|
+ next({ ...to, replace: true })
|
|
} else {
|
|
} else {
|
|
- next()
|
|
|
|
|
|
+ if (to.matched.length) {
|
|
|
|
+ next()
|
|
|
|
+ } else {
|
|
|
|
+ next({ path: "/layout/404" })
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 不在白名单中并且未登陆的时候
|
|
// 不在白名单中并且未登陆的时候
|