111

mock/challenge.ts

@@ -55,13 +55,13 @@ export default [
                             "icon": "//yun.duiba.com.cn/polaris/credits.55f43bd9eece2d29fd077bbad5f38ea147938c45.png",
                             "subTitle": "签到",
                             "title": "签到",
-                            "completedSize": 1,
+                            "completedSize": 0,
                             "intervalLimitSize": 1,
                             "intervalType": -18649400.705077305
                         },
                         {
                             "code": "xhqg_{200}",
-                            "icon": "//yun.duiba.com.cn/polaris/credits.55f43bd9eece2d29fd077bbad5f38ea147938c45.png",
+                            "icon": "//yun.duiba.com.cn/polaris/Qg.ce064174141cb66ced062f69809e43cfb4595486.png",
                             "subTitle": "点击确认消耗200青果",
                             "title": "消耗200青果",
                             "completedSize": 0,
@@ -79,7 +79,7 @@ export default [
                         },
                         {
                             "code": "yqzl",
-                            "icon": "//yun.duiba.com.cn/polaris/credits.55f43bd9eece2d29fd077bbad5f38ea147938c45.png",
+                            "icon": "//yun.duiba.com.cn/polaris/assist.2d9c5be86de1b7ff8652c27d9df73e625d316fdb.png",
                             "subTitle": "邀请助力",
                             "title": "邀请助力",
                             "completedSize": 3,
@@ -88,7 +88,7 @@ export default [
                         },
                         {
                             "code": "yqzl_new",
-                            "icon": "//yun.duiba.com.cn/polaris/credits.55f43bd9eece2d29fd077bbad5f38ea147938c45.png",
+                            "icon": "//yun.duiba.com.cn/polaris/sign.3976eb6cfb3124aee5a0d3c869f82398a8713928.png",
                             "subTitle": "邀请新用户",
                             "title": "邀请新用户",
                             "completedSize": 3,
@@ -96,8 +96,8 @@ export default [
                             "intervalType": -54395962.26549375
                         },
                         {
-                            "code": "scan_{n}",
-                            "icon": "//yun.duiba.com.cn/polaris/credits.55f43bd9eece2d29fd077bbad5f38ea147938c45.png",
+                            "code": "scan",
+                            "icon": "//yun.duiba.com.cn/polaris/scan.9b0733c0dae1cc733524431ec5112478e2fefba3.png",
                             "subTitle": "扫码",
                             "title": "扫码",
                             "completedSize": 3,
@@ -106,7 +106,7 @@ export default [
                         },
                         {
                             "code": "browse_{x}",
-                            "icon": "//yun.duiba.com.cn/polaris/credits.55f43bd9eece2d29fd077bbad5f38ea147938c45.png",
+                            "icon": "//yun.duiba.com.cn/polaris/see.c249defe0f5dcd540898adbffe3fc6c7f9e7f212.png",
                             "subTitle": "浏览",
                             "title": "浏览",
                             "completedSize": 3,

mock/index.ts

@@ -122,8 +122,8 @@ export default [
             "id": 328,
             "strategyId": 11,
             "prizeId": "g4c7ba888",
-            "type": 1,
-            "moneyStatus": 1,
+            "type": 4,
+            "moneyStatus": 2,
             "moneyCanReissueStartTimestamp": 1565213353000,
             "moneyCanReissueEndTimestamp": 1565213353000,
           },

src/components/renewmodule/renewmodule.jsx

@@ -23,6 +23,10 @@ class Renewmodule extends React.Component {
     store.getBaseIndex();
   }
 
+  handleclose = () => {
+    ModalCtrl.closeModal();
+  };
+
   handleClick = (choice) => {
     this.setState({ activeChoice: choice });
   };
@@ -107,6 +111,7 @@ class Renewmodule extends React.Component {
           第{hasChallengeDay + 1}天 <span className="special">未打卡</span>
         </span>
         <span className="title1">已累计打卡{hasChallengeDay}天</span>
+        <Button className="close" onClick={this.handleclose} />
       </div>
     );
   }

src/components/renewmodule/renewmodule.less

@@ -198,4 +198,13 @@
     line-height: 53px;
     color: rgba(0, 0, 0, 1);
   }
+
+  .close {
+    left: 20px;
+    top: 740px;
+    width: 28px;
+    height: 43px;
+    position: absolute;
+    .sparkBg("renewModule/返回.png");
+  }
 }
\ No newline at end of file

src/pages/HomePage/Check/Check.tsx

@@ -7,6 +7,7 @@ import API from '@/api';
 import { _asyncThrottle, dateFormatter } from '@/utils/utils';
 import { PageCtrl } from '@/core/ctrls/PageCtrl';
 import { ModalCtrl } from '@/core/ctrls/ModalCtrl';
+import Finish_task from '../../../components/finish_task/finish_task';
 import Consume_qg from '../../../components/consume_qg/consume_qg';
 import Consume_credits from '../../../components/consume_credits/consume_credits';
 import Renewmodule from '../../../components/renewmodule/renewmodule';
@@ -24,7 +25,7 @@ class Check extends React.Component<any, any> {
   }
 
   // 按钮
-  handlegofinish = (type, n, code, title) => {
+  handlegofinish = async (type, n, code, title) => {
     const { jfNum = 0, qgNum = 0 } = store?.baseInfo || {};
     if (type === "xhqg") {
       if (n <= qgNum) {
@@ -38,9 +39,19 @@ class Check extends React.Component<any, any> {
       } else {
         Toast.show("很抱歉，您的积分不足");
       }
-    }
-    else {
+    } else if (type === "yqzl") {
+      // todo
+    } else if (type === "yqzl_new") {
       // todo
+    } else if (type === "scan") {
+      // todo
+    } else if (type === "browse") {
+      // wx.miniProgram.switchTab({ url: jumpUrl })
+      const { success } = await API.getChallenegeComplate({ taskCode: code });
+      if (success) {
+        ModalCtrl.showModal(Finish_task, { title });
+      }
+      store.getTaskInfo();
     }
   };
 
@@ -76,7 +87,7 @@ class Check extends React.Component<any, any> {
     );
 
     // 当前挑战信息
-    const { 
+    const {
       challengeTotalDay = 0,
       prizeName = '',
       prizeImg = '',
@@ -180,13 +191,13 @@ class Check extends React.Component<any, any> {
                         )
                       }
                       // 扫码
-                      case code.startsWith("scan_"): {
+                      case code.startsWith("scan"): {
                         const number = (code.split("_")[1]);
                         const n = parseInt(number.replace(/[{}]/g, ''), 10);
                         return (
                           <Button
                             className="gofinish"
-                            onClick={() => this.handlegofinish("scan", n, code, title)}
+                            onClick={() => this.handlegofinish("scan", '', code, title)}
                           />
                         );
                       }

src/pages/MyPrize/MyPrize.less

@@ -74,9 +74,9 @@
 
       .yifafang {
         position: absolute;
-        width: 141px;
+        width: 178px;
         height: 44px;
-        left: 520px;
+        left: 490px;
         top: 53px;
         text-align: center;
         line-height: 44px;
@@ -105,6 +105,17 @@
         .webpBg("MyPrize/发放中.png");
       }
 
+      .shibai {
+        position: absolute;
+        width: 178px;
+        height: 44px;
+        left: 490px;
+        top: 53px;
+        text-align: center;
+        line-height: 44px;
+        .webpBg("MyPrize/发放失败.png");
+      }
+
       .prizeImg {
         position: absolute;
         left: 30px;

src/pages/MyPrize/MyPrize.tsx

@@ -79,6 +79,10 @@ class MyPrize extends React.Component<any, any> {
         }
     }
 
+    handleshibai = (item) => {
+        Toast.show("发放失败")
+    }
+
     handlefafangzhong = (item) => {
         Toast.show("正在发放中，请耐心等待")
     }
@@ -101,6 +105,7 @@ class MyPrize extends React.Component<any, any> {
                                 {item.type === 4 ? (
                                     <>
                                         {item.moneyStatus === 1 && <Button className="yifafang" onClick={() => this.handleyifafang(item)} />}
+                                        {item.moneyStatus === 2 && <Button className="shibai" onClick={() => this.handleshibai(item)} />}
                                         {item.moneyStatus === 10 && <Button className="bufa" onClick={() => this.handlebufa(item)} />}
                                         {item.moneyStatus === 11 && <Button className="fafangzhong" onClick={() => this.handlefafangzhong(item)} />}
                                     </>

src/vite-env.d.ts

@@ -30,6 +30,12 @@ declare namespace wx {
       fail?: (...args: any[]) => void;
       complete?: (...args: any[]) => void;
     }): void;
+    switchTab(params: {
+      url: string;
+      success?: (...args: any[]) => void;
+      fail?: (...args: any[]) => void;
+      complete?: (...args: any[]) => void;
+    }): void;
   }
   
   const miniProgram: MiniProgram;