|
|
@@ -2,32 +2,24 @@ import router from './router'
|
|
|
import store from './store'
|
|
|
import NProgress from 'nprogress' // progress bar
|
|
|
import 'nprogress/nprogress.css' // progress bar style
|
|
|
-// import { getToken } from '@/utils/auth' // get token from cookie
|
|
|
|
|
|
NProgress.configure({ showSpinner: false }) // NProgress Configuration
|
|
|
|
|
|
-const whiteList = ['/login',] // no redirect whitelist
|
|
|
+const whiteList = ['/login'] // no redirect whitelist
|
|
|
|
|
|
-router.beforeEach(async(to, from, next) => {
|
|
|
+router.beforeEach(async (to, from, next) => {
|
|
|
// start progress bar
|
|
|
NProgress.start()
|
|
|
- // set page title
|
|
|
|
|
|
- // determine whether the user has logged in
|
|
|
- // const hasToken = getToken()
|
|
|
const hasToken = store.getters.token
|
|
|
|
|
|
if (hasToken) {
|
|
|
if (to.path === '/login') {
|
|
|
- // if is logged in, redirect to the home page
|
|
|
-
|
|
|
+ // 如果已登录，重定向到主页
|
|
|
next({ path: '/' })
|
|
|
NProgress.done()
|
|
|
} else {
|
|
|
const userinfo = store.getters.userinfo && Object.keys(store.getters.userinfo).length > 0
|
|
|
- console.log('store.getters', store.getters)
|
|
|
- console.log('userinfo', userinfo)
|
|
|
- // console.log('to', {...to} )
|
|
|
if (userinfo) {
|
|
|
next()
|
|
|
} else {
|
|
|
@@ -38,22 +30,20 @@ router.beforeEach(async(to, from, next) => {
|
|
|
|
|
|
next({ ...to, replace: true })
|
|
|
} catch (error) {
|
|
|
- // remove token and go to login page to re-login
|
|
|
- // await store.dispatch('user/resetToken')
|
|
|
- // Notify({ type: 'danger', message: error || '发生异常' })
|
|
|
+ // 如果获取用户信息失败，重置 token 并重定向到登录页面
|
|
|
+ await store.dispatch('user/resetToken')
|
|
|
next(`/login?redirect=${to.path}`)
|
|
|
NProgress.done()
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- // next()
|
|
|
- /* has no token*/
|
|
|
+ // 没有 token
|
|
|
if (whiteList.indexOf(to.path) !== -1) {
|
|
|
- // in the free login whitelist, go directly
|
|
|
+ // 在免登录白名单中，直接进入
|
|
|
next()
|
|
|
} else {
|
|
|
- // // other pages that do not have permission to access are redirected to the login page.
|
|
|
+ // 其他没有权限访问的页面重定向到登录页面
|
|
|
next(`/login?redirect=${to.path}`)
|
|
|
NProgress.done()
|
|
|
}
|
