From 8a2c42914df26eeabc4b552a9231a6def7ec08b0 Mon Sep 17 00:00:00 2001
From: BTMuli <BT-Muli@outlook.com>
Date: Tue, 23 May 2023 12:51:10 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E5=88=9D=E6=AC=A1=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E5=8F=AA=E4=BC=9A=E5=8A=A0=E8=BD=BD=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/t-news.vue | 56 ++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/views/t-news.vue b/src/views/t-news.vue
index 35015f93..d9fe8460 100644
--- a/src/views/t-news.vue
+++ b/src/views/t-news.vue
@@ -1,16 +1,16 @@
 <template>
-  <div v-if="loading">
+  <div v-show="loading">
     <TLoading :title="loadingTitle" />
   </div>
-  <div v-else>
+  <div v-show="!loading">
     <v-tabs v-model="tab" align-tabs="start" class="news-tab">
       <v-tab value="notice">
         公告
       </v-tab>
-      <v-tab value="activity">
+      <v-tab value="activity" @click="firstLoad('activity')">
         活动
       </v-tab>
-      <v-tab v-if="showNews" value="news">
+      <v-tab v-if="showNews" value="news" @click="firstLoad('news')">
         新闻
       </v-tab>
       <v-spacer />
@@ -272,35 +272,39 @@ const rawData = ref({
 });
 
 onMounted(async () => {
-  loadingTitle.value = "正在获取公告数据...";
+  loadingTitle.value = "正在获取公告数据";
   const noticeData = await MysOper.News.get.notice(gid);
   rawData.value.notice.isLast = noticeData.is_last;
   rawData.value.notice.lastId = noticeData.list.length;
-  loadingTitle.value = "正在获取活动数据...";
-  const activityData = await MysOper.News.get.activity(gid);
-  rawData.value.activity.isLast = activityData.is_last;
-  rawData.value.activity.lastId = activityData.list.length;
-  if (showNews.value) {
-    loadingTitle.value = "正在获取新闻数据...";
-    const newsData = await MysOper.News.get.news(gid);
-    rawData.value.news.isLast = newsData.is_last;
-    rawData.value.news.lastId = newsData.list.length;
-    postData.value = {
-      notice: MysOper.News.card.notice(noticeData),
-      activity: MysOper.News.card.activity(activityData),
-      news: MysOper.News.card.news(newsData),
-    };
-  } else {
-    postData.value = {
-      notice: MysOper.News.card.notice(noticeData),
-      activity: MysOper.News.card.activity(activityData),
-      news: [],
-    };
-  }
+  postData.value.notice = MysOper.News.card.notice(noticeData);
   tab.value = "notice";
   loading.value = false;
 });
 
+async function firstLoad (data:string) {
+  if (rawData.value.activity.lastId !== 0 && rawData.value.news.lastId !== 0) {
+    return;
+  }
+  if (data === "activity" && rawData.value.activity.lastId === 0) {
+    loadingTitle.value = "正在获取活动数据...";
+    loading.value = true;
+    const activityData = await MysOper.News.get.activity(gid);
+    rawData.value.activity.isLast = activityData.is_last;
+    rawData.value.activity.lastId = activityData.list.length;
+    postData.value.activity = MysOper.News.card.activity(activityData);
+    loading.value = false;
+  }
+  if (data === "news" && rawData.value.news.lastId === 0) {
+    loadingTitle.value = "正在获取咨讯数据...";
+    loading.value = true;
+    const newsData = await MysOper.News.get.news(gid);
+    rawData.value.news.isLast = newsData.is_last;
+    rawData.value.news.lastId = newsData.list.length;
+    postData.value.news = MysOper.News.card.news(newsData);
+    loading.value = false;
+  }
+}
+
 async function switchAnno () {
   await router.push("/announcements");
 }