From 369043d09aa7922764818094886ef2b4e5e822af Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 21 Jul 2025 15:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/store/modules/user.js | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 3b6a410..f498d03 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -39,7 +39,7 @@
token: getStore({ name: 'token' }) || '',
refreshToken: getStore({ name: 'refreshToken' }) || '',
parentDeptInfo: getStore({ name: 'parentDeptInfo' }) || '',
-
+
},
actions: {
//根据用户名登录
@@ -273,12 +273,17 @@
getRoutes(tenantId).then(res => {
const data = res.data.data;
let menu = deepClone(data);
- menu.forEach(ele => formatPath(ele, true));
+ menu?.forEach(ele => formatPath(ele, true));
commit('SET_MENU', menu);
commit('SET_MENU_ALL', menu);
dispatch('GetButtons');
resolve(menu);
- });
+ }).catch(err =>{
+ dispatch('LogOut').then(()=>{
+ const adminUrl = import.meta.env.VITE_APP_DASHBOARD_URL
+ window.location.replace(`${adminUrl}#/login`)
+ })
+ })
});
},
GetButtons({ commit }) {
--
Gitblit v1.9.3