From 2ee6172498308d7a537ffe9c8b3924bec674392b Mon Sep 17 00:00:00 2001
From: xiaoaojiao <h.yingzi@gmail.com>
Date: Tue, 23 Sep 2025 19:33:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=90=8D=E5=A5=96?=
 =?UTF-8?q?=E5=8A=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HomePage.vue           | 17 ++++++++++---
 src/components/Lottery.vue            | 36 ++++++++++++++++++++++++---
 src/components/SynthesizedResults.vue |  2 +-
 3 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/src/components/HomePage.vue b/src/components/HomePage.vue
index 7500219..35a6fcd 100644
--- a/src/components/HomePage.vue
+++ b/src/components/HomePage.vue
@@ -22,6 +22,7 @@ const videoLoaded = ref(false);
 const videoError = ref(false);
 const lotteryShow = ref(false)
 const lotteryType = ref("draw")
+const lotteryNoticeData = ref(null)
 
 // 初始化全局音频实例
 const initGlobalAudio = () => {
@@ -228,6 +229,8 @@ const handleLottery = () => {
   if (globalStore.draw_chances <= 0) {
     return weui.alert("还没有抽奖机会，快去参加活动吧")
   };
+  lotteryType.value = 'draw'
+  lotteryNoticeData.value = null
   globalToastEvent.emit(ToastType.SHOW_LOTTERY)
 
 }
@@ -307,12 +310,20 @@ const initUserGameInfos = async (refresh_official, refresh_cap_scan) => {
     globalToastEvent.emit(ToastType.MOUNTED)
   }
 }
-
+const getNotice = async () => {
+  const result = await Request('notice/latest', {}, "GET")
+  if (result.json.notification) {
+    lotteryType.value = 'notice'
+    lotteryNoticeData.value = result.json.notification
+    lotteryShow.value = true
+  }
+}
 const handleLoginSuccess = async () => {
   console.log("已登录")
   loginShow.value = false
 
   await initUserGameInfos(true, true)
+  await getNotice()
 }
 
 if (isLogin()) {
@@ -334,7 +345,7 @@ watch(() => mergeId, async (newVal) => {
   }
 }, { immediate: true })
 
-globalToastEvent.on(ToastType.SHOW_LOTTERY, async() => {
+globalToastEvent.on(ToastType.SHOW_LOTTERY, async () => {
   await initUserGameInfos(false, false);
   lotteryShow.value = true
 })
@@ -413,7 +424,7 @@ globalToastEvent.on(ToastType.SHOW_LOTTERY, async() => {
   <MyPhoto @go-photo-square="showPhotoSquare" v-model:show="isMyPhotoVisible" />
   <PhotoSquare @go-my-photo="showMyPhoto" v-model:show="isPhotoSquareVisible" />
   <Login :show="loginShow" @login-success="handleLoginSuccess" />
-  <Lottery :show="lotteryShow" @close="lotteryShow = false" :type="lotteryType"></Lottery>
+  <Lottery :show="lotteryShow" @close="lotteryShow = false" :type="lotteryType" :data="lotteryNoticeData"></Lottery>
 </template>
 
 <style scoped>
diff --git a/src/components/Lottery.vue b/src/components/Lottery.vue
index d7c9ab7..3e19a1d 100644
--- a/src/components/Lottery.vue
+++ b/src/components/Lottery.vue
@@ -8,9 +8,12 @@
           <div class="lottery-prize">
             <div class="lottery-title" :class="props.type === 'notice' && 'notice'" ref="titleRef"
               v-show="activePrizeData.prize_code !== 'NO'"></div>
-            <div class="lottery-desc" v-show="props.type === 'notice'">在刚刚结束的打榜活动中成功斩获<br /><strong>第[30]名</strong></div>
+            <div class="lottery-desc" v-show="props.type === 'notice'">
+              在刚刚结束的打榜活动中成功斩获<br /><strong>第[{{ activePrizeData.rank }}]名</strong>
+            </div>
             <div class="lottery-image" :class="'USER_' + activePrizeData.prize_code" ref="lotteryImageRef"></div>
-            <div class="lottery-name" v-show="activePrizeData.prize_code !== 'NO'">{{ activePrizeData.prize_name }}</div>
+            <div class="lottery-name" v-show="activePrizeData.prize_code !== 'NO'">{{ activePrizeData.prize_name }}
+            </div>
             <div class="lottery-btngroup" v-show="btngroupShow">
               <div class="btn-more" @click="handleBtnMore"></div>
               <div class="btn-kaixin" @click="handleLotteryAction" v-if="activePrizeData.prize_code !== 'NO'"></div>
@@ -46,7 +49,8 @@ const btngroupShow = ref(false)
 gsap.registerPlugin()
 const props = defineProps({
   show: false,
-  type: "draw"
+  type: "draw",
+  data: null
 })
 const emit = defineEmits(['close'])
 
@@ -63,9 +67,15 @@ const handleBtnMore = () => {
   closeThis()
   globalToastEvent.emit(ToastType.SHOW_AD)
 }
-const handleLotteryAction = () => {
+const readNotice = async () => {
+  await Request(`notice/read`, { id: activePrizeData.value.noticeId })
+}
+const handleLotteryAction = async () => {
   //实物
   closeThis()
+  if (props.type !== 'draw') {
+    await readNotice()
+  }
   if (activePrizeData.value.coupon_type === 'scene') {
     globalToastEvent.emit(ToastType.SHOW_ADDRESS, activePrizeData.value.id)
   }
@@ -110,6 +120,24 @@ watch(() => props.show, async (newVal) => {
   let lottteryResult = null
   if (props.type === 'draw') {
     lottteryResult = await Request("lottery/draw", { pool: 'game', consume_type: 'points' })
+  } else {
+    if (!props.data) {
+      weui.alert("获取排名奖励出错，请刷新页面重试")
+      emit('close')
+      return
+    }
+
+    lottteryResult = {
+      res: { status: 200 },
+      json: {
+        noticeId: props.data.id,
+        id: props.data.data.prize.id,
+        prize_code: props.data.data.prize.prize_code,
+        prize_name: props.data.data.prize.name,
+        coupon_type: props.data.data.prize.scene,
+        rank: props.data.data.rank
+      }
+    }
   }
   // const userPicture = await getUserPicture()
 
diff --git a/src/components/SynthesizedResults.vue b/src/components/SynthesizedResults.vue
index a759570..b938cb8 100644
--- a/src/components/SynthesizedResults.vue
+++ b/src/components/SynthesizedResults.vue
@@ -153,7 +153,7 @@ const handleBtnMore = () => {
   </div>
 
   <Popup v-model:show="isPopupVisible" />
-  <Lottery :show="lotteryShow" @close="lotteryShow = false"></Lottery>
+  <Lottery :show="lotteryShow" @close="lotteryShow = false" data="null" type="draw"></Lottery>
 </template>
 
 <style scoped>