From 571190cd7898d55d7b50d2dfd63a48771e16c75d Mon Sep 17 00:00:00 2001
From: Hooray Hu <304327508@qq.com>
Date: Wed, 31 Jul 2024 15:39:18 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=89=8B=E5=8A=A8=E7=99=BB?=
 =?UTF-8?q?=E5=87=BA=E6=97=B6=E4=B8=8D=E5=B8=A6=E4=B8=8A=E9=87=8D=E5=AE=9A?=
 =?UTF-8?q?=E5=90=91=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Topbar/Toolbar/rightSide.vue | 2 +-
 src/store/modules/user.ts                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 }),
         },
       })
     }