From 3b710d9e99871509b679461f51ec1e7e239d06b0 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期二, 26 十一月 2024 15:28:24 +0800 Subject: [PATCH] update typescript 5.4.5 => 5.7.2 update vite 5.2.12 => 5.4.11 update vue 3.4.34 => 3.5.13 update element-plus 2.7.8 => 2.8.8 update .... 其他依赖版本升级 --- src/layout/components/Navbar.vue | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 617c5da..bfe339e 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -98,6 +98,7 @@ import { dynamicClear, dynamicTenant } from '@/api/system/tenant'; import { TenantVO } from '@/api/types'; import notice from './notice/index.vue'; +import router from "@/router"; const appStore = useAppStore(); const userStore = useUserStore(); @@ -163,8 +164,14 @@ cancelButtonText: '鍙栨秷', type: 'warning' }); - await userStore.logout(); - location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index'; + userStore.logout().then(() => { + router.replace({ + path: '/login', + query: { + redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/') + } + }) + }); }; const emits = defineEmits(['setLayout']); -- Gitblit v1.9.3