|
@@ -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, getUserId } from '@/utils/auth' // get token from cookie
|
|
|
import getPageTitle from '@/utils/get-page-title'
|
|
|
|
|
|
NProgress.configure({ showSpinner: false }) // NProgress Configuration
|
|
@@ -25,7 +25,7 @@ router.beforeEach(async(to, from, next) => {
|
|
|
// NProgress.done() // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939
|
|
|
return
|
|
|
}
|
|
|
- const hasToken = getToken()
|
|
|
+ const hasToken = getToken() && getUserId()
|
|
|
//
|
|
|
if( hasToken ){
|
|
|
next()
|