From fd1fe50618c784911ea62d6a7aaebaa7169ae4dc Mon Sep 17 00:00:00 2001
From: Ethereal <3432649580@qq.com>
Date: Thu, 24 Jul 2025 10:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=A1=E7=89=8C=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E5=A4=A7=E5=B0=8F=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E4=B8=80=E4=B8=AA=E5=95=86=E5=93=81=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=8A=BD=E5=8F=96=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/API.js                             |  2 +-
 src/views/choujiang/index.vue              | 23 ++++++++++++++++++++++-
 src/views/choujiang/lottery/CardItem.vue   |  2 +-
 src/views/choujiang/lottery/Lottery3D.vue  |  2 +-
 src/views/choujiang/lottery/PrizePanel.vue |  2 +-
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/api/API.js b/src/api/API.js
index bee602c..85fe151 100644
--- a/src/api/API.js
+++ b/src/api/API.js
@@ -24,7 +24,7 @@ export const getUserListApi = function (params) {
 // 查询中奖名单
 export const getGetPrizeUserListApi = function (params) {
   return request({
-    url: `${APIurl}/admin/win/list`,
+    url: `${APIurl}/api/winUser/list`,
     method: "POST",
     data: params,
   });
diff --git a/src/views/choujiang/index.vue b/src/views/choujiang/index.vue
index 8289d98..bdcf8b0 100644
--- a/src/views/choujiang/index.vue
+++ b/src/views/choujiang/index.vue
@@ -25,6 +25,12 @@
       </div>
     </div>
 
+    <div v-if="showPrizeExhaustedModal2" class="prize-exhausted-modal">
+      <div class="modal-content">
+        <p class="modal-text">该礼品已抽取完毕</p>
+      </div>
+    </div>
+
     <!-- <UserList
       :lucky-users="
         dataManager.state.basicData.luckyUsers[
@@ -56,6 +62,7 @@ const qipaoText = ref("");
 const showQipao = ref(false);
 const showPrizeExhaustedModal = ref(false);
 const showPrizeExhaustedModal1 = ref(false);
+const showPrizeExhaustedModal2 = ref(false);
 
 // const lotteryState = ref('idle'); // idle, ready, rotating, result
 
@@ -161,7 +168,7 @@ async function handleLotteryClick() {
 
       break;
     case "ready":
-      if (waitingForNextReveal.value || lastRevealed.value === 0) {
+      if (waitingForNextReveal.value) {
         console.log("waitingForNextReveal.value", waitingForNextReveal.value);
         // 显示弹窗提示
         showPrizeExhaustedModal.value = true;
@@ -184,6 +191,20 @@ async function handleLotteryClick() {
         break;
       }
 
+      if (lastRevealed.value === 0 && dataManager.state.basicData.prizes[lastRevealed.value].remainNum === 0) {
+        // 如果是最后一个奖品且剩余数量为0，则跳出
+        // const currentPrize = dataManager.state.basicData.prizes[lastRevealed.value];
+        // if (currentPrize && currentPrize.remainNum === 0) {
+          showPrizeExhaustedModal2.value = true;
+          setTimeout(() => {
+            showPrizeExhaustedModal2.value = false;
+          }, 1000);
+          isDisabled.value = false;
+        break;
+
+        // }
+      }
+
       console.log("lotteryState 变更前:", lotteryState.value, "-> rotating");
       lotteryState.value = "rotating";
       console.log("lotteryState 变更后:", lotteryState.value);
diff --git a/src/views/choujiang/lottery/CardItem.vue b/src/views/choujiang/lottery/CardItem.vue
index 9774ace..bd3cd7c 100644
--- a/src/views/choujiang/lottery/CardItem.vue
+++ b/src/views/choujiang/lottery/CardItem.vue
@@ -173,7 +173,7 @@ onBeforeUnmount(() => {
   /* ... */
 }
 .details {
-  font-size: 26px;
+  font-size: 24px;
   color: white;
   text-align: center;
   display: flex;
diff --git a/src/views/choujiang/lottery/Lottery3D.vue b/src/views/choujiang/lottery/Lottery3D.vue
index eadc157..464d930 100644
--- a/src/views/choujiang/lottery/Lottery3D.vue
+++ b/src/views/choujiang/lottery/Lottery3D.vue
@@ -571,7 +571,7 @@ function changeCard(cardIndex, user) {
   const username = user.username || user[1] || "";
   const company = user.company || user[2] || "PSST";
   
-  card.innerHTML = `<div style="font-size: 30px; font-weight: bold; color: #ffffff; text-align: center; display: flex; justify-content: center; align-items: center; width: 100%; height: 100%;">${jwcode}</div>`;
+  card.innerHTML = `<div style="font-size: 20px; font-weight: bold; color: #ffffff; text-align: center; display: flex; justify-content: center; align-items: center; width: 100%; height: 100%;">${jwcode}</div>`;
 
   // 添加中奖样式类
   card.classList.add("prize");
diff --git a/src/views/choujiang/lottery/PrizePanel.vue b/src/views/choujiang/lottery/PrizePanel.vue
index 08d8d42..e3e027a 100644
--- a/src/views/choujiang/lottery/PrizePanel.vue
+++ b/src/views/choujiang/lottery/PrizePanel.vue
@@ -399,7 +399,7 @@ onMounted(() => {
   gap: 18px;
   max-height: 700px;
   overflow-x: hidden !important;
-  overflow-y: auto;
+  /* overflow-y: auto; */
   padding-right: 10px;
   padding-left: 10px;
   scrollbar-width: thin;