From ad34c7b891b54b726c49812fd8261ab8327d70a5 Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Tue, 22 Nov 2022 00:52:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=A0=87=E7=AD=BE=E9=A1=B5=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E6=97=B6=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=EF=BC=8C=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E5=AD=98=E5=9C=A8=E6=A0=87=E7=AD=BE=E9=A1=B5=E6=9C=AA?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/hooks/useNav.ts | 4 ++++
 src/store/modules/user.ts  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/layout/hooks/useNav.ts b/src/layout/hooks/useNav.ts
index 5ba141b3c..5efd8cec5 100644
--- a/src/layout/hooks/useNav.ts
+++ b/src/layout/hooks/useNav.ts
@@ -1,4 +1,5 @@
 import { computed } from "vue";
+import { storeToRefs } from "pinia";
 import { getConfig } from "@/config";
 import { useRouter } from "vue-router";
 import { emitter } from "@/utils/mitt";
@@ -10,12 +11,14 @@ import { useAppStoreHook } from "@/store/modules/app";
 import { i18nChangeLanguage } from "@wangeditor/editor";
 import { useUserStoreHook } from "@/store/modules/user";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
+import { usePermissionStoreHook } from "@/store/modules/permission";
 
 const errorInfo = "当前路由配置不正确，请检查配置";
 
 export function useNav() {
   const pureApp = useAppStoreHook();
   const routers = useRouter().options.routes;
+  const { wholeMenus } = storeToRefs(usePermissionStoreHook());
 
   /** 用户名 */
   const username = computed(() => {
@@ -99,6 +102,7 @@ export function useNav() {
   }
 
   function menuSelect(indexPath: string, routers): void {
+    if (wholeMenus.value.length === 0) return;
     if (isRemaining(indexPath)) return;
     let parentPath = "";
     const parentPathIndex = indexPath.lastIndexOf("/");
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 7ec9d717e..c487a4257 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -59,9 +59,9 @@ export const useUserStore = defineStore({
       this.username = "";
       this.roles = [];
       removeToken();
-      router.push("/login");
       useMultiTagsStoreHook().handleTags("equal", [...routerArrays]);
       resetRouter();
+      router.push("/login");
     },
     /** 刷新`token` */
     async handRefreshToken(data) {