Merge branch 'master' into f-1002866

src/store/modules/permission.js

@@ -1,7 +1,7 @@
 import auth from '@/plugins/auth';
 import router, { constantRoutes, dynamicRoutes } from '@/router';
-import { getMenus } from '@/api/menu';
-import{ getMenuList } from './mock'
+import { getRouters, getMenus } from '@/api/menu';
+import { getMenuList } from './mock';
 import Layout from '@/layout/index';
 import ParentView from '@/components/ParentView';
 import InnerLink from '@/layout/components/InnerLink';
@@ -35,10 +35,18 @@ const permission = {
   },
   actions: {
     // 生成路由
-    GenerateRoutes({ commit }) {
+    GenerateRoutes(context) {
+      const { commit, rootGetters } = context;
+      const { userLoginname } = rootGetters.userInfo || {};
+
       return new Promise((resolve) => {
+        let action = getRouters;
+        if (userLoginname === 'admin') {
+          action = getMenus;
+        }
         // 向后端请求路由数据
-          const menuDataList = recursionUpdateRouterPath([]);
+        action().then((res) => {
+          const menuDataList = recursionUpdateRouterPath(res.data);
 
           const sdata = JSON.parse(JSON.stringify(menuDataList));
           const rdata = JSON.parse(JSON.stringify(menuDataList));
@@ -92,6 +100,7 @@ const permission = {
 
           resolve(rewriteRoutes);
         });
+      });
     }
   }
 };