From 7a50d590860e7e8524c3a942884db6bf23aaa1c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Fri, 20 May 2022 15:57:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8A=A8=E6=80=81=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/configs/index.js                |  2 +-
 src/store/modules/core/auth.js      | 14 +++++++-------
 src/views/permission/menu/index.vue |  5 +++++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/configs/index.js b/src/configs/index.js
index f2f9669..840718a 100644
--- a/src/configs/index.js
+++ b/src/configs/index.js
@@ -14,7 +14,7 @@ export default {
     /**
      * 是否使用本地路由
      */
-    useLocalRouter: true,
+    useLocalRouter: false,
     /**
      * 项目名称
      */
diff --git a/src/store/modules/core/auth.js b/src/store/modules/core/auth.js
index 9671e6a..39ba64b 100644
--- a/src/store/modules/core/auth.js
+++ b/src/store/modules/core/auth.js
@@ -14,16 +14,16 @@ const mutations = {
         const convert = (arr, parent = { path: '/', meta: {} }) => {
             return arr.map((item) => {
                 let route = {
-                    path: item.routeUrl,
-                    name: item.roleCode,
-                    component: item.pageUrl,
+                    path: item.path,
+                    name: item.permission,
+                    component: item.page,
                     meta: {
                         title: item.title,
                         icon: item.icon,
                         hidden: item.type === 2,
                         activeMenu: item.activeMenu,
-                        layout: item.pageUrl?.toLowerCase() === 'layout',
-                        view: item.pageUrl?.toLowerCase() === 'view',
+                        layout: item.page?.toLowerCase() === 'layout',
+                        view: item.page?.toLowerCase() === 'view',
                     },
                 };
                 if (!route.path.startsWith('/')) {
@@ -55,7 +55,7 @@ const mutations = {
                 } else {
                     throw new Error('菜单没有配置前端页面');
                 }
-                route.children = convert(item.children || [], route);
+                route.children = convert(item.menuChild || [], route);
                 return route;
             });
         };
@@ -108,7 +108,7 @@ const actions = {
         router.push({ name: 'Login', query: { returnUrl } });
     },
     getPermission: async ({ commit }) => {
-        let res = await getPermission({ systemCode: 'msb_shop_admin' });
+        let res = await getPermission();
         if (res) {
             commit('setPermission', res);
         } else {
diff --git a/src/views/permission/menu/index.vue b/src/views/permission/menu/index.vue
index d9cbcf6..d85365f 100644
--- a/src/views/permission/menu/index.vue
+++ b/src/views/permission/menu/index.vue
@@ -151,6 +151,9 @@
                         <el-form-item label="菜单图标" prop="icon">
                             <el-input v-model="menuState.form.icon" />
                         </el-form-item>
+                        <el-form-item label="激活菜单" prop="activeMenu">
+                            <el-input v-model="menuState.form.activeMenu" />
+                        </el-form-item>
                         <el-form-item label="菜单排序" prop="sort">
                             <el-input-number v-model="menuState.form.sort" />
                         </el-form-item>
@@ -281,6 +284,7 @@
             path: '',
             page: '',
             icon: '',
+            activeMenu: '',
             sort: 0,
         },
         rules: {
@@ -306,6 +310,7 @@
                 path: '',
                 page: '',
                 icon: '',
+                activeMenu: '',
                 sort: 0,
             }
         );