merge

src/api/index.ts

@@ -24,7 +24,12 @@ const API = generateAPI({
     uri: "userLogin.check",
     showMsg: false,
   },
-  records: "records.query",
+
+  // 奖品记录
+  records: "common/records.do",
+  // 红包补领
+  redpacket: "common/moneyReissue.do",
+
   getInviteCode: {
     uri: 'inviteAssist_1/getInviteCode.do',
     withToken: true,

src/store/store.ts

@@ -7,6 +7,8 @@ import { PageCtrl } from '@/core/ctrls/PageCtrl';
 import { ModalCtrl } from '@/core/ctrls/ModalCtrl';
 import Choice_challenge from '../../src/components/choice_challenge/choice_challenge';
 import SkyFullGoldPanel from "@/panels/SkyFullGoldPanel/SkyFullGoldPanel.tsx";
+import Renewmodule from '../../src/components/renewmodule/renewmodule';
+import Finish_task from '../../src/components/finish_task/finish_task';
 
 class Store {
 
@@ -29,6 +31,9 @@ class Store {
 
   ruleInfo = '';
 
+  /** 积分门票 */
+  ticketNum = null;
+
   /** 获取活动规则 */
   async initRule() {
     // 模拟获取远程的数据
@@ -111,14 +116,14 @@ class Store {
   // 首页挑战信息
   taskInfo: {
     boolOpenChallenge?: boolean;
-    challengeStartTime?: number;
-    challengeEndTime?: number;
     choosedChallengeId?: string;
     hasChallengeDay?: number;
     boolNeedResign?: boolean;
     challengeConfigList?: Array<{
       challengeId: string;
       challengeTotalDay: number;
+      challengeStartTime: number;
+      challengeEndTime: number;
       prizeName: string;
       prizeImg: string;
       resignJf: number;
@@ -142,9 +147,15 @@ class Store {
     const { success, data } = await API.getChallengeIndex();
     if (success && data) {
       this.taskInfo = data
-      if(!data.choosedChallengeId){
+      if (!data.choosedChallengeId) {
         ModalCtrl.showModal(Choice_challenge)
       }
+      if(data.boolNeedResignPop) {
+        ModalCtrl.showModal(Renewmodule)
+      }
+      if(data.boolNeedChallengeCompletePop){
+        ModalCtrl.showModal(Finish_task)
+      }
     }
   };