From 2d218018e844b888bad592a1fef70855f5c05c14 Mon Sep 17 00:00:00 2001
From: tsui110 <meiyou@emai.com>
Date: Mon, 22 Dec 2025 11:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E9=99=90=E5=8A=A8=E7=94=BB=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/wuxianshang/index.vue | 59 ++++++++++++++++++++++------
 utils/request.js                     |  4 +-
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/pages/activity/wuxianshang/index.vue b/pages/activity/wuxianshang/index.vue
index efcd5eb..10f618f 100644
--- a/pages/activity/wuxianshang/index.vue
+++ b/pages/activity/wuxianshang/index.vue
@@ -137,7 +137,7 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
+import { ref, computed, nextTick } from 'vue'
 import FlipGrid from '../../../components/FlipGrid.vue'
 import { onLoad } from '@dcloudio/uni-app'
 import PaymentPopup from '../../../components/PaymentPopup.vue'
@@ -422,9 +422,46 @@ async function fetchCoupons() {
   }
 }
 
+function buildRewardLookup(list) {
+  const map = new Map()
+  const arr = Array.isArray(list) ? list : []
+  arr.forEach(it => {
+    const id = it && (it.id ?? it.reward_id ?? it.product_id)
+    const key = Number(id)
+    if (Number.isFinite(key)) map.set(key, it)
+  })
+  return map
+}
+
+function extractResultList(resultRes) {
+  const root = resultRes && (resultRes.data ?? resultRes.result ?? resultRes)
+  if (!root) return []
+  if (Array.isArray(root.results)) return root.results
+  if (Array.isArray(root.list)) return root.list
+  if (Array.isArray(root.items)) return root.items
+  if (Array.isArray(root.data)) return root.data
+  if (root.results && root.results.data && Array.isArray(root.results.data)) return root.results.data
+  return []
+}
+
+function mapResultsToFlipItems(resultRes, poolRewards) {
+  const list = extractResultList(resultRes)
+  const lookup = buildRewardLookup(poolRewards)
+  const poolArr = Array.isArray(poolRewards) ? poolRewards : []
+  return list.filter(Boolean).map(d => {
+    const rewardId = d.reward_id ?? d.rewardId ?? d.product_id ?? d.productId ?? d.id
+    const rewardName = String((d.reward_name ?? d.rewardName ?? d.product_name ?? d.productName ?? d.title ?? d.name) || '')
+    const key = Number(rewardId)
+    const fromId = Number.isFinite(key) ? lookup.get(key) : null
+    const fromName = !fromId && rewardName ? (poolArr.find(x => String(x && x.title || '') === rewardName) || poolArr.find(x => String(x && x.title || '').includes(rewardName))) : null
+    const it = fromId || fromName || null
+    const title = rewardName || String((it && it.title) || '奖励')
+    const image = String((it && it.image) || d.image || d.img || d.pic || d.product_image || '')
+    return { title, image }
+  })
+}
+
 async function onMachineDraw(count) {
-  showFlip.value = true
-  try { if (flipRef.value && flipRef.value.reset) flipRef.value.reset() } catch (_) {}
   const aid = activityId.value || ''
   const iid = currentIssueId.value || ''
   if (!aid || !iid) { uni.showToast({ title: '期数未选择', icon: 'none' }); return }
@@ -468,16 +505,14 @@ async function onMachineDraw(count) {
       })
     })
     const resultRes = await getLotteryResult(orderNo)
-    const raw = resultRes && (resultRes.list || resultRes.items || resultRes.data || resultRes.result || resultRes)
-    const arr = Array.isArray(raw) ? raw : (Array.isArray(resultRes?.data) ? resultRes.data : [raw])
-    const items = arr.filter(Boolean).map(d => {
-      const title = String((d && (d.title || d.name || d.product_name)) || '奖励')
-      const image = String((d && (d.image || d.img || d.pic || d.product_image)) || '')
-      return { title, image }
-    })
-    if (flipRef.value && flipRef.value.revealResults) flipRef.value.revealResults(items)
+    const items = mapResultsToFlipItems(resultRes, currentIssueRewards.value)
+    showFlip.value = true
+    await nextTick()
+    try { if (flipRef.value && flipRef.value.reset) flipRef.value.reset() } catch (_) {}
+    setTimeout(() => {
+      if (flipRef.value && flipRef.value.revealResults) flipRef.value.revealResults(items)
+    }, 100)
   } catch (e) {
-    if (flipRef.value && flipRef.value.revealResults) flipRef.value.revealResults([{ title: e.message || '抽选失败', image: '' }])
     uni.showToast({ title: e.message || '操作失败', icon: 'none' })
   } finally {
     drawLoading.value = false
diff --git a/utils/request.js b/utils/request.js
index 0475d30..ddcc632 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,4 +1,4 @@
-const BASE_URL = 'http://localhost:9991'
+const BASE_URL = 'https://mini-chat.1024tool.vip'
 
 let authModalShown = false
 
@@ -119,4 +119,4 @@ function buildDefaultHeaders() {
     'Cache-Control': 'no-cache',
     'User-Agent': `UniApp/${platform} (${brand} ${model}; ${osName} ${osVersion}) MiniProgram`
   }
-}
\ No newline at end of file
+}