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 | 7 ++++++-
src/page/index/top/index.vue | 2 --
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index d3c1d93..c2a7440 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -103,10 +103,8 @@
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
const env = import.meta.env.VITE_APP_ENV
- console.log(env);
const adminUrl = import.meta.env.VITE_APP_DASHBOARD_URL
env === 'development' ? this.$router.push({ path: '/login' }):window.location.replace(`${adminUrl}#/login`)
-
})
})
},
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index f22a79e..f498d03 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -278,7 +278,12 @@
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