zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge bb9bff00af into 3cc3e134c2

This commit is contained in:
phoenix110 2018-03-20 09:10:48 +00:00 committed by GitHub
parent 3cc3e134c2 bb9bff00af
commit 89b061ae5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/permission.js
View File

@ -17,9 +17,9 @@ function hasPermission(roles, permissionRoles) {
const whiteList = ['/login', '/authredirect']// no redirect whitelist const whiteList = ['/login', '/authredirect']// no redirect whitelist
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
NProgress.start() // start progress bar NProgress.start() // 开启Progress
if (getToken()) { // determine if there has token const token = getToken()
/* has token*/ if (typeof (token) === 'undefined') { // 判断是否有token
if (to.path === '/login') { if (to.path === '/login') {
next({ path: '/' }) next({ path: '/' })
NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it NProgress.done() // if current page is dashboard will not trigger afterEach hook, so manually handle it