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

.env.fat

@@ -5,3 +5,4 @@ VITE_FOLDER = /vite-4
 VITE_APPID = wxc2bc9f9e8d19b504
 VITE_API = /intfgw/data/mmoactivity
 VITE_URL = https://w-stg.pingan.com.cn/lckj/pawm-mmo-activity-xgl-frontend/index.html
+

src/api/index.js

@@ -2,7 +2,7 @@ import http from './http'
 
 // 获取code
 export function authorize(data, authorization) {
-    return http.post("/h5/Oauth/authorize",
+    return http.post("/h5/oauth/authorize",
         data,
         true,
     );
@@ -10,7 +10,7 @@ export function authorize(data, authorization) {
 
 // 获取用户信息
 export function getUserInfo(data, authorization) {
-    return http.post("/h5/Oauth/getUserInfo",
+    return http.post("/h5/oauth/getUserInfo",
         data,
         true,
     );
@@ -54,7 +54,7 @@ export function exchangePrize(data, authorization) {
 
 // 分享接口
 export function getShareConfig(data, authorization) {
-    return http.post("/h5/Oauth/getShareConfig",
+    return http.post("/h5/oauth/getShareConfig",
         data,
         true,
     );

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;
@@ -242,12 +263,27 @@ onMounted(() => {
 
       .copy-btn {
         @include box(77px, 39px);
-        @include bg_pos("prize/copy-btn.png");
+        @include bg_pos("prize/copy-btn2.png");
+      }
+    }
+
+    .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

@@ -3,6 +3,8 @@ import { Toast } from "vant";
 import { debounceTap } from "@/plugins";
 import gsap from "gsap";
 import { useMainStore } from "@/store";
+import Preloader from "@/plugins/Preloader";
+import { pageQAImg } from "@/data/imgList";
 
 const emit = defineEmits(["IndexPage"]);
 const userStore = useMainStore();
@@ -33,18 +35,13 @@ const showRule = (event) => {
   });
 };
 
-
 onMounted(() => {
-  gsap.from(".index-bg", { duration: 1, scale: 1.2, autoAlpha: 0 });
-  gsap.from(".index-bottom-bg", { duration: 1, y: 100,  });
-  gsap.from(".index-windows", { duration: 1, scale: 0.5,autoAlpha:0,  });
-  gsap.from(".index-pet", { duration: 1, y: -50,autoAlpha:0,delay:0.5  });
-  gsap.from(".index-title", { duration: 1, y: 20, autoAlpha: 0,delay:1  });
-  gsap.from(".index-fan-1", { duration: 1, x: -220, autoAlpha: 0,delay:0.5 });
-  gsap.from(".index-fan-3", { duration: 1, x: 220, autoAlpha: 0,delay:0.5 });
-  gsap.from(".index-fan-2", { duration: 1, x: -220, autoAlpha: 0,delay:0.75 });
-  gsap.from(".index-fan-4", { duration: 1, x: 220, autoAlpha: 0,delay:0.75 });
-  gsap.from(".index-logo", { duration: 1, y: 20, autoAlpha: 0,delay:0.75 });
+  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 });
+  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,
@@ -63,20 +60,62 @@ onMounted(() => {
     scale: 0.4,
     autoAlpha: 0,
     delay: 0.5,
-    onComplete:()=>{
-      // gsap.to('.index-cloud',{duration:2,x:-30,repeat:-1,yoyo:true,ease:'none'})
-      gsap.to('.index-fan-1',{duration:2,x:'-=30',repeat:-1,yoyo:true,ease:'none'})
-      gsap.to('.index-fan-2',{duration:1.5,x:'-=20',repeat:-1,yoyo:true,ease:'none'})
-      gsap.to('.index-fan-3',{duration:1.5,y:'+=20',repeat:-1,yoyo:true,ease:'none'})
-      gsap.to('.index-fan-4',{duration:2,x:'+=20',repeat:-1,yoyo:true,ease:'none'})
-      gsap.to('.index-pet',{duration:2,y:'-=10',repeat:-1,yoyo:true,ease:'none'})
-    }
+    onComplete: () => {
+      gsap.to(".index-start-btn", {
+        duration: 1,
+        scale: "0.9",
+        repeat: -1,
+        yoyo: true,
+        ease: "bounce.in",
+      });
+      gsap.to(".index-cloud-1", {
+        duration: 2,
+        x: -30,
+        repeat: -1,
+        yoyo: true,
+        ease: "none",
+      });
+      gsap.to(".index-cloud-2", {
+        duration: 2,
+        x: 30,
+        repeat: -1,
+        yoyo: true,
+        ease: "none",
+      });
+      gsap.to(".index-tree-1", {
+        duration: 2,
+        y: 10,
+        repeat: -1,
+        yoyo: true,
+        ease: "none",
+      });
+      gsap.to(".index-title", {
+        duration: 2.5,
+        y: -20,
+        repeat: -1,
+        yoyo: true,
+        ease: "none",
+      });
+      gsap.to(".index-sub-title", {
+        duration: 3,
+        x: 10,
+        repeat: -1,
+        yoyo: true,
+        ease: "none",
       });
 
-
-
-
-
+      // 开始加载答题页面资源
+      Preloader({
+        name: "加载答题页资源",
+        imgs: pageQAImg,
+        callback: (progress) => {
+          // console.log("进度：", progress);
+        },
+      }).then((res) => {
+        console.log("done!");
+      });
+    },
+  });
 });
 
 const vcNum = ref(false);
@@ -92,25 +131,29 @@ const showVC = () => {
   <div class="IndexPage" @touchmove.prevent>
     <div class="index-bg"></div>
     <div class="index-container">
-      <div class="index-fan-1"></div>
-      <div class="index-fan-2"></div>
-      <div class="index-fan-3"></div>
-      <div class="index-fan-4"></div>
+      <div class="index-cloud-1"></div>
+      <div class="index-cloud-2"></div>
+      <div class="index-tree-1"></div>
+      <div class="index-island"></div>
       <div class="index-logo"></div>
-      <div class="index-bottom-bg"></div>
-      <!-- <div class="index-cloud"></div> -->
-      <div class="index-firework"></div>
-      <div class="index-windows"></div>
-      <div class="index-pet"></div>
       <div class="index-title" @click="showVC"></div>
+      <div class="index-sub-title"></div>
       <div class="index-rule-btn" @click="showRule($event)"></div>
-      <div class="index-prize-btn" v-if="userStore.hasPrize" @click="showMyPrize($event)"></div>
+      <!-- v-if="userStore.hasPrize" -->
+      <div class="index-prize-btn" @click="showMyPrize($event)"></div>
       <div class="index-start-btn" @click="start"></div>
       <div class="index-agreement">
-        风险提示:本材料由平安理财有限责任公司(以下简称“平安理财”)制作并提供。<span
-          class="b">本资料内容及观点仅供参考，不构成对任何人的投资建议。</span>以上产品投资管理机构/管理人为平安理财，代理销售机构不承担产品的投资、兑付和风险管理的责任。以上产品通过代理销售机构渠道销售的，产品风险评级应当以代理销售机构最终披露的评级结果为准。以上产品为非保本浮动收益理财产品，具体以产品说明书或产品公告披露为准。产品的业绩比较基准指管理人基于过往投资经验以及对产品存续期投资市场波动的预判而对本产品所设定的投资目标，业绩比较基准不是预期收益率，不代表产品的未来表现和实际收益，不构成对产品收益的承诺。<span
-          class="b">理财产品过往业绩不代表其未来表现，不等于理财产品实际收益，投资须谨慎。过往业绩相关数据已经托管人核对。</span><span
-          class="orange">理财非存款，产品有风险，投资须谨慎。</span>金融消费者不得利用金融产品和服务从事违法活动。
+        <div class="agreement">
+          风险提示:
+          本材料由平安理财有限责任公司(以下简称“平安理财”)制作并提供。<span
+            class="b"
+            >本资料内容及观点仅供参考，不构成对任何人的投资建议。</span
+          >以上产品投资管理机构/管理人为平安理财，代理销售机构不承担产品的投资、兑付和风险管理的责任。以上产品通过代理销售机构渠道销售的，产品风险评级应当以代理销售机构最终披露的评级结果为准。以上产品为非保本浮动收益理财产品，具体以产品说明书或产品公告披露为准。产品的业绩比较基准指管理人基于过往投资经验以及对产品存续期投资市场波动的预判而对本产品所设定的投资目标，业绩比较基准不是预期收益率，不代表产品的未来表现和实际收益，不构成对产品收益的承诺。<span
+            class="b"
+            >理财产品过往业绩不代表其未来表现，不等于理财产品实际收益，投资须谨慎。过往业绩相关数据已经托管人核对。</span
+          ><span class="orange">理财非存款，产品有风险，投资须谨慎。</span
+          >金融消费者不得利用金融产品和服务从事违法活动。
+        </div>
       </div>
     </div>
   </div>
@@ -120,7 +163,7 @@ const showVC = () => {
 .IndexPage {
   @include pos(100%, 100vh, 0px, 0px);
   overflow: hidden;
-  background: linear-gradient(135deg, #a11b15, #f80c00);
+  background: linear-gradient(135deg, #90dcff, #51b7ff);
 
   .index-bg {
     @include pos(750px, 1624px, 0px, 50%);
@@ -132,95 +175,78 @@ const showVC = () => {
     @include pos(750px, 1624px, 0px, 50%);
     transform: translateY(-50%);
 
-    .index-bottom-bg{
-      pointer-events: none;
-      @include pos(750px, 558px, 0px, 1066px);
-      @include bg_pos("index/bottom-bg.png");
-    }
-
-    .index-fan-1{
-      pointer-events: none;
-      @include pos(235px, 574px, 0px, 60px);
-      @include bg_pos("index/fan-1.png");
-    }
-    .index-fan-2{
-      pointer-events: none;
-      @include pos(316px, 317px, -205px, 405px);
-      @include bg_pos("index/fan-2.png");
-    }
-    .index-logo{
-      pointer-events: none;
-      @include pos(632px, 94px, 59px, 267px);
-      @include bg_pos("index/logo.png");
-    }
-    .index-fan-3{
-      pointer-events: none;
-      @include pos(370px, 334px, 545px, 910px);
-      @include bg_pos("index/fan-3.png");
-    }
-    .index-fan-4{
-      pointer-events: none;
-      @include pos(350px, 205px, 494px, 1011px);
-      @include bg_pos("index/fan-4.png");
-    }
-
-    .index-cloud{
-      pointer-events: none;
-      @include pos(88px, 46px, 621px, 253px);
-      @include bg_pos("index/cloud.png");
-    }
-
-    .index-firework{
-      pointer-events: none;
-      @include pos(120px, 120px, 651px, 474px);
-      @include bg_pos("index/firework.png");
-    }
-
-    .index-windows{
-      pointer-events: none;
-      @include pos(743px, 744px, 3px, 440px);
-      @include bg_pos("index/windows.png");
-    }
-
-    .index-pet{
-      pointer-events: none;
-      @include pos(234px, 386px, 353px, 614px);
-      @include bg_pos("index/pet-icon.png");
-    }
+    // .index-logo{
+    //   pointer-events: none;
+    //   @include pos(632px, 94px, 59px, 267px);
+    //   @include bg_pos("index/logo.png");
+    // }
 
     .index-title {
       // pointer-events: none;
-      @include pos(542px, 101px, 104px, 369px);
+      @include pos(633px, 253px, 46px, 254px);
       @include bg_pos("index/title.png");
     }
 
+    .index-island {
+      pointer-events: none;
+      @include pos(714px, 867px, 15px, 542px);
+      @include bg_pos("index/island.png");
+    }
+
+    .index-cloud-1 {
+      pointer-events: none;
+      @include pos(210px, 147px, -15px, 535px);
+      @include bg_pos("index/cloud-1.png");
+    }
+
+    .index-cloud-2 {
+      pointer-events: none;
+      @include pos(151px, 172px, 656px, 486px);
+      @include bg_pos("index/cloud-2.png");
+    }
+
+    .index-tree-1 {
+      pointer-events: none;
+      @include pos(228px, 199px, -45px, 492px);
+      @include bg_pos("index/tree-1.png");
+    }
+
+    .index-sub-title {
+      pointer-events: none;
+      @include pos(423px, 87px, 170px, 486px);
+      @include bg_pos("index/sub-title.png");
+    }
+
     .index-rule-btn {
-      @include pos(184px, 49px, -37px, 506px);
+      @include pos(193px, 50px, 612px, 553px);
       @include bg_pos("index/rule-btn.png");
     }
 
     .index-prize-btn {
-      @include pos(184px, 49px, -37px, 575px);
+      @include pos(184px, 49px, 612px, 615px);
       @include bg_pos("index/prize-btn.png");
     }
 
     .index-start-btn {
-      @include pos(311px, 90px, 220px, 1168px);
+      @include pos(423px, 152px, 156px, 1025px);
       @include bg_pos("index/start-btn.png");
     }
 
     .index-agreement {
       font-family: "HarmonyOS_Sans_SC_Regular";
       pointer-events: none;
-      @include pos(736px, 182px, 7px, 1258px);
-      // background: rgba($color: #f49e6a, $alpha: 0.55);
+      @include pos(736px, 182px, 7px, 1230px);
+
+      .agreement {
+        background-color: rgba(255, 255, 255, 0.75);
+
         font-size: 14px;
         text-align: justify;
         letter-spacing: 0.1px;
-      color: #ff8c84;
+        color: #124284;
         padding: 10px;
         box-sizing: border-box;
-      border-radius: 10px;
+        border-radius: 2px;
         line-height: 20px;
 
         .b {
@@ -228,11 +254,11 @@ const showVC = () => {
         }
 
         .orange {
-        color: #fdf9de;
+          color: #f5430c;
           font-weight: 700;
         }
       }
-
+    }
   }
 }
 </style>

src/components/Loading.vue

@@ -13,7 +13,6 @@ const userStore = useMainStore();
 const loadNum = ref(0);
 
 onMounted(() => {
-
   Preloader({
     name: "加载页资源",
     imgs: loadImg,
@@ -25,6 +24,7 @@ onMounted(() => {
       duration: 0.2,
       autoAlpha: 1,
       onComplete: () => {
+        // 非本地环境
         if (import.meta.env.VITE_MODE != "dev") {
           getMyPrize({}, userStore.token).then((res) => {
             if (res.code == 0) {
@@ -36,7 +36,6 @@ onMounted(() => {
             }
           });
         }
-
         Preloader({
           name: "内页资源",
           imgs: pageImg,
@@ -47,7 +46,6 @@ onMounted(() => {
           },
         }).then((res) => {
           console.log("加载完成");
-
           gsap.to(".LoadPage", {
             duration: 1,
             autoAlpha: 0,
@@ -68,7 +66,9 @@ onMounted(() => {
     <div class="load-container">
       <div class="load-icon"></div>
       <div class="load-box">
-        <div class="bar"></div>
+        <div class="bar">
+          <div class="bar-icon"></div>
+        </div>
       </div>
       <div class="load-num">{{ loadNum }}%</div>
     </div>
@@ -93,40 +93,45 @@ onMounted(() => {
     @include box(750px, 1180px);
     // transform: translateY(-50%);
 
-    .load-icon{
-      @include pos(101px, 55px, 325px, 370px);
+    .load-icon {
+      @include pos(83px, 101px, 325px, 370px);
       @include bg_pos("load/icon.png");
     }
 
     .load-box {
-      @include pos(512px, 35px, 119px, 450px);
-      border-style: solid;
-      border-width: 2px;
-      border-color: #e17c4d;
+      @include pos(576px, 36px, 87px, 500px);
       border-radius: 20px;
-      padding: 2px;
+      overflow: hidden;
+      padding: 4.5px;
+      @include bg_pos("load/bar-box.png");
 
       .bar {
-        @include box(0%, 26px);
-        border-radius: 20px;
-        background: linear-gradient( -178deg, rgb(255,184,127) 0%, rgb(255,238,186) 100%);
-        background-image: -webkit-linear-gradient( -178deg, rgb(255,184,127) 0%, rgb(255,238,186) 100%);
-
+        @include box(0%, 27px);
+        position: relative;
+        @include bg_pos("load/bar.png");
+        background-size: 551px 27px;
+        .bar-icon {
+          @include box(35px, 36px);
+          position: absolute;
+          top: -4.5px;
+          left: 95%;
+          @include bg_pos("load/bar-icon.png");
+        }
       }
     }
 
     .load-num {
-      @include pos(750px, 50px, 0px, 511px);
+      @include pos(750px, 50px, 0px, 570px);
       text-align: center;
       font-size: 38px;
-      color: #ffaf5e;
+      color: rgb(255, 255, 255);
       line-height: 40px;
       font-weight: 700;
-      background: linear-gradient(to right, #f2733a, #ffd667);
+      background: linear-gradient(to right, #dadada, #ffffff);
       background-clip: text;
       -webkit-background-clip: text;
       -webkit-text-fill-color: transparent;
-      // letter-spacing: 2px;
+      text-shadow: 0.9px 3.897px 0px rgba(44, 182, 255, 0.004);
     }
 
     .btn {