From 6ad916df62e4bd8e74fc2eed0f0c33c151170368 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 19 May 2026 11:39:35 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A5288=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=E4=BB=8E=E6=8A=BD=E5=A5=96?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95=E9=A1=B5=E9=9D=A2=E7=9B=B4=E6=8E=A5=E9=A2=86?=
 =?UTF-8?q?=E5=8F=96=E5=A5=96=E5=93=81=EF=BC=8C=E8=BE=93=E5=85=A5=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E5=9C=B0=E5=9D=80=E5=B9=B6=E6=8F=90=E4=BA=A4=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=9A=E6=8F=90=E7=A4=BA=E2=80=9C=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E5=A5=96=E5=88=B8ID=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg-video/views/county-claim-address.vue | 9 ++++++---
 pkg-video/views/county-winners.vue       | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkg-video/views/county-claim-address.vue b/pkg-video/views/county-claim-address.vue
index e5c68ff..3ceeeb3 100644
--- a/pkg-video/views/county-claim-address.vue
+++ b/pkg-video/views/county-claim-address.vue
@@ -177,7 +177,7 @@ export default {
     this.form = {
       ...this.form,
       ...routeParams,
-      lotteryRecordId: routeParams.lotteryRecordId || routeParams.id || '',
+      lotteryRecordId: this.resolveLotteryRecordId(routeParams),
       prizeName: routeParams.prizeName || '',
       prizeAttrName: routeParams.prizeAttrName || '',
       prizeType: routeParams.prizeType || '',
@@ -213,6 +213,9 @@ export default {
         return result
       }, {})
     },
+    resolveLotteryRecordId(data = {}) {
+      return data.lotteryRecordId || data.id || data.ticketId || data.recordId || ''
+    },
     goBack() {
       uni.navigateBack()
     },
@@ -296,7 +299,7 @@ export default {
       return true
     },
     async submitCouponClaim() {
-      const ticketId = Number(this.form.lotteryRecordId)
+      const ticketId = Number(this.resolveLotteryRecordId(this.form))
       if (!ticketId) {
         uni.showToast({ title: '缺少抽奖券ID', icon: 'none' })
         return
@@ -309,7 +312,7 @@ export default {
     async submitPhysicalClaim() {
       if (this.submitting) return
       if (!this.validatePhysicalForm()) return
-      const ticketId = Number(this.form.lotteryRecordId)
+      const ticketId = Number(this.resolveLotteryRecordId(this.form))
       if (!ticketId) {
         uni.showToast({ title: '缺少抽奖券ID', icon: 'none' })
         return
diff --git a/pkg-video/views/county-winners.vue b/pkg-video/views/county-winners.vue
index fd26c5d..c538d57 100644
--- a/pkg-video/views/county-winners.vue
+++ b/pkg-video/views/county-winners.vue
@@ -347,6 +347,7 @@ export default {
     },
     mapUserWinList(ticketList = []) {
       return ticketList.map(item => ({
+        id: item.id || item.lotteryRecordId || item.ticketId || item.recordId || "",
         lotteryRecordId: item.id || item.lotteryRecordId || item.ticketId || item.recordId || "",
         levelName: item.levelName || item.prizeLevelName || "中奖奖品",
         prizeName: item.prizeName || item.awardName || "神秘奖品",
@@ -377,6 +378,7 @@ export default {
         const activityData = (activityRes && activityRes.data) || {}
         const winnerData = (winnerRes && winnerRes.data) || {}
         const winnerList = winnerData.activityWinnerList || []
+        const userWinList = this.mapUserWinList(winnerData.userWinList || [])
         const myTicketList = this.normalizeListData(myTicketsRes)
 
         const filteredMyTicketList = targetActivityId
@@ -385,7 +387,7 @@ export default {
 
         this.drawTime = this.formatDrawTime(activityData.drawTime || activityData.openTime || "")
         this.activityWinnerList = winnerList
-        this.userWinList = winnerData.userWinList || []
+        this.userWinList = userWinList
         this.hasWon = this.userWinList.length > 0 ? 1 : 0
         this.periodLabel = winnerData.periodNo || "01"
         this.remainingClaimDays = winnerData.remainingClaimDays || 7