From 3040b2aeff0e02b112e757bfac7e86ed68a629d9 Mon Sep 17 00:00:00 2001
From: huzhushan <huzhushan@126.com>
Date: Mon, 26 Jul 2021 18:42:49 +0800
Subject: [PATCH] update

---
 src/permission.js         | 7 ++++---
 src/store/modules/menu.js | 7 ++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index ac1dae3..c0ca5eb 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -26,7 +26,7 @@
  * @version:
  * @Date: 2021-04-20 11:06:21
  * @LastEditors: huzhushan@126.com
- * @LastEditTime: 2021-07-26 16:32:34
+ * @LastEditTime: 2021-07-26 18:28:31
  * @Author: huzhushan@126.com
  * @HomePage: https://huzhushan.gitee.io/vue3-element-admin
  * @Github: https://github.com/huzhushan/vue3-element-admin
@@ -74,11 +74,12 @@ router.beforeEach(async to => {
         return false
       }
     }
-    // 获取动态菜单（如果你的项目有动态菜单，在此处获取动态菜单）
+
+    // 生成菜单（如果你的项目有动态菜单，在此处会添加动态路由）
     if (store.state.menu.menus.length <= 0) {
       try {
         await store.dispatch('menu/generateMenus', userinfo)
-        return to.fullPath // 添加动态路由后，必须加这一句触发重定向
+        return to.fullPath // 添加动态路由后，必须加这一句触发重定向，否则会404
       } catch (err) {
         return false
       }
diff --git a/src/store/modules/menu.js b/src/store/modules/menu.js
index 6ea233f..0624913 100644
--- a/src/store/modules/menu.js
+++ b/src/store/modules/menu.js
@@ -3,7 +3,7 @@
  * @version:
  * @Date: 2021-04-20 11:06:21
  * @LastEditors: huzhushan@126.com
- * @LastEditTime: 2021-07-26 16:11:08
+ * @LastEditTime: 2021-07-26 18:22:01
  * @Author: huzhushan@126.com
  * @HomePage: https://huzhushan.gitee.io/vue3-element-admin
  * @Github: https://github.com/huzhushan/vue3-element-admin
@@ -87,6 +87,11 @@ export default {
   },
   actions: {
     async generateMenus({ commit }, userinfo) {
+      // // 方式一：只有固定菜单
+      // const menus = getFilterMenus(fixedRoutes)
+      // commit('SET_MENUS', menus)
+
+      // 方式二：有动态菜单
       // 从后台获取菜单
       const { code, data } = await GetMenus({ role: userinfo.role })