merge

src/components/HomePage.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed, watch, onMounted } from "vue"
 import { useRouter, useRoute } from 'vue-router'
-import faceFamily from "../assets/audio/faceFamily.mp3"
+import bgm from "../assets/audio/bgm.mp3"
 import backgroundVideo from "../assets/video/1_stab_chf3_rhea1.mp4"
 import MyPhoto from './MyPhoto.vue'
 import PhotoSquare from './PhotoSquare.vue'
@@ -26,7 +26,7 @@ const lotteryType = ref("draw")
 // 初始化全局音频实例
 const initGlobalAudio = () => {
   if (!globalStore.globalAudio) {
-    globalStore.globalAudio = new Audio(faceFamily);
+    globalStore.globalAudio = new Audio(bgm);
     globalStore.globalAudio.loop = true; // 设置循环播放
     globalStore.globalAudio.preload = 'auto';
 
@@ -362,6 +362,10 @@ watch(() => lotteryShow.value, async (newVal) => {
         <img src="../assets/images/slogan.webp" alt="slogan">
       </div>
 
+      <div class="scene-item home-title">
+        <img src="../assets/images/home-title.webp" alt="slogan">
+      </div>
+
       <!-- fallback 背景图，当视频无法加载时显示 -->
       <div v-if="videoError || !videoLoaded" class="fallback-background"></div>
 
@@ -423,6 +427,11 @@ watch(() => lotteryShow.value, async (newVal) => {
   width: 76vw;
 }
 
+.home-title {
+  width: 72vw;
+  top: 144vw;
+}
+
 .main {
   height: 100%;
   overflow-y: auto;

src/components/Lottery.vue

@@ -128,7 +128,7 @@ watch(() => props.show, async (newVal) => {
   // await Sleep(20000)
 
 
-  // const lottteryResult = await Request("lottery/draw", { pool: 'game', consume_type: 'points' })
+  lottteryResult = await Request("lottery/draw", { pool: 'game', consume_type: 'points' })
   // TODO: 测试数据
   // lottteryResult = {
   //   res: { status: 200 },
@@ -248,6 +248,10 @@ onUnmounted(() => {
   background-image: url("../assets/images/USER_LZ_XS_SPZ_30ML.webp");
 }
 
+.lottery-image.USER_LZ_DZ_JBGJ {
+  background-image: url("../assets/images/USER_LZ_DZ_JBGJ.webp");
+}
+
 .guang,
 .guangyun {
   position: absolute;

src/components/MyPhoto.vue

@@ -243,7 +243,7 @@ const handleHaibao = async (item) => {
         const qrcode = await generateQR(`fromid=${infos.invite_code}&merge_id=${globalStore.mergeId}`, 200, 200)
         haibaoSave.add(bg, 0, 0)
         haibaoSave.add(url, 64, 250)
-        haibaoSave.add(qrcode, 115, 1875)
+        haibaoSave.add(qrcode, 127, 1860)
         haibaoSave.draw().then(() => {
           haibaoSave.text(infos.nickname + '的全家福', haibaoSave.canvas.width / 2, 200, { font: 'bold 50px Arial', color: '#fcf2b3' })
           haibaoSave.generate({ mimeType: 'image/png' }).then(url => {
@@ -289,7 +289,7 @@ const handleHaibao = async (item) => {
         const qrcode = await generateQR(`fromid=${infos.invite_code}&merge_id=${globalStore.mergeId}`, 200, 200)
         haibaoSaveNoTitle.add(bg, 0, 0)
         haibaoSaveNoTitle.add(url, 64, 250)
-        haibaoSaveNoTitle.add(qrcode, 115, 1875)
+        haibaoSaveNoTitle.add(qrcode, 127, 1860)
         haibaoSaveNoTitle.draw().then(() => {
           haibaoSaveNoTitle.text(infos.nickname + '的全家福', haibaoSaveNoTitle.canvas.width / 2, 200, { font: 'bold 50px Arial', color: '#fcf2b3' })
           haibaoSaveNoTitle.generate({ mimeType: 'image/png' }).then(url => {

src/components/PhotoSquare.vue

@@ -190,7 +190,7 @@ const getBackgroundImage = (item) => {
           }"
           @click.stop="$emit('go-my-photo')">
       </div>
-      <p class="my-photo-desc">打榜活动截止至9月30日晚24点结束，中奖信息将于10月1日早10点推送至获奖会员。</p>
+      <p class="my-photo-desc">打榜活动截止至9月30日23:59:59结束，中奖信息将于10月1日早10点推送至获奖会员。</p>
       <div v-if="!disableInviteHelp" class="image-gallery ">
         <RecycleScroller
             class="scroller"

src/components/PrizeList.vue

@@ -158,7 +158,7 @@ wx-open-launch-weapp,
 }
 
 .prizelist-cover.USER_LZ_ZQ_DZJ {
-  background-image: url("../assets/images/USER_LZ_ZQ_DZJ.webp");
+  background-image: url("../assets/images/generate/USER_LZ_ZQ_DZJ.webp");
 }
 
 .prizelist-cover.USER_HG_42_GPJ_500ML {
@@ -170,7 +170,7 @@ wx-open-launch-weapp,
 }
 
 .prizelist-cover.USER_DZSKSJ {
-  background-image: url("../assets/images/USER_DZSKSJ.webp");
+  background-image: url("../assets/images/generate/USER_DZSKSJ.webp");
 }
 
 .prizelist-cover.USER_LZ_ZQ_DZJ_LJW {
@@ -178,7 +178,11 @@ wx-open-launch-weapp,
 }
 
 .prizelist-cover.USER_LZ_XS_SPZ_30ML {
-  background-image: url("../assets/images/USER_LZ_XS_SPZ_30ML.webp");
+  background-image: url("../assets/images/generate/USER_LZ_XS_SPZ_30ML.webp");
+}
+
+.prizelist-cover.USER_LZ_DZ_JBGJ {
+  background-image: url("../assets/images/USER_LZ_DZ_JBGJ.webp");
 }
 
 .prizelist-cover.USER_DZCZ {

src/components/SynthesizedResults.vue

@@ -82,7 +82,7 @@ const handleHaibao = async () => {
       const qrcode = await generateQR(`fromid=${infos.invite_code}&merge_id=${infos.merge_id}`, 200, 200)
       haibaoSave.add(bg, 0, 0)
       haibaoSave.add(url, 64, 250)
-      haibaoSave.add(qrcode, 115, 1875)
+      haibaoSave.add(qrcode, 127, 1860)
       haibaoSave.draw().then(() => {
         haibaoSave.text(infos.nickname + '的全家福', haibaoSave.canvas.width / 2, 200, { font: 'bold 50px Arial', color: '#fcf2b3' })
         haibaoSave.generate({ mimeType: 'image/png' }).then(url => {