From 5c8f2d5e57c221c7a7a316f720f18d4fc4ad46e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=9B=AE=E6=A3=83?= <BT-Muli@outlook.com>
Date: Tue, 23 Jul 2024 20:03:28 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20=E5=92=A8=E8=AF=A2?=
 =?UTF-8?q?=E9=A1=B5=E5=88=B7=E6=96=B0=E6=97=B6=E8=AE=B0=E5=BF=86=20tab=20?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/common/News.vue | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/pages/common/News.vue b/src/pages/common/News.vue
index 6e6fcfc3..c2eae198 100644
--- a/src/pages/common/News.vue
+++ b/src/pages/common/News.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script lang="ts" setup>
-import { nextTick, onMounted, ref, watch } from "vue";
+import { computed, nextTick, onMounted, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 
 import showSnackbar from "../../components/func/snackbar.js";
@@ -79,7 +79,6 @@ type RawData = {
 // 路由
 const router = useRouter();
 const gid = <string>useRoute().params.gid;
-let type = <string | undefined>useRoute().params.type;
 // loading
 const loading = ref<boolean>(true);
 const loadingTitle = ref<string>("正在加载");
@@ -87,10 +86,21 @@ const loadingSub = ref<boolean>(false);
 
 // UI 数据
 const appStore = useAppStore();
-const tab = ref<NewsKey>("notice");
 const showList = ref<boolean>(false);
 const showSearch = ref<boolean>(false);
 const tabValues = ref<Array<NewsKey>>(["notice", "activity", "news"]);
+const tabList = ["notice", "activity", "news"];
+const tab = computed({
+  get: () => {
+    if (appStore.recentNewsType === "" || !tabList.includes(appStore.recentNewsType)) {
+      return "notice";
+    }
+    return <NewsKey>appStore.recentNewsType;
+  },
+  set: (val) => {
+    appStore.recentNewsType = val;
+  },
+});
 
 // 渲染数据
 const search = ref<string>("");
@@ -117,25 +127,7 @@ const rawData = ref<RawData>({
   },
 });
 
-onMounted(async () => {
-  await TGLogger.Info(`[News][${gid}][onMounted] 打开咨讯页面`);
-  const typeList = ["notice", "activity", "news"];
-  if (type != undefined) {
-    appStore.recentNewsType = type;
-  }
-  const curType = appStore.recentNewsType;
-  if (typeList.includes(curType)) {
-    tab.value = <NewsKey>curType;
-  } else {
-    tab.value = "notice";
-    appStore.recentNewsType = "notice";
-  }
-  await firstLoad(tab.value);
-});
-
-watch(tab, (val) => {
-  appStore.recentNewsType = val;
-});
+onMounted(async () => await firstLoad(tab.value));
 
 async function firstLoad(key: NewsKey): Promise<void> {
   if (rawData.value[key].lastId !== 0) {