From 9a27e2df49a51e7b976240212f6fdba7e6c4f6ae Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 11 May 2026 14:46:12 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A5232=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=88=91=E7=9A=84=E6=8A=BD?=
 =?UTF-8?q?=E5=A5=96=E7=A0=81=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=BC=BA=E4=BA=86?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg-video/views/county-my-tickets.vue | 50 +++++++++++++++++----------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/pkg-video/views/county-my-tickets.vue b/pkg-video/views/county-my-tickets.vue
index be34e04..652ade7 100644
--- a/pkg-video/views/county-my-tickets.vue
+++ b/pkg-video/views/county-my-tickets.vue
@@ -1,28 +1,18 @@
 <template>
   <view class="county-my-tickets-page">
-    <!-- <view class="custom-header" :style="{ paddingTop: `${statusBarHeight}px` }">
-      <view class="header-inner">
-        <view class="header-back" @click="goBack">
-          <u-icon name="arrow-left" size="24" color="#333" class="header-back-icon"></u-icon>
-        </view>
-        <view class="header-title">我的抽奖码</view>
-        <view class="header-right">
-          <view class="right-dot"></view>
-          <view class="right-ring"></view>
-        </view>
-      </view>
+    <view class="custom-header">
       <view class="tabs">
         <view
           v-for="tab in tabs"
           :key="tab.key"
-          class="tab-item"
+          class="tab-item v12-font-bold"
           :class="{ active: activeTab === tab.key }"
           @click="onChangeTab(tab.key)"
         >
           {{ tab.label }}
         </view>
       </view>
-    </view> -->
+    </view>
 
     <scroll-view class="page-body" scroll-y>
       <view class="tip-bar">
@@ -188,6 +178,15 @@ export default {
       }
       return map[tab]
     },
+    mergeTicketListById(list = []) {
+      const map = new Map()
+      list.forEach(item => {
+        if (!item) return
+        const key = item.id || item.ticketId || item.lotteryRecordId || item.recordId || Math.random()
+        map.set(String(key), item)
+      })
+      return Array.from(map.values())
+    },
     normalizeListData(res) {
       if (!res) return []
       if (Array.isArray(res)) return res
@@ -243,11 +242,25 @@ export default {
     async fetchList() {
       this.loading = true
       try {
-        const status = this.mapTabToStatus(this.activeTab)
-        const res = await getDrawMyTickets(status)
-        const allList = this.filterByActivity(this.normalizeListData(res).map(this.normalizeTicketItem))
-        this.openedList = allList.filter(item => item.status === 1 || item.status === 2)
-        this.list = this.filterByTab(allList)
+        // 已开奖需要包含：1-已中奖、2-未中奖
+        if (this.activeTab === 'opened') {
+          const [winRes, loseRes] = await Promise.all([
+            getDrawMyTickets(1),
+            getDrawMyTickets(2)
+          ])
+          const winList = this.normalizeListData(winRes).map(this.normalizeTicketItem)
+          const loseList = this.normalizeListData(loseRes).map(this.normalizeTicketItem)
+          const merged = this.mergeTicketListById([...winList, ...loseList])
+          const openedAllList = this.filterByActivity(merged)
+          this.openedList = openedAllList
+          this.list = openedAllList
+        } else {
+          const status = this.mapTabToStatus(this.activeTab)
+          const res = await getDrawMyTickets(status)
+          const allList = this.filterByActivity(this.normalizeListData(res).map(this.normalizeTicketItem))
+          this.openedList = allList.filter(item => item.status === 1 || item.status === 2)
+          this.list = this.filterByTab(allList)
+        }
       } catch (e) {
         this.list = []
         this.openedList = []
@@ -488,6 +501,7 @@ export default {
   color: #666;
   font-size: 26rpx;
   background: #fff;
+  font-weight: bold;
 }
 
 .tab-item.active {