diff --git a/src/layouts/components/Topbar/Toolbar/rightSide.vue b/src/layouts/components/Topbar/Toolbar/rightSide.vue index 0a2bbad1..2e5ad84a 100644 --- a/src/layouts/components/Topbar/Toolbar/rightSide.vue +++ b/src/layouts/components/Topbar/Toolbar/rightSide.vue @@ -40,7 +40,7 @@ watch(() => userStore.avatar, () => { { label: '快捷键介绍', handle: () => eventBus.emit('global-hotkeys-intro-toggle'), hide: settingsStore.mode !== 'pc' }, ], [ - { label: '退出登录', handle: () => userStore.logout() }, + { label: '退出登录', handle: () => userStore.logout(settingsStore.settings.home.fullPath) }, ], ]" class="flex-center cursor-pointer px-2" > diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 7c89fdf7..f4e6154b 100755 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -50,7 +50,7 @@ const useUserStore = defineStore( router.push({ name: 'login', query: { - ...(router.currentRoute.value.path !== settingsStore.settings.home.fullPath && router.currentRoute.value.name !== 'login' && { redirect }), + ...(redirect !== settingsStore.settings.home.fullPath && router.currentRoute.value.name !== 'login' && { redirect }), }, }) }