Merge branch 'master' of http://47.112.200.206:3000/aijia/kmt

# Conflicts:
#	src/components/MenuComponent.vue

src/permission.js

@@ -1,45 +1,45 @@
-// import router from './router'
-// import store from './store'
-// import { Message } from 'element-ui'
-// import { getToken } from '@/utils/auth' // 验权
+import router from './router'
+import store from './store'
+import { Message } from 'element-ui'
+import { getToken } from '@/utils/auth' // 验权
 
-// const whiteList = ['/login', '/aikmt/redirect_uri'] // 不重定向白名单
-// router.beforeEach((to, from, next) => {
-//   if (getToken()) { // 判断是否有token
-//     // debugger
-//     if (to.path === '/login') {
-//       next()
-//     } else {
-//       if (store.getters.roles.length === 0) {
-//         console.log('roles====0')
-//         store.dispatch('GetInfo').then(res => { // 拉取用户信息
-//             console.log('roles====1')
-//             console.log(res)
-//           const roles = res.data.role // note: roles must be a array! such as: ['1']
-//           console.log('roles?', roles)
-//           store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
-//             console.log('addrouters', store.getters.addRouters)
-//             console.log('roles====3')
-//             router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
-//             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
-//           })
-//         }).catch(() => {
-//           store.dispatch('FedLogOut').then(() => {
-//             Message.error('验证失败,请重新登录')
-//             next({ path: '/login' })
-//             console.log('roles====5')
-//           })
-//         })
-//       } else {
-//         console.log('====6')
-//         next() // 当有用户权限的时候，说明所有可访问路由已生成 如访问没权限的全面会自动进入404页面
-//       }
-//     }
-//   } else {
-//     if (whiteList.indexOf(to.path) !== -1) {
-//       next()
-//     } else {
-//       next('/login')
-//     }
-//   }
-// })
+const whiteList = ['/login', '/aikmt/redirect_uri'] // 不重定向白名单
+router.beforeEach((to, from, next) => {
+  if (getToken()) { // 判断是否有token
+    // debugger
+    if (to.path === '/login') {
+      next()
+    } else {
+      if (store.getters.roles.length === 0) {
+        console.log('roles====0')
+        store.dispatch('GetInfo').then(res => { // 拉取用户信息
+            console.log('roles====1')
+            console.log(res)
+          const roles = res.data.role // note: roles must be a array! such as: ['1']
+          console.log('roles?', roles)
+          store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
+            console.log('addrouters', store.getters.addRouters)
+            console.log('roles====3')
+            router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
+            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          })
+        }).catch(() => {
+          store.dispatch('FedLogOut').then(() => {
+            Message.error('验证失败,请重新登录')
+            next({ path: '/login' })
+            console.log('roles====5')
+          })
+        })
+      } else {
+        console.log('====6')
+        next() // 当有用户权限的时候，说明所有可访问路由已生成 如访问没权限的全面会自动进入404页面
+      }
+    }
+  } else {
+    if (whiteList.indexOf(to.path) !== -1) {
+      next()
+    } else {
+      next('/login')
+    }
+  }
+})