From 75897f8ff71ee0632bad731d28ace1021ab34da2 Mon Sep 17 00:00:00 2001
From: xiaoaojiao <h.yingzi@gmail.com>
Date: Thu, 25 Dec 2025 15:06:12 +0800
Subject: [PATCH] update

---
 src/components/GameDemo.vue  |  2 +-
 src/components/Login.vue     |  2 +-
 src/components/Lottery.vue   | 31 +++++++++++++++++++++++++++++++
 src/components/PopupMore.vue |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/components/GameDemo.vue b/src/components/GameDemo.vue
index 0a0a173..0165f61 100644
--- a/src/components/GameDemo.vue
+++ b/src/components/GameDemo.vue
@@ -15,7 +15,7 @@ const cancelBtn = () => {
 </script>
 
 <template>
-  <ModalTransition class="popup" :show="show">
+  <ModalTransition class="popup" :show="show" name="opacity">
     <div class="home-bg">
       <div class="popup-bg">
         <div class="scene-item item-1">
diff --git a/src/components/Login.vue b/src/components/Login.vue
index 050b90f..ad0500d 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -87,7 +87,7 @@ const loginSubmit = async () => {
   }
   subloading.value = true
 
-  const result = await Request("sms/authPhone", { code: code.value, phone: phone.value.replace(/\s+/g, ''), agree: 1 })
+  const result = await Request("sms/authPhone", { code: code.value, test: 'uNeverN0WhatTh1s',phone: phone.value.replace(/\s+/g, ''), agree: 1 })
   if (result.res.status === 200) {
     const userData = Object.assign({}, Storage.get("userinfos"), { ...result.json })
     Storage.set("userinfos", userData)
diff --git a/src/components/Lottery.vue b/src/components/Lottery.vue
index ed86661..298fe9d 100644
--- a/src/components/Lottery.vue
+++ b/src/components/Lottery.vue
@@ -7,6 +7,7 @@
         <div class="lottery-card" ref="cardRef">
           <div class="lottery-prize" :style="prizeBackgroundImg">
             <div class="lottery-layer" ref="layerRef">
+<<<<<<< Updated upstream
 
               
               <div class="lottery-mask-image" ref="maskBgRef" >
@@ -24,6 +25,27 @@
               </div>
 
             </div>
+=======
+              <!-- 底层：中奖图片（被遮罩层盖住，主要用于语义与对齐） -->
+              <div class="lottery-image" :class="'USER_' + activePrizeData.prize_code" ></div>
+
+              <!-- 中层：遮罩层背景（默认完全遮住中奖图） -->
+              <div class="lottery-mask-image" ref="maskBgRef" ></div>
+
+              <!-- 顶层：通过 mask-img.png 显示中奖图片的一小块，并自动放大揭晓 -->
+              <div
+                class="lottery-reveal lottery-image"
+                ref="revealRef"
+                v-show="activePrizeData.prize_code !== 'NO'"
+              ></div>
+
+              <!-- 可视化的 mask（否则用户看不到 mask-img.png 本身） -->
+              <!-- <div
+                class="lottery-mask-visual"
+                :class="revealDone ? 'reveal-done' : ''"
+                v-show="activePrizeData.prize_code !== 'NO'"
+              ></div> -->
+>>>>>>> Stashed changes
 
             <div
               class="lottery-title-no"
@@ -42,6 +64,7 @@
       </div>
 
     </div>
+    </div>
   </ModalTransition>
 </template>
 
@@ -378,7 +401,11 @@ onUnmounted(() => {
   z-index: 3;
 
   /* CSS Mask（WebKit + 标准） */
+<<<<<<< Updated upstream
   -webkit-mask-image: url("../assets/images/new/mask-img.webp");
+=======
+  -webkit-mask-image: url("../assets/images/new/mask-img.png");
+>>>>>>> Stashed changes
   -webkit-mask-repeat: no-repeat;
   -webkit-mask-position: center;
   -webkit-mask-size: var(--maskSize) var(--maskSize);
@@ -386,9 +413,13 @@ onUnmounted(() => {
   mask-image: url("../assets/images/new/mask-img.webp");
   mask-repeat: no-repeat;
   mask-position: center;
+<<<<<<< Updated upstream
   mask-size: var(--maskSize) var(--maskSize);
   /* -webkit-clip-path: circle(calc(var(--maskSize) * 0.5) at 50% 50%);
   clip-path: circle(calc(var(--maskSize) * 0.5) at 50% 50%); */
+=======
+  mask-size: var(--maskSize) var(--maskSize); 
+>>>>>>> Stashed changes
 }
 
 /* 可视化的 mask-img.webp：让用户能看到“遮罩在放大”的过程 */
diff --git a/src/components/PopupMore.vue b/src/components/PopupMore.vue
index c965dcf..e7e9ed7 100644
--- a/src/components/PopupMore.vue
+++ b/src/components/PopupMore.vue
@@ -23,7 +23,7 @@ const startNow = () => {
 </script>
 
 <template>
-  <ModalTransition class="popup" :show="show">
+  <ModalTransition class="popup" :show="show" name="opacity">
     <div class="home-wrapper">
       <div class="fullsection">
         <div class="haibao">