From ae6865393896b5aed35d36269570893ff3da0fb6 Mon Sep 17 00:00:00 2001
From: BTMuli <bt-muli@outlook.com>
Date: Wed, 10 Sep 2025 11:11:56 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E9=9A=90=E8=97=8F=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=B4=BB=E5=8A=A8=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9C=AA=E5=BC=80=E5=A7=8B=E6=B4=BB=E5=8A=A8=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/pageHome/ph-comp-position.vue |  4 +++-
 src/components/pageHome/ph-pos-user.vue      | 20 ++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/components/pageHome/ph-comp-position.vue b/src/components/pageHome/ph-comp-position.vue
index 1230834c..a3accb06 100644
--- a/src/components/pageHome/ph-comp-position.vue
+++ b/src/components/pageHome/ph-comp-position.vue
@@ -84,7 +84,9 @@ async function loadUserPosition(): Promise<void> {
     await TGLogger.Error(`获取近期活动失败：[${resp.retcode}-${resp.message}`);
     return;
   }
-  userPos.value = [...resp.act_list, ...resp.fixed_act_list];
+  userPos.value = [...resp.act_list, ...resp.fixed_act_list].filter(
+    (i) => i.start_timestamp !== "0",
+  );
 }
 
 async function loadWikiPosition(): Promise<void> {
diff --git a/src/components/pageHome/ph-pos-user.vue b/src/components/pageHome/ph-pos-user.vue
index 7eae6345..c646159c 100644
--- a/src/components/pageHome/ph-pos-user.vue
+++ b/src/components/pageHome/ph-pos-user.vue
@@ -68,11 +68,16 @@
       </div>
     </div>
     <div class="ph-puc-duration">
-      <span title="剩余时间">{{ stamp2LastTime(restTs * 1000) }}</span>
-      <span title="活动时间">
-        {{ timestampToDate(Number(props.pos.start_timestamp) * 1000) }} ~
-        {{ timestampToDate(Number(props.pos.end_timestamp) * 1000) }}
-      </span>
+      <template v-if="isStart">
+        <span title="剩余时间">{{ stamp2LastTime(restTs * 1000) }}</span>
+        <span title="活动时间">
+          {{ timestampToDate(Number(props.pos.start_timestamp) * 1000) }} ~
+          {{ timestampToDate(Number(props.pos.end_timestamp) * 1000) }}
+        </span>
+      </template>
+      <template v-else>
+        <span>未开始</span>
+      </template>
     </div>
     <div class="ph-puc-rewards">
       <div
@@ -94,7 +99,7 @@ import TMiImg from "@comp/app/t-mi-img.vue";
 import { ActCalendarTypeEnum } from "@enum/game.js";
 import { getHardChallengeDesc } from "@Sql/utils/transUserRecord.js";
 import { stamp2LastTime, timestampToDate } from "@utils/toolFunc.js";
-import { onMounted, onUnmounted, ref } from "vue";
+import { computed, onMounted, onUnmounted, ref } from "vue";
 import { useRouter } from "vue-router";
 
 type PhCompPositionUserProps = { pos: TGApp.Game.ActCalendar.ActItem };
@@ -110,6 +115,9 @@ const emits = defineEmits<PhCompPositionUserEmits>();
 const endTs = ref<number>(0);
 const restTs = ref<number>(0);
 const durationTs = ref<number>(0);
+const isStart = computed<boolean>(() => {
+  return props.pos.start_timestamp !== "0";
+});
 
 onMounted(() => {
   endTs.value = Number(props.pos.end_timestamp);