From 88fdb55d82d915400ab0d22fb7a566fc99768646 Mon Sep 17 00:00:00 2001
From: hzj <1304805162@qq.com>
Date: Wed, 31 Dec 2025 10:59:35 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=B9=B4=E6=B4=BB=E5=8A=A8):=20?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Activities/NewYear/index.vue | 70 ++++++++++++++++++--------
 1 file changed, 49 insertions(+), 21 deletions(-)

diff --git a/src/views/Activities/NewYear/index.vue b/src/views/Activities/NewYear/index.vue
index e0328b2..a7946db 100644
--- a/src/views/Activities/NewYear/index.vue
+++ b/src/views/Activities/NewYear/index.vue
@@ -517,10 +517,10 @@
             <div
               style="
                 width: 100%;
-                height: 60.5vw;
+                height: 61vw;
                 align-self: stretch;
 
-                margin: 43vw 0 0;
+                margin: 42.5vw 0 0;
                 padding: 0 18vw;
                 display: grid;
                 grid-template-columns: repeat(3, 1fr);
@@ -558,7 +558,6 @@
                   style="
                     display: block;
                     width: 100%;
-                    aspect-ratio: 1/1;
 
                     position: absolute;
                     inset: 0;
@@ -647,7 +646,7 @@
           >
             <div style="display: flex; justify-content: space-between; align-items: center">
               <div style="font-size: 1.2em; font-weight: 700">
-                Total Spins:({{ totalDraw?.totalCount || 0 }}/100)
+                Total Spins:({{ totalDraw?.usedCount || 0 }}/100)
               </div>
             </div>
             <div style="display: flex; justify-content: space-between; align-items: center">
@@ -1347,12 +1346,24 @@
                 "
               >
                 <!-- 上一个奖品 -->
-                <div style="width: 8vw; align-self: stretch">
-                  <div
-                    v-if="result.length > 1 && resultShowIndex > 0"
-                    style="width: 100%; height: 100%"
+                <div
+                  style="
+                    width: 8vw;
+                    align-self: stretch;
+
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                  "
+                >
+                  <img
+                    v-smart-img
+                    v-show="result.length > 1 && resultShowIndex > 0"
+                    :src="imageUrl('rewardBack')"
+                    alt=""
+                    style="display: block; width: 100%; object-fit: cover"
                     @click="resultShowIndex--"
-                  ></div>
+                  />
                 </div>
                 <!-- 奖品 -->
                 <img
@@ -1362,12 +1373,24 @@
                   style="display: block"
                 />
                 <!-- 下一个奖品 -->
-                <div style="width: 8vw; align-self: stretch">
-                  <div
-                    v-if="result.length > 1 && resultShowIndex + 1 < result.length"
-                    style="width: 100%; height: 100%"
+                <div
+                  style="
+                    width: 8vw;
+                    align-self: stretch;
+
+                    display: flex;
+                    justify-content: center;
+                    align-items: center;
+                  "
+                >
+                  <img
+                    v-smart-img
+                    v-show="result.length > 1 && resultShowIndex + 1 < result.length"
+                    :src="imageUrl('rewardNext')"
+                    alt=""
+                    style="display: block; width: 100%; object-fit: cover"
                     @click="resultShowIndex++"
-                  ></div>
+                  />
                 </div>
               </div>
 
@@ -1451,12 +1474,12 @@
                 >
                   <div style="display: flex; align-items: center; gap: 4px">
                     <img
-                      :src="record.prize.prizeImage || ''"
-                      :alt="record.prize.prizeName || ''"
+                      :src="record.prize?.prizeImage || ''"
+                      alt=""
                       style="width: 10vw; object-fit: cover; display: block; aspect-ratio: 1/1"
                     />
                     <div style="font-weight: 590; font-size: 0.9em">
-                      {{ record.prize.prizeName }}
+                      {{ record.prize?.prizeName }}
                     </div>
                   </div>
                   <div style="font-weight: 510; font-size: 0.8em">
@@ -1510,7 +1533,7 @@ import {
   myRecharge, // 获取充值记录
   activityRewardConfigs, // 获取活动奖励配置列表
   myTickets, // 获取剩余中奖券
-  myTotalDrawCount, // 获取我的总抽奖次数
+  myTotalDrawCount, // 获取我的累计抽奖次数
   onceDraw, // 执行单次抽奖
   multiDraw, // 执行连抽
   drawRecords, // 获取中奖记录
@@ -1967,6 +1990,9 @@ const sweepstakes = async (consecutive = 1) => {
       if (consecutive == 1) {
         const resOnceDraw = await onceDraw(data)
         if (resOnceDraw.status && resOnceDraw.body) {
+          getTotalDrawCount() //刷新累计抽奖次数
+          getTickets() //重新获取拥有的抽奖券
+
           result.value.push(resOnceDraw.body)
 
           const resItem = resOnceDraw.body //接口获取的抽奖结果（单抽为对象）
@@ -1982,6 +2008,9 @@ const sweepstakes = async (consecutive = 1) => {
       else {
         const resMultiDraw = await multiDraw(data)
         if (resMultiDraw.status && resMultiDraw.body) {
+          getTotalDrawCount() //刷新累计抽奖次数
+          getTickets() //重新获取拥有的抽奖券
+
           result.value = resMultiDraw.body.results
 
           //取第一个抽奖结果的位置
@@ -1992,7 +2021,6 @@ const sweepstakes = async (consecutive = 1) => {
           await startLottery(index)
         }
       }
-      getTickets() //重新获取拥有的抽奖券
       getDrawRecords() // 获取中奖记录
       resultShow.value = true
       isRolling.value = false
@@ -2184,7 +2212,7 @@ const getTickets = async () => {
   }
 }
 
-//获取总的抽奖次数
+//获取累计抽奖次数
 const getTotalDrawCount = async () => {
   const resTotalDrawCount = await myTotalDrawCount()
   if (resTotalDrawCount.status && resTotalDrawCount.body) {
@@ -2269,7 +2297,7 @@ const initData = async () => {
     getMyRecharge(), //获取充值记录
     getActivityReward(), //获得奖励列表
     getTickets(), //获取拥有的抽奖券
-    getTotalDrawCount(), //获取我的总抽奖次数
+    getTotalDrawCount(), //获取我的累计抽奖次数
     getTaskList(), //获取任务列表
     getWinners(), //获取历史中奖用户
   ])