From f6bffc9c01460a1e09467e1a47e34819c2d67109 Mon Sep 17 00:00:00 2001
From: Ethereal <3432649580@qq.com>
Date: Tue, 22 Jul 2025 15:32:49 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A5=96=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/choujiang/lottery/PrizePanel.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/choujiang/lottery/PrizePanel.vue b/src/views/choujiang/lottery/PrizePanel.vue
index ccc7052..505f63d 100644
--- a/src/views/choujiang/lottery/PrizePanel.vue
+++ b/src/views/choujiang/lottery/PrizePanel.vue
@@ -368,7 +368,7 @@ function getProgressPercent(prize) {
   background: none;
   z-index: 10;
   min-width: 300px;
-  max-width: 342px;
+  max-width: 362px;
   text-align: left;
   display: flex;
   flex-direction: column;
@@ -377,6 +377,7 @@ function getProgressPercent(prize) {
   overflow-x: hidden !important;
   overflow-y: auto;
   padding-right: 10px;
+  padding-left: 10px;
   scrollbar-width: thin;
   scrollbar-color: #ffd283 rgba(255, 210, 131, 0.3); /* Firefox */
 }
@@ -505,7 +506,7 @@ function getProgressPercent(prize) {
   background: none;
   z-index: 10;
   min-width: 320px;
-  max-width: 342px;
+  max-width: 362px;
   display: flex;
   flex-direction: column;
 }
@@ -682,9 +683,14 @@ function getProgressPercent(prize) {
 .prize-panel-item.revealed-highlight {
   /* border: 3px solid #ff9800; */
   box-shadow: 0 0 16px 4px #ff9800aa;
-  transform: scale(1.05);
+  transform: scale(1.03);
   z-index: 2;
   transition: all 0.3s;
+  /* 确保放大的元素不被遮挡 */
+  position: relative;
+  /* margin: 8px 0; */
+  /* 为放大的元素留出空间 */
+  transform-origin: center center;
 }
 
 .prize-panel-item.disabled {

From 077d7b97acafd16effbc9a3956bfb559d63dc49a Mon Sep 17 00:00:00 2001
From: pangluotong <123456@163.com>
Date: Wed, 23 Jul 2025 11:00:30 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA,=E6=94=B9=E5=8F=98?=
 =?UTF-8?q?=E5=A5=96=E5=93=81=E5=88=97=E8=A1=A8=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/choujiang/lottery/PrizePanel.vue | 46 +++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/views/choujiang/lottery/PrizePanel.vue b/src/views/choujiang/lottery/PrizePanel.vue
index ccc7052..6ae470b 100644
--- a/src/views/choujiang/lottery/PrizePanel.vue
+++ b/src/views/choujiang/lottery/PrizePanel.vue
@@ -1,6 +1,9 @@
 <template>
   <div v-if="showOne">
     <div class="prize-panel-root">
+        <div v-if="showNotification" class="auto-hide-notification">
+      {{ notificationMessage }}
+    </div>
       <div class="prize-panel-list" v-if="prizes && prizes.length">
         <div
           class="prize-panel-item"
@@ -48,11 +51,7 @@
             />
           </div>
         </div>
-        <div></div>
-        <div></div>
-        <div></div>
-        <div></div>
-      </div>
+             </div>
       <div class="prize-panel-footer">
         <div class="arrow-up" @click="openWinnerList"></div>
         <button
@@ -171,6 +170,17 @@ import { ref, computed, nextTick, watch, onMounted } from "vue";
 import { useLotteryStore } from "../../../store/lottery";
 import { useDataManager } from "../lottery/dataManager";
 
+const showNotification = ref(false);
+const notificationMessage = ref('');
+
+// 显示提示并自动消失
+const showAutoHideNotification = (message, duration = 1500) => {
+  notificationMessage.value = message;
+  showNotification.value = true;
+  setTimeout(() => {
+    showNotification.value = false;
+  }, duration);
+};
 const props = defineProps({
   prizes: Array,
 });
@@ -237,8 +247,10 @@ function canRevealPrize(idx) {
 // 卡片点击事件
 function handleReveal(idx) {
   // 检查是否可以揭秘这个奖品
-  if (idx !== nextRevealIdx.value) {
-    alert("请按顺序揭秘奖品!");
+  if (idx !== nextRevealIdx.value && !isRevealed(idx)) {
+    // alert("请按顺序揭秘奖品!");
+    showAutoHideNotification("请按顺序揭秘奖品!");
+   
     return;
   }
   if (idx === nextRevealIdx.value && canRevealPrize(idx)) {
@@ -291,7 +303,10 @@ async function openWinnerList() {
   // showWinnerList.value = true;
   if (!showWinnerList.value) {
     if (revealedCount.value === 0) {
-      alert("请先揭晓奖品,并抽奖！");
+      // alert("请先揭晓奖品,并抽奖！");
+      showAutoHideNotification("请先揭晓奖品,并抽奖！");
+      
+
     }
     //  await updatePrizeList();
   }
@@ -329,7 +344,8 @@ async function toggleWinnerList() {
   );
   if (!showWinnerList.value) {
     if (revealedCount.value === 0) {
-      alert("请先揭晓奖品,并抽奖！");
+      // alert("请先揭晓奖品,并抽奖！");
+      showAutoHideNotification("请先揭晓奖品,并抽奖！");
     }
   }
 
@@ -363,6 +379,16 @@ function getProgressPercent(prize) {
 </script>
 
 <style scoped>
+.auto-hide-notification {
+  position: fixed;
+  top: 300px;
+  left: 50%;
+  transform: translateX(-50%);
+  color: #e61414;
+  padding: 8px 16px;
+  border-radius: 4px;
+  font-size: 50px;
+  z-index: 1000;}
 .prize-panel-list {
   position: relative;
   background: none;
@@ -373,7 +399,7 @@ function getProgressPercent(prize) {
   display: flex;
   flex-direction: column;
   gap: 18px;
-  height: 700px;
+  max-height: 700px;
   overflow-x: hidden !important;
   overflow-y: auto;
   padding-right: 10px;

From 2478651625a32a1f9a921ffc4a5ae54f64b91cb0 Mon Sep 17 00:00:00 2001
From: Ethereal <3432649580@qq.com>
Date: Wed, 23 Jul 2025 11:20:39 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A0=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=97=B6=EF=BC=8C=E8=BF=98=E8=83=BD=E7=BB=A7=E7=BB=AD?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/choujiang/index.vue              |  2 +-
 src/views/choujiang/lottery/PrizePanel.vue | 41 ++++++++++--------------------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/views/choujiang/index.vue b/src/views/choujiang/index.vue
index 0cddadf..27bde43 100644
--- a/src/views/choujiang/index.vue
+++ b/src/views/choujiang/index.vue
@@ -159,7 +159,7 @@ async function handleLotteryClick() {
 
       break;
     case "ready":
-      if (waitingForNextReveal.value) {
+      if (waitingForNextReveal.value || lastRevealed.value === 0) {
         console.log("waitingForNextReveal.value", waitingForNextReveal.value);
         // 显示弹窗提示
         showPrizeExhaustedModal.value = true;
diff --git a/src/views/choujiang/lottery/PrizePanel.vue b/src/views/choujiang/lottery/PrizePanel.vue
index 505f63d..4e90044 100644
--- a/src/views/choujiang/lottery/PrizePanel.vue
+++ b/src/views/choujiang/lottery/PrizePanel.vue
@@ -48,18 +48,11 @@
             />
           </div>
         </div>
-        <div></div>
-        <div></div>
-        <div></div>
-        <div></div>
+      
       </div>
       <div class="prize-panel-footer">
         <div class="arrow-up" @click="openWinnerList"></div>
-        <button
-          ref="winnerBtnRef"
-          class="winner-btn"
-          @click="toggleWinnerList"
-        >
+        <button ref="winnerBtnRef" class="winner-btn" @click="toggleWinnerList">
           获奖名单
         </button>
       </div>
@@ -277,9 +270,7 @@ console.log("fakeWinners", fakeWinners.value);
 import { getGetPrizeUserListApi } from "../../../api/API";
 const updateWinners = async () => {
   try {
-    const response = await getGetPrizeUserListApi({
-      
-    });
+    const response = await getGetPrizeUserListApi({});
     console.log("updatePrizeList response", response);
     fakeWinners.value = response.data.list;
     console.log("updateWinners fakeWinners", fakeWinners.value);
@@ -373,7 +364,7 @@ function getProgressPercent(prize) {
   display: flex;
   flex-direction: column;
   gap: 18px;
-  height: 700px;
+  max-height: 700px;
   overflow-x: hidden !important;
   overflow-y: auto;
   padding-right: 10px;
@@ -387,6 +378,8 @@ function getProgressPercent(prize) {
   z-index: 10;
   min-width: 320px;
   max-width: 342px;
+  padding-right: 10px;
+  padding-left: 10px;
   text-align: left;
   display: flex;
 }
@@ -465,17 +458,10 @@ function getProgressPercent(prize) {
   color: #d84315;
   font-weight: 500;
 }
-/* .prize-row-bottom {
-  background: linear-gradient(90deg, #ff9800 0%, #ff5722 100%);
-  background: #8a3500;
-  border-radius: 16px;
-  color: #fff;
-  font-size: 20px;
-  font-weight: bold;
-  padding: 2px 0 2px 0;
-  justify-content: center;
-  min-width: 80px;
-} */
+.prize-row-bottom {
+   /* margin-bottom: 8px; */
+  /* border: 1px solid #ea2b0a; */
+}
 .custom-arrow-icon {
   font-size: 24px; /* 图标大小 */
   color: #d84315; /* 图标颜色，使用项目主题橙色 */
@@ -513,7 +499,7 @@ function getProgressPercent(prize) {
 
 .prize-panel-footer {
   position: relative;
-  width: 100%;
+  /* width: 100%; */
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -629,8 +615,8 @@ function getProgressPercent(prize) {
 }
 .progress-bar-bg {
   position: relative;
-  width: 220px;
-  height: 28px;
+  width: 228px;
+  height: 30px;
   background: #e9620e;
   border-radius: 16px;
   overflow: hidden;
@@ -643,6 +629,7 @@ function getProgressPercent(prize) {
   position: absolute;
   left: 0;
   top: 0;
+  /* width: 100%; */
   height: 100%;
   /* background: linear-gradient(90deg, #ff9800 0%, #8a3500 100%); */
   background: #8a3500;

From e3fa0f8a32446c956bb7c8b2b3ea70ad5099524a Mon Sep 17 00:00:00 2001
From: Ethereal <3432649580@qq.com>
Date: Wed, 23 Jul 2025 11:35:56 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=A5=96?=
 =?UTF-8?q?=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/choujiang/index.vue              | 8 +++++---
 src/views/choujiang/lottery/PrizePanel.vue | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/choujiang/index.vue b/src/views/choujiang/index.vue
index 27bde43..aa816c9 100644
--- a/src/views/choujiang/index.vue
+++ b/src/views/choujiang/index.vue
@@ -101,13 +101,15 @@ const lotteryEngine = useLotteryEngine(dataManager, {
 });
 
 onMounted(async () => {
+  
+  await dataManager.getBasicData();
+
+  await dataManager.getUsers();
   isDisabled.value = true;
   setTimeout(() => {
     isDisabled.value = false;
-  }, 4000);
+  }, 3800);
 
-  await dataManager.getBasicData();
-  await dataManager.getUsers();
 
   // 将 dataManager 挂载到 window 对象，供子组件使用
   window.dataManager = dataManager;
diff --git a/src/views/choujiang/lottery/PrizePanel.vue b/src/views/choujiang/lottery/PrizePanel.vue
index 4e90044..03c0159 100644
--- a/src/views/choujiang/lottery/PrizePanel.vue
+++ b/src/views/choujiang/lottery/PrizePanel.vue
@@ -348,9 +348,9 @@ function getProgressPercent(prize) {
   return Math.round((left / total) * 100);
 }
 
-// onMounted(() => {
-//   updateWinners();
-// });
+onMounted(() => {
+  updateWinners();
+});
 </script>
 
 <style scoped>

From 5e671550cffb96456884c0782e7fc7ce2a6f839b Mon Sep 17 00:00:00 2001
From: Ethereal <3432649580@qq.com>
Date: Wed, 23 Jul 2025 11:57:19 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=A5=96=E5=93=81=E5=88=97=E8=A1=A8=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/choujiang/index.vue              | 2 +-
 src/views/choujiang/lottery/PrizePanel.vue | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/choujiang/index.vue b/src/views/choujiang/index.vue
index aa816c9..8289d98 100644
--- a/src/views/choujiang/index.vue
+++ b/src/views/choujiang/index.vue
@@ -101,11 +101,11 @@ const lotteryEngine = useLotteryEngine(dataManager, {
 });
 
 onMounted(async () => {
+  isDisabled.value = true;
   
   await dataManager.getBasicData();
 
   await dataManager.getUsers();
-  isDisabled.value = true;
   setTimeout(() => {
     isDisabled.value = false;
   }, 3800);
diff --git a/src/views/choujiang/lottery/PrizePanel.vue b/src/views/choujiang/lottery/PrizePanel.vue
index 613ce38..08d8d42 100644
--- a/src/views/choujiang/lottery/PrizePanel.vue
+++ b/src/views/choujiang/lottery/PrizePanel.vue
@@ -286,7 +286,10 @@ console.log("fakeWinners", fakeWinners.value);
 import { getGetPrizeUserListApi } from "../../../api/API";
 const updateWinners = async () => {
   try {
-    const response = await getGetPrizeUserListApi({});
+    const response = await getGetPrizeUserListApi({
+      pageSize: 1000,
+      pageNum: 1,
+    });
     console.log("updatePrizeList response", response);
     fakeWinners.value = response.data.list;
     console.log("updateWinners fakeWinners", fakeWinners.value);

From 89313277af39521d0801eab6ecdf97897d3d9092 Mon Sep 17 00:00:00 2001
From: pangluotong <123456@163.com>
Date: Wed, 23 Jul 2025 13:35:59 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=8E=B7?=
 =?UTF-8?q?=E5=A5=96=E5=90=8D=E5=8D=95bug,=E6=9B=B4=E6=94=B9=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E6=8F=90=E9=86=92=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/choujiang/index.vue              | 28 ++++++++++------------------
 src/views/choujiang/lottery/PrizePanel.vue |  4 +++-
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/views/choujiang/index.vue b/src/views/choujiang/index.vue
index aa816c9..b119c57 100644
--- a/src/views/choujiang/index.vue
+++ b/src/views/choujiang/index.vue
@@ -329,30 +329,22 @@ function handleNextPrize() {
 }
 
 .modal-text {
+  position: fixed !important;
+  top: 300px;
+  left: 50% !important;
+  transform: translate(-50%, -50%) !important;
   color: #ff0000;
-  font-size: 18px;
+  font-size: 50px;
   font-weight: bold;
-  text-align: center;
   margin: 0;
   white-space: nowrap;
+
 }
 
 @keyframes fadeInOut {
-  0% {
-    opacity: 0;
-    transform: translateY(-20px);
-  }
-  20% {
-    opacity: 1;
-    transform: translateY(0);
-  }
-  80% {
-    opacity: 1;
-    transform: translateY(0);
-  }
-  100% {
-    opacity: 0;
-    transform: translateY(-20px);
-  }
+   0% { opacity: 0; }
+  20% { opacity: 1; }
+  80% { opacity: 1; }
+  100% { opacity: 0; }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/choujiang/lottery/PrizePanel.vue b/src/views/choujiang/lottery/PrizePanel.vue
index 613ce38..9ae26c0 100644
--- a/src/views/choujiang/lottery/PrizePanel.vue
+++ b/src/views/choujiang/lottery/PrizePanel.vue
@@ -55,7 +55,7 @@
       </div>
       <div class="prize-panel-footer">
         <div class="arrow-up" @click="openWinnerList"></div>
-        <button ref="winnerBtnRef" class="winner-btn" @click="toggleWinnerList">
+        <button ref="winnerBtnRef" class="winner-btn" @click="openWinnerList">
           获奖名单
         </button>
       </div>
@@ -329,6 +329,7 @@ async function toggleWinnerList() {
   await updateWinners();
 
   showWinnerList.value = !showWinnerList.value;
+  
   console.log(
     "toggleWinnerList - showWinnerList:",
     showWinnerList.value,
@@ -571,6 +572,7 @@ onMounted(() => {
   font-weight: bold;
   cursor: pointer;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+  outline: none;
 }
 .winner-modal-mask {
   position: fixed;

From 3b125e172eb88727fca00018d7e8c6b7eb2327ee Mon Sep 17 00:00:00 2001
From: no99 <17663930442@163.com>
Date: Wed, 23 Jul 2025 13:52:06 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=AD=E5=A5=96=E5=90=8D=E5=8D=95api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/API.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/API.js b/src/api/API.js
index 00da9e9..9227bd0 100644
--- a/src/api/API.js
+++ b/src/api/API.js
@@ -23,7 +23,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,
   });

From e2170b97e20cbe79f159ef66f9bc4142e2c2a21f Mon Sep 17 00:00:00 2001
From: no99 <17663930442@163.com>
Date: Wed, 23 Jul 2025 13:58:14 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=B8=AD=E5=A5=96=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1=E5=88=9D=E5=A7=8B=E5=8C=96=E4=B8=8D=E5=AF=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/choujiang/hxl-cj/cj.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/choujiang/hxl-cj/cj.vue b/src/views/choujiang/hxl-cj/cj.vue
index 7b51918..cb2748b 100644
--- a/src/views/choujiang/hxl-cj/cj.vue
+++ b/src/views/choujiang/hxl-cj/cj.vue
@@ -267,7 +267,7 @@ const closeGetPrize = () => {
 };
 
 //揭示奖品
-const lookPrize = (item) => {
+const lookPrize = async (item) => {
   // 未进入抽奖禁止揭晓
   if (!joinLottery) {
     addQipao("请先进入抽奖。");
@@ -315,6 +315,8 @@ const lookPrize = (item) => {
     //点击揭晓
     item.isLook = true;
   }
+  await nextTick();
+  setPrizeData(currentPrizeIndex);
 };
 
 function setPrizeData(currentPrizeIndex, isInit) {
@@ -345,7 +347,8 @@ function setPrizeData(currentPrizeIndex, isInit) {
     }
   }
 
-  //   console.log("currentPrize", currentPrize);
+  console.log("count", count);
+  console.log("totalCount", totalCount);
 
   let percent = (count / totalCount).toFixed(2);
   if (elements.bar) {