ccj 2 年之前
父節點
當前提交
0f316cace7
共有 2 個文件被更改,包括 27 次插入28 次删除
  1. 4 5
      src/permission.js
  2. 23 23
      src/store/modules/permission.js

+ 4 - 5
src/permission.js

@@ -14,8 +14,7 @@ NProgress.configure({
   showSpinner: false
 }) // NProgress Configuration
 
-const whiteList = ['/login'] // no redirect whitelist
-
+const whiteList = ['/login', '/dashboard'] // no redirect whitelist
 router.beforeEach(async (to, from, next) => {
   // start progress bar
   NProgress.start()
@@ -39,8 +38,8 @@ router.beforeEach(async (to, from, next) => {
       } else {
         try {
           // get user info
-          const accessRoutes = await store.dispatch('permission/generateRoutes');
-          router.addRoutes(accessRoutes);
+          // const accessRoutes = await store.dispatch('permission/generateRoutes');
+          // router.addRoutes(accessRoutes);
           // const {
           //   roles
           // } = await store.dispatch('user/getInfo')
@@ -57,7 +56,7 @@ router.beforeEach(async (to, from, next) => {
     }
   } else {
     /* has no token*/
-
+    console.error(to.path)
     if (whiteList.indexOf(to.path) !== -1) {
       // in the free login whitelist, go directly
       next()

+ 23 - 23
src/store/modules/permission.js

@@ -124,30 +124,30 @@ const leftMenu = (menuList, {
 }
 
 const actions = {
-  generateRoutes({
-    commit
-  }) {
-    return new Promise(async resolve => {
-      getRoule().then(response => {
-        const roles = []
-        handleRoles(response.data, roles, '')
-        console.log('roles', roles)
-        const accessedRoutes = filterAsyncRoutes(constantRoutes, roles)
+//   generateRoutes({
+//     commit
+//   }) {
+//     return new Promise(async resolve => {
+//       getRoule().then(response => {
+//         const roles = []
+//         handleRoles(response.data, roles, '')
+//         console.log('roles', roles)
+//         const accessedRoutes = filterAsyncRoutes(constantRoutes, roles)
 
-        commit('user/SET_ROLES', roles, {
-          root: true
-        })
-        commit('SET_ROUTES', accessedRoutes)
-        resolve(accessedRoutes)
-      }).catch((err) => {
-        console.error('获取角色错误')
-        clearStorage()
-        resetRouter()
-        removeToken()
-        window.location.href='https://admin.changyuntong56.com/#/login'
-      })
-    })
-  }
+//         commit('user/SET_ROLES', roles, {
+//           root: true
+//         })
+//         commit('SET_ROUTES', accessedRoutes)
+//         resolve(accessedRoutes)
+//       }).catch((err) => {
+//         console.error('获取角色错误')
+//         clearStorage()
+//         resetRouter()
+//         removeToken()
+//         window.location.href='https://admin.changyuntong56.com/#/login'
+//       })
+//     })
+//   }
 }
 
 export default {