From 0d5e993042d70a2c7682fda5e35eb3d35fb9eb32 Mon Sep 17 00:00:00 2001
From: Xwen <929716663@qq.com>
Date: Sat, 16 Dec 2023 22:46:10 +0800
Subject: [PATCH] =?UTF-8?q?perf:=E4=BC=98=E5=8C=96=E6=9C=AA=E7=99=BB?=
 =?UTF-8?q?=E9=99=86=E6=97=B6=E7=9A=84=E8=B7=B3=E8=BD=AC=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Bbs.Vue3/src/hooks/useAuths.js    | 16 ++++++++++------
 Yi.Bbs.Vue3/src/layout/AppHeader.vue |  5 ++++-
 Yi.Bbs.Vue3/src/stores/user.js       |  4 ++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Yi.Bbs.Vue3/src/hooks/useAuths.js b/Yi.Bbs.Vue3/src/hooks/useAuths.js
index 38552666..acfb77c3 100644
--- a/Yi.Bbs.Vue3/src/hooks/useAuths.js
+++ b/Yi.Bbs.Vue3/src/hooks/useAuths.js
@@ -80,8 +80,6 @@ export default function useAuths(opt) {
     Session.clear();
     Local.clear();
     removeToken();
-    window.location.reload();
-    Session.set("vuex", null);
   };
 
   // 用户名密码登录
@@ -116,10 +114,16 @@ export default function useAuths(opt) {
       // 存储用户信息
       await getUserInfo(); // 用户信息
       // 登录成功后 路由跳转
-      router.replace({
-        path: option.loginReUrl ? option.loginReUrl : option.homeUrl,
-        query: option.otherQuery,
-      });
+      // 如果有记录当前跳转页面
+      const currentPath = Session.get("currentPath");
+      if (currentPath) {
+        router.push(currentPath);
+      } else {
+        router.replace({
+          path: option.loginReUrl ? option.loginReUrl : option.homeUrl,
+          query: option.otherQuery,
+        });
+      }
     } catch (error) {
       removeToken();
       return false;
diff --git a/Yi.Bbs.Vue3/src/layout/AppHeader.vue b/Yi.Bbs.Vue3/src/layout/AppHeader.vue
index b1624350..7e0fcdfd 100644
--- a/Yi.Bbs.Vue3/src/layout/AppHeader.vue
+++ b/Yi.Bbs.Vue3/src/layout/AppHeader.vue
@@ -69,14 +69,16 @@
 <script setup>
 import AvatarInfo from "@/components/AvatarInfo.vue";
 import { ref } from "vue";
-import { useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import useUserStore from "@/stores/user.js";
 import useConfigStore from "@/stores/config";
 import useAuths from "@/hooks/useAuths";
+import { Session } from "@/utils/storage";
 
 const { getToken } = useAuths();
 const configStore = useConfigStore();
 const router = useRouter();
+const route = useRoute();
 const userStore = useUserStore();
 const activeIndex = ref("1");
 const searchText = ref("");
@@ -106,6 +108,7 @@ const enterProfile = () => {
   router.push("/profile");
 };
 const toLogin = () => {
+  Session.set("currentPath", route.path);
   router.push("/login");
 };
 const search = () => {
diff --git a/Yi.Bbs.Vue3/src/stores/user.js b/Yi.Bbs.Vue3/src/stores/user.js
index e945ee21..566d34f2 100644
--- a/Yi.Bbs.Vue3/src/stores/user.js
+++ b/Yi.Bbs.Vue3/src/stores/user.js
@@ -3,7 +3,7 @@ import { getUserDetailInfo } from "@/apis/auth";
 import useAuths from "@/hooks/useAuths";
 import { defineStore } from "pinia";
 
-const { getToken, setToken, removeToken } = useAuths();
+const { getToken, setToken, clearStorage } = useAuths();
 
 const useUserStore = defineStore("user", {
   state: () => ({
@@ -81,7 +81,7 @@ const useUserStore = defineStore("user", {
             this.token = "";
             this.roles = [];
             this.permissions = [];
-            removeToken();
+            clearStorage();
             resolve();
           })
           .catch((error) => {