diff --git a/src/permission.ts b/src/permission.ts index e41d80c745af0bc0919fa636c0d1ecf49232eb5d..b6c5380139eacbd78fb405955e52850d7f021122 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -6,7 +6,7 @@ import 'nprogress/nprogress.css'; NProgress.configure({ showSpinner: false }); // 进度环显示/隐藏 // 白名单路由 -const whiteList = ['/login', '/auth-redirect']; +const whiteList = ['/login']; router.beforeEach(async (to, from, next) => { NProgress.start(); @@ -21,7 +21,7 @@ router.beforeEach(async (to, from, next) => { const hasGetUserInfo = user.roles.length > 0; if (hasGetUserInfo) { if (to.matched.length === 0) { - from.name ? next({ name: from.name }) : next('/'); + from.name ? next({ name: from.name }) : next('/401'); } else { next(); } diff --git a/src/router/index.ts b/src/router/index.ts index 33c539ec8a268cfca386f998b7ea59799c074691..36e4fed92ac513ba0b8b6a35d6333ccbd7d720c2 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -27,11 +27,7 @@ export const constantRoutes: Array = [ component: () => import('@/views/error-page/404.vue'), meta: { hidden: true } }, - { - path: '/401', - component: () => import('@/views/error-page/401.vue'), - meta: { hidden: true } - }, + { path: '/', component: Layout, @@ -42,7 +38,12 @@ export const constantRoutes: Array = [ component: () => import('@/views/dashboard/index.vue'), name: 'Dashboard', meta: { title: 'dashboard', icon: 'homepage', affix: true } - } + }, + { + path: '401', + component: () => import('@/views/error-page/401.vue'), + meta: { hidden: true } + }, ] }