modify

mock/challenge.ts

@@ -56,10 +56,10 @@ export default [
                             "icon": "//yun.duiba.com.cn/polaris/credits.55f43bd9eece2d29fd077bbad5f38ea147938c45.png",
                             "subTitle": "签到",
                             "title": "签到",
-                            "completedSize": 0,
+                            "completedSize": 1,
                             "intervalLimitSize": 1,
                             "intervalType": -18649400.705077305,
-                            "jumUrl": '',
+                            "jumpUrl": '',
                             "boolShowCompletePop": false,
                         },
                         {
@@ -70,7 +70,7 @@ export default [
                             "completedSize": 0,
                             "intervalLimitSize": 1,
                             "intervalType": 69737947.09434697,
-                            "jumUrl": '',
+                            "jumpUrl": '',
                             "boolShowCompletePop": false,
                         },
                         {
@@ -81,7 +81,7 @@ export default [
                             "completedSize": 0,
                             "intervalLimitSize": 1,
                             "intervalType": 15800400.399293274,
-                            "jumUrl": '',
+                            "jumpUrl": '',
                             "boolShowCompletePop": false,
                         },
                         {
@@ -92,7 +92,7 @@ export default [
                             "completedSize": 3,
                             "intervalLimitSize": 6,
                             "intervalType": -54395962.26549375,
-                            "jumUrl": '',
+                            "jumpUrl": '',
                             "boolShowCompletePop": false,
                         },
                         {
@@ -103,7 +103,7 @@ export default [
                             "completedSize": 3,
                             "intervalLimitSize": 6,
                             "intervalType": -54395962.26549375,
-                            "jumUrl": '',
+                            "jumpUrl": '',
                             "boolShowCompletePop": false,
                         },
                         {
@@ -114,7 +114,7 @@ export default [
                             "completedSize": 3,
                             "intervalLimitSize": 6,
                             "intervalType": -54395962.26549375,
-                            "jumUrl": '',
+                            "jumpUrl": '',
                             "boolShowCompletePop": false,
                         },
                         {
@@ -125,11 +125,11 @@ export default [
                             "completedSize": 3,
                             "intervalLimitSize": 6,
                             "intervalType": -54395962.26549375,
-                            "jumUrl": '',
+                            "jumpUrl": 'https://www.baidu.com/index.html',
                             "boolShowCompletePop": false,
                         },
                     ],
-                    "boolNeedChallengeCompletePop": true,
+                    "boolNeedChallengeCompletePop": false,
                     "boolOpenChallenge": true,
                 }
             }

src/MD.ts

@@ -13,7 +13,7 @@ const MDList: IAutoMdData[] = new Array(20).fill("").map((_, i) => {
   return {
     ele: `.md${i + 1}`,
     data: {
-      dpm: `${appId}.110.${i + 1}.0`,
+      dpm: `${appId}.110.${i + 1}.1`,
       dcm,
       dom,
       domain,

src/components/assist_succeed/assist_succeed.jsx

@@ -6,6 +6,9 @@ import './assist_succeed.less';
 import { Button } from "@grace/ui";
 import { PageCtrl } from '@/core/ctrls/PageCtrl';
 import { ModalCtrl } from '@/core/ctrls/ModalCtrl';
+import { SvgaPlayer } from '@grace/svgaplayer';
+
+import lightSvga from "../../assets/svga/1通用弹窗氛围.svga";
 
 @observer
 class Assist_succeed extends React.Component {
@@ -20,7 +23,7 @@ class Assist_succeed extends React.Component {
   render() {
     return (
       <div className="assist_succeed modal_center">
-        <span className="dongxiao"></span>
+        <SvgaPlayer className="dongxiao" src={lightSvga}/>
         <span className="bg"></span>
         <span className="title"></span>
         <span className="tip1">点击立即签到</span>

src/components/assist_succeed/assist_succeed.less

@@ -7,11 +7,11 @@
   position: absolute;
   .dongxiao {
     width: 750px;
-    height: 1546px;
+    height: 1624px;
     left: 0px;
     top: 0px;
-    position: absolute;
-    .sparkBg("assist_succeed/dongxiao.png");
+    // position: absolute;
+    // .sparkBg("assist_succeed/dongxiao.png");
   }
   .bg {
     width: 580px;

src/components/choice_challenge/choice_challenge.jsx

@@ -77,7 +77,7 @@ class Choice_challenge extends React.Component {
         <span className="title"></span>
         <span className="tip"></span>
         <Button
-          className="challenge"
+          className="challenge md15"
           onClick={() => this.handlechallenge(selectedItem?.challengeId)}
         />
         <span className="ditu"></span>

src/components/consume_credits/consume_credits.jsx

@@ -52,7 +52,7 @@ class Consume_credits extends React.Component {
         <span className="tip2">完成打卡</span>
         <Button className="close" onClick={this.handleclose} />
         <Button
-          className="clock"
+          className="clock md16"
           onClick={() => this.handleclock(n, code, title)}
         />
         <span className="icon"></span>

src/components/consume_qg/consume_qg.jsx

@@ -37,7 +37,7 @@ class Consume_qg extends React.Component {
         <span className="tip1">消耗{n}青果</span>
         <span className="tip2">完成打卡</span>
         <Button className="close" onClick={this.handleclose} />
-        <Button className="clock" onClick={() => this.handleclock(code)} />
+        <Button className="clock md17" onClick={() => this.handleclock(code)} />
         <span className="icon"></span>
         <span className="ditu"></span>
       </div>

src/components/finish_challenge/finish_challenge.jsx

@@ -6,6 +6,9 @@ import "./finish_challenge.less";
 import { Button } from "@grace/ui";
 import { PageCtrl } from "@/core/ctrls/PageCtrl";
 import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
+import { SvgaPlayer } from '@grace/svgaplayer';
+
+import lightSvga from "../../assets/svga/2输出签到成功弹窗.svga";
 
 @observer
 class Finish_challenge extends React.Component {
@@ -25,7 +28,7 @@ class Finish_challenge extends React.Component {
     const { prizeName, prizeImg } = this.props;
     return (
       <div className="finish_challenge modal_center">
-        <span className="dongxiao"></span>
+        <SvgaPlayer className="dongxiao" src={lightSvga}/>
         <span className="bg"></span>
         <span className="title"></span>
         <span className="tip">获得{prizeName}奖励</span>

src/components/finish_challenge/finish_challenge.less

@@ -20,7 +20,7 @@
     left: 0px;
     top: 0px;
     position: absolute;
-    .sparkBg("finish_challenge/dongxiao.png");
+    // .sparkBg("finish_challenge/dongxiao.png");
   }
 
   .bg {

src/components/finish_resign/finish_resign.less

@@ -18,7 +18,7 @@
     height: 1624px;
     left: 0px;
     top: 0px;
-    // position: absolute;
+    position: absolute;
     // .sparkBg("finish_resign/dongxiao.png");
   }
   .bg {

src/components/finish_task/finish_task.jsx

@@ -6,6 +6,9 @@ import './finish_task.less';
 import { PageCtrl } from '@/core/ctrls/PageCtrl';
 import { ModalCtrl } from '@/core/ctrls/ModalCtrl';
 import { Button } from '@grace/ui';
+import { SvgaPlayer } from '@grace/svgaplayer';
+
+import lightSvga from "../../assets/svga/1通用弹窗氛围.svga";
 
 @observer
 class Finish_task extends React.Component {
@@ -28,7 +31,7 @@ class Finish_task extends React.Component {
     
     return (
       <div className="finish_task modal_center">
-        <span className="dongxiao"></span>
+        <SvgaPlayer className="dongxiao" src={lightSvga}/>
         <span className="bg"></span>
         <span className="line"></span>
         <span className="title">{title}任务完成</span>

src/components/finish_task/finish_task.less

@@ -16,11 +16,11 @@
 
   .dongxiao {
     width: 750px;
-    height: 1589px;
+    height: 1624px;
     left: 0px;
     top: 0px;
     position: absolute;
-    .sparkBg("finish_task/dongxiao.png");
+    // .sparkBg("finish_task/dongxiao.png");
   }
 
   .bg {

src/components/renewmodule/renewmodule.jsx

@@ -40,7 +40,7 @@ class Renewmodule extends React.Component {
         {
           toPlaywayId: "challenge",
           toActionId: "resign",
-          desc: "tresign_credits_desc",
+          desc: "resign_credits_desc",
           credits: resignJf,
         },
         async () => {
@@ -83,7 +83,7 @@ class Renewmodule extends React.Component {
         <span className="bg"></span>
         <span className="headline"></span>
         <Button
-          className="use"
+          className="use md18"
           onClick={() =>
             this.handleUse(activeChoice, inferQg, inferJf, resignJf)
           }

src/pages/HomePage/Check/Check.tsx

@@ -13,6 +13,7 @@ import Consume_credits from '../../../components/consume_credits/consume_credits
 import Renewmodule from '../../../components/renewmodule/renewmodule';
 import { unwatchPageVisibility, watchPageVisibility } from '@/core/page-visibility-notify';
 import { initWx } from '@/built-in/share/weixin/weixin';
+import { logClick, logExposure, MDAuto } from "@grace/built-in";
 
 @observer
 class Check extends React.Component<any, any> {
@@ -55,10 +56,13 @@ class Check extends React.Component<any, any> {
     } else if (type === "yqzl" || type === "yqzl_new") {
       store.doInvite(code)
     } else if (type === "scan") {
+      await API.getChallenegeComplate({ taskCode: code });
       wx.miniProgram.switchTab({ url: jumpUrl });
     } else if (type === "browse") {
       await API.getChallenegeComplate({ taskCode: code });
       window.location.href = jumpUrl;
+    } else if (type === "sign") {
+      Toast.show("快去签到吧");
     }
   };
 
@@ -157,6 +161,15 @@ class Check extends React.Component<any, any> {
                     return <Button className="gosign" onClick={() => this.handlegosign(hasChallengeDay, resignJf, resignQg)} />
                   } else if (completedSize < intervalLimitSize) {
                     switch (true) {
+                      // 签到
+                      case code.startsWith("sign"): {
+                        return (
+                          <Button
+                            className="gofinish"
+                            onClick={() => this.handlegofinish("sign", '', code, title, '')}
+                          />
+                        );
+                      }
                       // 消耗青果
                       case code.startsWith("xhqg_"): {
                         const number = (code.split("_")[1]);

src/store/store.ts

@@ -290,10 +290,13 @@ class Store {
 
   async doAssist() {
     let inviteCode = getUrlParam('inviteCode')
+    if (!inviteCode || inviteCode == 'null' || inviteCode == 'undefined') return false;
     const { success, message, code } = await API.getChallengeAssist({ inviteCode: inviteCode });
     if (success) {
       ModalCtrl.showModal(Assist_succeed);
     } else {ModalCtrl.showModal(Assist_fail, { code, message });}
+
+    await this.getTaskInfo();
     history.replaceState({}, '', location.href.replace(new RegExp(`[?&]inviteCode=[^&]*`), ''));
   }