From 35e8ed0944ef52576dad82cb85d7a25ac1e2d6c6 Mon Sep 17 00:00:00 2001
From: Xwen <929716663@qq.com>
Date: Fri, 22 Dec 2023 23:12:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=8F=91=E5=B8=83=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=96=B0=E5=A2=9E=E6=9C=AA=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Bbs.Vue3/src/hooks/useAuths.js |  2 +-
 Yi.Bbs.Vue3/src/views/Discuss.vue | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Yi.Bbs.Vue3/src/hooks/useAuths.js b/Yi.Bbs.Vue3/src/hooks/useAuths.js
index 8699c715..f87eaaee 100644
--- a/Yi.Bbs.Vue3/src/hooks/useAuths.js
+++ b/Yi.Bbs.Vue3/src/hooks/useAuths.js
@@ -129,7 +129,7 @@ export default function useAuths(opt) {
       // 如果有记录当前跳转页面
       const currentPath = Session.get("currentPath");
       if (currentPath) {
-        router.push(currentPath);
+        router.replace(currentPath);
       } else {
         router.replace({
           path: option.loginReUrl ? option.loginReUrl : option.homeUrl,
diff --git a/Yi.Bbs.Vue3/src/views/Discuss.vue b/Yi.Bbs.Vue3/src/views/Discuss.vue
index 5e95a96e..86a8a241 100644
--- a/Yi.Bbs.Vue3/src/views/Discuss.vue
+++ b/Yi.Bbs.Vue3/src/views/Discuss.vue
@@ -105,9 +105,11 @@ import { getList, getTopList } from "@/apis/discussApi.js";
 import { ref, reactive, watch, computed } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import BottomInfo from "@/components/BottomInfo.vue";
-import useUserStore from "@/stores/user";
 import { getPermission } from "@/utils/auth";
+import useAuths from "@/hooks/useAuths";
+import { Session } from "@/utils/storage";
 
+const { getToken, clearStorage } = useAuths();
 //数据定义
 const route = useRoute();
 const router = useRouter();
@@ -166,7 +168,8 @@ const { isHasPermission: isEditArticle } = getPermission(
 );
 
 const enterEditArticle = () => {
-  if (isEditArticle.value) {
+  const hasToken = getToken();
+  if (isEditArticle) {
     //跳转路由
     var routerPer = {
       path: "/editArt",
@@ -177,6 +180,16 @@ const enterEditArticle = () => {
       },
     };
     router.push(routerPer);
+  } else if (!hasToken) {
+    ElMessageBox.confirm("登录后即可发布主题是否登录?", "提示", {
+      confirmButtonText: "确认",
+      cancelButtonText: "取消",
+      type: "warning",
+    }).then(() => {
+      clearStorage();
+      Session.set("currentPath", route.path);
+      router.push("/login");
+    });
   } else {
     ElMessage.warning("暂无发布权限!");
   }