统一用户getinfo的时候返回路由表，过滤路由表

src/permission.js

@@ -14,20 +14,15 @@ router.beforeEach((to, from, next) => {
       next({
         path: '/'
       })
-    } else {
-      if (store.getters.roles.length === 0) {
+    } else {   
+      if (store.getters.addRouters.length === 0) {
         store.dispatch('GetInfo').then(res => {
-          console.log(res.data);
-          const roles = res.data.data.Roles.split(',')
-          store.dispatch('GenerateRoutes', {
-            roles
-          }).then(() => {
-            router.addRoutes(store.getters.addRouters)
-            next({ ...to
-            })
-          })
+
+          router.addRoutes(store.getters.addRouters)
+          next({ ...to})
         })
-      } else {
+      } 
+      else {
         next()
       }
     }

src/router/index.js

@@ -39,7 +39,7 @@ export default new Router({
   routes: constantRouterMap
 })
 
-export const asyncRouterMap = [
+ const asyncRouterMap = [
 
 
   {

src/store/getters.js

@@ -6,9 +6,7 @@ const getters = {
   cachedViews: state => state.tagsView.cachedViews,
   realname:state=>state.user.realname,
   name: state => state.user.name,
-  roles: state => state.user.roles,
-  permission_routers: state => state.permission.routers,
-  addRouters: state => state.permission.addRouters,
-  AllRouters:state=>state.permission.AllRouters
+  permission_routers: state => state.user.routers,
+  addRouters: state => state.user.addRouters
 }
 export default getters

src/store/index.js

@@ -2,7 +2,6 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import app from './modules/app'
 import user from './modules/user'
-import permission from './modules/permission'
 import tagsView from './modules/tagsView'
 
 import getters from './getters'
@@ -13,8 +12,7 @@ const store = new Vuex.Store({
   modules: {
     app,
     user,
-    tagsView,
-    permission
+    tagsView
   },
   getters
 })

src/store/modules/user.js

@@ -11,25 +11,60 @@ import {
 import {
   ChangePassword
 } from '@/api/system/users'
+import { constantRouterMap } from '@/router/index'
+
+import 'nprogress/nprogress.css' // Progress 进度条样式
+import Layout from '@/views/layout/Layout'
+
+const _import = require('@/router/_import_' + process.env.NODE_ENV)
+
+function filterAsyncRouter(asyncRouterMap) { //遍历后台传来的路由字符串，转换为组件对象
+  const accessedRouters = asyncRouterMap.filter(route => {
+    if (route.component) {
+   if (route.component === 'Layout') {//Layout组件特殊处理
+        route.component = Layout
+      } else {
+        route.component = _import(route.component)
+      }
+    }
+    if (route.children && route.children.length) {
+      route.children = filterAsyncRouter(route.children)
+    }
+    return true
+  })
+
+  return accessedRouters
+}
+
+
+
 const user = {
   state: {
     token: getToken(),
     name: '', //用户昵称名
-    realname:'',//用户登录名
-    roles: []
+    realname: '', //用户登录名
+    routers: constantRouterMap,
+    addRouters: []  
+
   },
 
   mutations: {
+
+    SET_ROUTERS: (state, routers) => {
+      state.addRouters = routers.push({path:"*",redirect:'/404',hidden:true})
+      state.routers = constantRouterMap.concat(routers)
+    },
+
+
+
     SET_TOKEN: (state, token) => {
       state.token = token
     },
     SET_NAME: (state, name) => {
       state.name = name
     },
 
-    SET_ROLES: (state, roles) => {
-      state.roles = roles
-    },
+
     SET_REALNAME: (state, realname) => {
       state.realname = realname
     }
@@ -47,8 +82,8 @@ const user = {
           if (data.code == 200) {
             console.log(data.data);
             setToken(data.data)
- 
-            
+
+
             commit('SET_TOKEN', data.data)
             resolve(data)
 
@@ -75,28 +110,39 @@ const user = {
 
           const data = response.data.data
           console.log(data);
-          commit('SET_ROLES', data.Roles)
           commit('SET_NAME', data.RealName)
           commit('SET_REALNAME', data.UserName)
+
+
+          commit('SET_ROUTERS', filterAsyncRouter(data.Routers))
+
 
-          resolve(response)
+
+          resolve(data)
         }).catch(error => {
           reject(error)
         })
       })
     },
 
 
-    // 前端 登出
+    //  登出
     FedLogOut({
       commit
     }) {
       return new Promise(resolve => {
         commit('SET_TOKEN', '')
         commit('SET_ROLES', [])
+        logout().then(res => {
+          if (res.data.code === 200) {
+            removeToken()
+            resolve()
+          } else
+            reject()
+        }).catch(err => {
+          reject(err)
+        })
 
-        removeToken()
-        resolve()
       })
     },
 

src/utils/fetch.js

@@ -4,7 +4,7 @@ import {
 } from 'element-ui'
 import store from '../store'
 import {
-  getToken
+  getToken,setToken
 } from '@/utils/auth'
 
 // 创建axios实例
@@ -33,21 +33,21 @@ service.interceptors.request.use(config => {
 service.interceptors.response.use(
   response => {
     const res = response.data
-    // 400:帐号信息与token不匹配  需要重新拉取token
-    if (res.code === 401) {
+    // 401 403 :帐号信息与token不匹配  需要重新拉取token
+    if (res.code === 401||res.code === 403) {
       MessageBox.alert('帐号信息发生变化，请重新登录', {
         confirmButtonText: '重新登录',
         showCancelButton: false,
         type: 'warning'
       }).then(() => {
-        store.dispatch('FedLogOut').then(() => {
+        setToken("")
           location.reload() // 为了重新实例化vue-router对象 避免bug 
-        })
       })
       return Promise.reject(error)
 
-    } else {
-      if (res.code !== 200) { //增删改操作的状态返回
+    } 
+    else {
+      if (res.code !== 200) { //后台报错信息显示
 
           Message({
             message: res.message,
@@ -58,7 +58,7 @@ service.interceptors.response.use(
 
       }
 
-      else if(res.data==null)
+       if(res.message!==""&&res.message!=null&&res.message!=="SUCCESS")  //统一显示后台返回结果
 
       {
         Message({

src/views/system/role.vue

@@ -75,8 +75,7 @@ import {
   UpdateRole
 } from "@/api/system/role";
 import { mapGetters } from "vuex";
-import { asyncRouterMap } from "@/router/index";
-
+import store from '@/store'
 export default {
   data() {
     return {
@@ -111,7 +110,7 @@ export default {
   created() {
     this.fetchData(this.listQuery);
 
-    let arr = asyncRouterMap;
+    let arr = store.getters.AddRouters;
 
     for (let i = 0; i < arr.length; i++) {
       if (arr[i].hidden) {