modify

mock/challenge.ts

@@ -12,6 +12,10 @@ export default [
                     "challengeStartTime": 27404105.225178465,
                     "challengeEndTime": -87229323.37597737,
                     "boolShowFailPop": false,
+                    "challengeSuccessPopInfo": {
+                        "prizeName": "30天的奖励",
+                        "prizeImg": "//yun.duiba.com.cn/polaris/045CCBB8-F6C7-43DB-9F81-45F52430A878.441c8f13daf61c48b85fe383e764d9089f1d4a66.png"
+                    },
                     "challengeConfigList": [
                         {
                             "challengeId": "1",
@@ -47,7 +51,6 @@ export default [
                         }
                     ],
                     "hasChallengeDay": 5,
-                    "latestChallengeSuccessTime": 5,
                     "boolNeedResign": false,
                     "boolNeedResignPop": false,
                     "taskInfoList": [

src/store/store.ts

@@ -185,6 +185,11 @@ class Store {
     boolNeedChallengeCompletePop?: boolean;
     latestChallengeSuccessTime?: number;
     boolNeedResignPop?: boolean;
+    boolShowFailPop?: boolean;
+    challengeSuccessPopInfo?: {
+      prizeName: string;
+      prizeImg: string;
+    };
   } = {
       challengeStartTime: 0,
       challengeEndTime: 0
@@ -201,10 +206,13 @@ class Store {
     if (success && data) {
       this.taskInfo = data
 
-      const { boolOpenChallenge = 0,
+      const { boolOpenChallenge,
+        boolNeedResignPop,
+        challengeSuccessPopInfo,
+        boolShowFailPop,
         choosedChallengeId = 0,
         hasChallengeDay = 0,
-        boolNeedResign,
+        // boolNeedResign,
         challengeConfigList = [],
         taskInfoList = [],
       } = this?.taskInfo || {};
@@ -216,31 +224,39 @@ class Store {
 
       // 当前挑战信息
       const {
-        challengeTotalDay = 0,
-        prizeName = '',
-        prizeImg = '',
+        // challengeTotalDay = 0,
+        // prizeName = '',
+        // prizeImg = '',
         resignJf = 0,
         resignQg = 0,
       } = currentChallenge || {};
 
-      if (!data.choosedChallengeId) {
-        ModalCtrl.showModal(Choice_challenge)
-      }
-      if (data.boolNeedResignPop) {
-        ModalCtrl.showModal(Renewmodule, { hasChallengeDay, resignJf, resignQg });
+      // 当前挑战的挑战礼物信息
+      const {
+        prizeName = '',
+        prizeImg = ''
+      } = challengeSuccessPopInfo || {};
+
+      if (boolOpenChallenge) {
+        if (!choosedChallengeId) {
+          ModalCtrl.showModal(Choice_challenge)
+        }
+        if (boolNeedResignPop) {
+          ModalCtrl.showModal(Renewmodule, { hasChallengeDay, resignJf, resignQg });
+        }
+        taskInfoList.forEach(task => {
+          if (task.boolShowCompletePop) {
+            const { title } = task
+            ModalCtrl.showModal(Finish_task, { title });
+          }
+        });
       }
-      if (data.boolNeedChallengeCompletePop) {
+      if (challengeSuccessPopInfo) {
         ModalCtrl.showModal(Finish_challenge, { prizeName, prizeImg })
       }
-      if (data.boolShowFailPop) {
+      if (boolShowFailPop) {
         ModalCtrl.showModal(Fail_challenge)
       }
-      taskInfoList.forEach(task => {
-        if (task.boolShowCompletePop) {
-          const { title } = task
-          ModalCtrl.showModal(Finish_task, { title });
-        }
-      });
     }
   };
 
@@ -295,7 +311,7 @@ class Store {
     const { success, message, code } = await API.getChallengeAssist({ inviteCode: inviteCode });
     if (success) {
       ModalCtrl.showModal(Assist_succeed);
-    } else {ModalCtrl.showModal(Assist_fail, { code, message });}
+    } else { ModalCtrl.showModal(Assist_fail, { code, message }); }
 
     await this.getTaskInfo();
     history.replaceState({}, '', location.href.replace(new RegExp(`[?&]inviteCode=[^&]*`), ''));