diff --git a/src/permission.js b/src/permission.js index d2627c8..4161ba1 100644 --- a/src/permission.js +++ b/src/permission.js @@ -13,31 +13,30 @@ router.beforeEach((to, from, next) => { NProgress.start() // 设置title document.title = getPageTitle(to.meta.title) - // 路由 - store.commit('user/initUser')// 用户信息初始化 PS:token不存在 执行且执行一次 + + store.commit('user/initUser') // 用户信息初始化 const power = store.state.user.power const token = store.state.user.token - if (token === null) { + + if (!token) { if (to.path === '/login') { next() - NProgress.done() } else { - next('/login') - NProgress.done() + next('/login') // 直接调用 next('/login') } } else { if (to.path === '/login') { next('/') - NProgress.done() } else { - if (to.meta.roles.indexOf(power) >= 0) { // 判断 roles权限 有权限打开页面 没权限跳转到首页 + if (to.meta.roles && to.meta.roles.indexOf(power) >= 0) { // 确保 roles 存在 next() } else { next('/') } - NProgress.done() } } + + NProgress.done() }) /** @@ -53,9 +52,5 @@ router.afterEach(() => { * @param {*} pageTitle 路由mate.tiele */ function getPageTitle (pageTitle) { - if (pageTitle) { - return `${pageTitle} - ${store.state.settings.title}` - } else { - return store.state.settings.title - } + return pageTitle ? `${pageTitle} - ${store.state.settings.title}` : store.state.settings.title }