replace asset

mock/project/home.js

@@ -11,8 +11,8 @@ module.exports = {
       userId: "9527",
       shareCode: "9527",
       salesmanFlag: true,
-      rewardDailyFreeGameTimes: 1,
-      leftGameTimes: 1,
+      rewardDailyFreeGameTimes: null,
+      leftGameTimes: null,
     },
   },
   "GET /game/startGame.do": {

src/components/bindpop/bindpop.less

@@ -9,28 +9,28 @@
 
   .bg {
     position: absolute;
-    left: 27px;
-    top: 518px;
-    width: 671px;
-    height: 486px;
+    left: 113px;
+    top: 444px;
+    width: 524px;
+    height: 449px;
     .sparkBg("bindPop/bg.png");
   }
 
   .bind_btn {
     position: absolute;
-    left: 212px;
-    top: 855px;
-    width: 328px;
-    height: 93px;
+    left: 202px;
+    top: 748px;
+    width: 347px;
+    height: 129px;
     .sparkBg("bindPop/bind_btn.png");
   }
 
   .close {
     position: absolute;
-    left: 345px;
-    top: 1053px;
-    width: 59px;
-    height: 61px;
+    left: 348px;
+    top: 940px;
+    width: 53px;
+    height: 52px;
     .sparkBg("common/close.png");
   }
 }

src/components/focuspop/focuspop.less

@@ -7,28 +7,29 @@
   position: absolute;
   .bg {
     position: absolute;
-    left: 27px;
-    top: 428px;
-    width: 671px;
-    height: 638px;
+    left: 117px;
+    top: 444px;
+    width: 516px;
+    height: 559px;
     .sparkBg("focusPop/bg.png");
   }
   .qrcode_bg {
-    border-radius: 26px;
-    background-color: rgb(74, 115, 31);
+    border-radius: 10px;
     position: absolute;
-    left: 246px;
-    top: 615px;
-    width: 258px;
-    height: 258px;
+    left: 226px;
+    top: 568px;
+    width: 290px;
+    height: 290px;
+    box-sizing: border-box;
+    border: 5px solid rgb(0, 146, 222);
     box-sizing: border-box;
   }
   .close {
     position: absolute;
-    left: 345px;
-    top: 1113px;
-    width: 59px;
-    height: 61px;
+    left: 348px;
+    top: 1030px;
+    width: 53px;
+    height: 52px;
     .sparkBg("common/close.png");
   }
 }

src/components/taskpop/taskpop.jsx

@@ -136,14 +136,10 @@ class Taskpop extends React.Component {
               <span className="task_subtitle">{item.subTitle}</span>
               {/* taskStatus  任务状态      * 0 去完成，任务完成次数未达到上限      * 1 待领奖      * 2 已完成，任务完成次数达到上限 */}
               {item.taskStatus === 0 && (
-                <Button className="task_btn red_bg" onClick={() => this.completeHandle(item)}>
-                  去完成
-                </Button>
+                <Button className="task_btn red_bg" onClick={() => this.completeHandle(item)}></Button>
               )}
               {item.taskStatus === 1 && (
-                <Button className="task_btn yellow_bg" onClick={() => this.receiveHandle(item)}>
-                  待领取
-                </Button>
+                <Button className="task_btn yellow_bg" onClick={() => this.receiveHandle(item)}></Button>
               )}
               {item.taskStatus === 2 && <Button className="task_btn grey_bg">已完成</Button>}
             </div>

src/pages/drawpage/drawpage.jsx

@@ -11,6 +11,7 @@ import { PAGE_MAP } from "@src/utils/constants";
 import { CircleTurntable } from "@spark/circle-turntable";
 import { pageLeave, sensorMdClick, sensorMdExpouse } from "@src/utils/sensorMd";
 import { Button } from "@src/components/Button";
+import { Toast } from "@spark/ui";
 
 @observer
 class Drawpage extends React.Component {
@@ -46,9 +47,11 @@ class Drawpage extends React.Component {
     sensorMdClick("activityClick", { pageName: "抽奖页点击", buttonName: "开始抽奖" });
     // 无抽奖次数
     if (!leftDrawTimes) {
-      return modalStore.pushPop("Drawchancepop", {
-        refresh: () => this.getDrawInfo(),
-      });
+      // return modalStore.pushPop("Drawchancepop", {
+      //   refresh: () => this.getDrawInfo(),
+      // });
+      Toast("去参与游戏获取抽奖次数吧～");
+      return;
     }
 
     if (this.btnStarting) return false;

src/pages/drawpage/drawpage.less

@@ -22,12 +22,12 @@
     .sparkBg("homePage/rule_prize.png");
   }
   .back {
+    left: 29px;
+    top: 147px;
     width: 64px;
-    height: 65px;
-    left: 12px;
-    top: 159px;
+    height: 64px;
     position: absolute;
-    .sparkBg("common/back.png");
+    .sparkBg("prizePage/back.png");
   }
   .rule_btn {
     width: 87px;

src/pages/homepage/homepage.jsx

@@ -66,8 +66,9 @@ class Homepage extends React.Component {
     if (!store.checkActStatus()) {
       return;
     }
+    const { leftGameTimes, rewardDailyFreeGameTimes } = store.homeInfo || {};
     sensorMdClick("activityClick", { pageName: "端午节活动首页点击", buttonName: "开始测试" });
-    if (store.homeInfo?.rewardDailyFreeGameTimes > 0) {
+    if (leftGameTimes + rewardDailyFreeGameTimes > 0) {
       // 进入测试页
       store.startTest();
     } else {

src/pages/prizepage/prizepage.less

@@ -14,10 +14,10 @@
     .sparkBg("prizePage/bg.png");
   }
   .title {
-    width: 234px;
-    height: 58px;
-    left: 258px;
-    top: 163px;
+    left: 252px;
+    top: 158px;
+    width: 244px;
+    height: 59px;
     position: absolute;
     .sparkBg("prizePage/title.png");
   }
@@ -31,8 +31,8 @@
     padding-right: 20px;
     overflow-y: auto;
     .prize_item {
-      width: 690px;
-      height: 149px;
+      width: 688px;
+      height: 150px;
       position: relative;
       .sparkBg("prizePage/prize_item_bg.png");
       margin-bottom: 16px;
@@ -52,7 +52,7 @@
         position: absolute;
         font-size: 32px;
         line-height: 32px;
-        color: rgba(70, 101, 64, 1);
+        color: rgb(51, 51, 51);
         font-weight: bold;
         .lineClamp1();
       }
@@ -67,11 +67,11 @@
     }
   }
   .back {
+    left: 29px;
+    top: 147px;
     width: 64px;
-    height: 65px;
-    left: 12px;
-    top: 159px;
+    height: 64px;
     position: absolute;
-    .sparkBg("common/back.png");
+    .sparkBg("prizePage/back.png");
   }
 }