|
@@ -3,7 +3,7 @@ import store from './store'
|
|
|
import { Message } from 'element-ui'
|
|
|
import NProgress from 'nprogress' // progress bar
|
|
|
import 'nprogress/nprogress.css' // progress bar style
|
|
|
-import { getToken } from '@/utils/auth' // get token from cookie
|
|
|
+import { getToken, removeToken, getConfig } from '@/utils/auth' // get token from cookie
|
|
|
import getPageTitle from '@/utils/get-page-title'
|
|
|
|
|
|
NProgress.configure({ showSpinner: false }) // NProgress Configuration
|
|
@@ -20,18 +20,25 @@ router.beforeEach(async (to, from, next) => {
|
|
|
const hasToken = getToken()
|
|
|
|
|
|
if (hasToken) {
|
|
|
- if (to.path === '/login') {
|
|
|
- // if is logged in, redirect to the home page
|
|
|
- next({ path: '/' })
|
|
|
- NProgress.done()
|
|
|
- } else {
|
|
|
- try {
|
|
|
- next()
|
|
|
- } catch (error) {
|
|
|
- Message.error(error || 'Has Error')
|
|
|
- next(`/login?redirect=${to.path}`)
|
|
|
+ let config = getConfig();
|
|
|
+ if (config) {
|
|
|
+ if (to.path === '/login') {
|
|
|
+ // if is logged in, redirect to the home page
|
|
|
+ next({ path: '/' })
|
|
|
NProgress.done()
|
|
|
+ } else {
|
|
|
+ try {
|
|
|
+ next()
|
|
|
+ } catch (error) {
|
|
|
+ Message.error(error || 'Has Error')
|
|
|
+ next(`/login?redirect=${to.path}`)
|
|
|
+ NProgress.done()
|
|
|
+ }
|
|
|
}
|
|
|
+ } else {
|
|
|
+ removeToken();
|
|
|
+ next(`/login?redirect=${to.path}`)
|
|
|
+ NProgress.done()
|
|
|
}
|
|
|
} else {
|
|
|
/* has no token*/
|