Merge branch 'summer' of https://git.szxgl.cn/liangzejun/palc-newyear2024 into summer

src/components/Draw.vue

@@ -85,6 +85,20 @@ const drawFn = (event) => {
             }, 1000);
           }
         }
+      }).catch(error =>{
+        console.log('eroor', error);
+            hasPrize.value = false; // true 中奖 || false 未中奖
+            userStore.updateDraw();
+            setTimeout(() => {
+              Toast.clear();
+              showResult.value = true;
+              gsap.from(".result-container", {
+                duration: 0.5,
+                scale: 0.7,
+                autoAlpha: 0,
+              });
+              gsap.killTweensOf(".draw-light,.draw");
+            }, 1000);
       })
     } else {
       Toast('今日抽奖次数已用完！')
@@ -150,9 +164,15 @@ onMounted(() => {
       <div class="draw-has" v-show="hasPrize">
         <div class="money">¥{{ money }}元</div>
         <div class="code-box">
-          <div class="code">{{ code }}</div>
+          <div class="code">兑奖码：{{ code }}</div>
           <div class="copy-btn" @click="copyFn($event)"></div>
         </div>
+        <div class="code-tips">
+          <div>兑奖流程：前往微信搜索【平安理财服务号】</div>
+          <div>公众号发送“清凉一夏”获取兑换链接，</div>
+          <div>输入兑换码兑换奖品。</div>
+          <div class="code-tips-text">（兑换码可在主页面“奖品”再次查看并复制）</div>
+        </div>
         <div class="cls-btn" @click="hide($event)"></div>
       </div>
       <!-- 没有奖品 -->
@@ -215,7 +235,8 @@ onMounted(() => {
     position: relative;
     @include box(665px, 731px);
     @include bg_pos("prize/myPrize-box.png");
-
+    position: relative;
+    left: 30px;
     .money {
       @include pos(370px, 81px, 139px, 239px);
       display: flex;
@@ -228,7 +249,7 @@ onMounted(() => {
     }
 
     .code-box {
-      @include pos(312px, 52px, 197px, 508px);
+      @include pos(390px, 52px, 100px, 508px);
       display: flex;
       flex-direction: row;
       align-items: center;
@@ -246,8 +267,23 @@ onMounted(() => {
       }
     }
 
+    .code-tips{
+      display: flex;
+      flex-direction: column;
+      justify-content: space-around;
+      @include pos(410px, 120px, 100px, 560px);
+      // background: rgba($color: #000000, $alpha: .7);
+      font-size: 20px;
+        font-weight: 700;
+        color: #fff6cc;
+      .code-tips-text{
+        font-size: 17px;
+        text-align: center;
+      }
+    }
+
     .cls-btn {
-      @include pos(82px, 82px, 517px, 114px);
+      @include pos(43px, 43px, 517px, 114px);
       @include bg_pos("prize/cls-btn.png");
     }
   }

src/components/Index.vue

@@ -36,8 +36,8 @@ const showRule = (event) => {
 
 onMounted(() => {
   gsap.from(".index-bg,.index-island,.index-cloud-1,.index-cloud-2,.index-tree-1", { duration: 1, scale: 1.2, autoAlpha: 0 });
-  gsap.from(".index-title", { duration: 1, y: 20, autoAlpha: 0,delay:1  });
+  gsap.from(".index-title", { duration: 1, y: 20, autoAlpha: 0  });
-  gsap.from(".index-sub-title", { duration: 1, x: 20, autoAlpha: 0,delay:1  });
+  gsap.from(".index-sub-title", { duration: 1, x: 20, autoAlpha: 0  });
   gsap.from(".index-rule-btn", { duration: 1, x: -100, autoAlpha: 0 });
   gsap.from(".index-prize-btn", {
     duration: 1,

src/components/Question.vue

@@ -355,11 +355,11 @@ onMounted(() => {
       visibility: hidden;
       width: 95%;
       font-family: "HarmonyOS_Sans_SC_Regular";
-      font-size: 20px;
+      font-size: 25px;
       color: #e74c00;
       text-align: justify;
       padding: 10px 50px;
-      height: 100px;
+      // height: 100px;
       .analysis-icon {
         display: inline-block;
         @include box(32px, 31px);

src/components/Result.vue

@@ -51,7 +51,7 @@ onMounted(() => {
     autoAlpha: 0,
     delay:0.5,
   });
-  gsap.from(".r-click-area", {
+  gsap.from(".create-poster", {
     duration: 0.7,
     y: 20,
     autoAlpha: 0,

src/components/Rule.vue

@@ -39,7 +39,7 @@ onMounted(() => {
                         <div class="part">
                             <div>活动攻略：</div>
                             <div>
-                                1、进入活动参加【好理在手 邂逅清凉一夏】答题，共设计3道题目，全部选择完毕后即可参与抽奖活动；
+                                1、进入活动参加【好“理”在手，邂逅清凉一夏】答题，共设计3道题目，全部选择完毕后即可参与抽奖活动；
                             </div>
                             <div>2、活动期间不限制参与答题次数，每人每日有1次抽奖机会。</div>
                         </div>

vite.config.js

@@ -33,7 +33,7 @@ export default defineConfig(({ command, mode }) => {
             template: 'index.html',
             injectOptions: {
               data: {
-                title: '邂逅清凉一夏',
+                title: '平安理财 邂逅清凉一夏',
               },
             }
           },
@@ -44,6 +44,7 @@ export default defineConfig(({ command, mode }) => {
         resolvers: [VantResolver()],
       }),
       AutoImport({
+        resolvers: [VantResolver()],
         imports: ['vue', 'vue-router',]
       }),
       // 开启gzip压缩