Merge branch 'feature/permission-0723-ch' into msb_test

.env

@@ -1,4 +1,4 @@
-VITE_BASE_URL=http://192.168.10.27:8090
+VITE_BASE_URL=https://k8s-horse-gateway.mashibing.cn
 VITE_SOCKET_URL=wss://k8s-horse-gateway.mashibing.cn/ws
 VITE_BROWSER_URL = https://k8s-shop-pc.mashibing.cn
 

src/store/modules/core/auth.js

@@ -18,6 +18,21 @@ const _verifyPermission = (data, permissionData) => {
         return isPermission;
     });
 };
+
+/**
+ * 临时展开数据 高玉需要把资源接口改成一维数组
+ */
+const _getData = (data) => {
+    let newData = [];
+    data.forEach((i) => {
+        if (i.menuChild) {
+            newData = newData.concat(_getData(i.menuChild));
+        }
+        newData.push(i);
+    });
+
+    return newData;
+};
 const state = () => ({
     userInfo: null,
     permission: [],
@@ -125,9 +140,8 @@ const actions = {
     },
     getPermission: async ({ commit }) => {
         let res = await getPermission({ systemId: 1 });
-        console.log(routerData);
+        const permissionData = _verifyPermission(routerData, _getData(res));
-        const permissionData = _verifyPermission(routerData, res);
+        console.log(permissionData, 'permissionData');
-        console.log(res, permissionData);
         if (permissionData) {
             commit('setPermission', permissionData);
         } else {