|
@@ -13,19 +13,19 @@ const router = vueRouter.createRouter({
|
|
|
});
|
|
|
|
|
|
//路由拦截
|
|
|
-router.beforeEach(async (to, from, next) => {
|
|
|
+router.beforeResolve(async (to) => {
|
|
|
NProgress.start();
|
|
|
const token = getToken()
|
|
|
if (to.path === '/login') {
|
|
|
- next()
|
|
|
+ return true
|
|
|
} else if (!token) {
|
|
|
- next('/login')
|
|
|
+ return '/login'
|
|
|
} else {
|
|
|
const res = await getRouterData(to.name)
|
|
|
if (res) {
|
|
|
- next()
|
|
|
+ return true
|
|
|
} else {
|
|
|
- next('/404')
|
|
|
+ return '/login'
|
|
|
}
|
|
|
}
|
|
|
})
|