From a9f8371d0ad1b8c122188039588ba9fd432ef629 Mon Sep 17 00:00:00 2001
From: xiaoaojiao <h.yingzi@gmail.com>
Date: Tue, 23 Sep 2025 15:48:50 +0800
Subject: [PATCH] merge

---
 src/components/Ad.vue      | 8 +++++++-
 src/components/Lottery.vue | 8 ++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/Ad.vue b/src/components/Ad.vue
index f6f38d3..6477475 100644
--- a/src/components/Ad.vue
+++ b/src/components/Ad.vue
@@ -26,7 +26,7 @@ const adGoto = () => {
 
 </script>
 
-<style scoped>
+<style>
 .ad-wrapper {
   position: relative;
   width: 100vw;
@@ -48,6 +48,12 @@ const adGoto = () => {
   background-size: 100%;
 }
 
+.btn-ad wx-open-launch-weapp#launch-btn{
+  width: 100%;
+  height: 100%;
+  display: block !important;
+}
+
 .close {
   position: absolute;
   width: 8.148148vw;
diff --git a/src/components/Lottery.vue b/src/components/Lottery.vue
index 5bd08c1..21b4667 100644
--- a/src/components/Lottery.vue
+++ b/src/components/Lottery.vue
@@ -10,7 +10,7 @@
               v-show="activePrizeData.prize_code !== 'NO'"></div>
             <div class="lottery-desc" v-show="props.type === 'notice'">在刚刚结束的打榜活动中成功斩获<br /><strong>第[30]名</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.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>
@@ -312,8 +312,12 @@ onUnmounted(() => {
   position: absolute;
   bottom: 18vw;
   text-align: center;
-  width: 100%;
+  width: 80%;
+  left: 10%;
   font-size: 6vw;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
   font-weight: 700;
   color: rgb(255, 255, 255);
   text-shadow: