Merge remote-tracking branch 'origin/master'

mock/main.ts

@@ -13,10 +13,21 @@ export default [
       }
     },
   },
+  {
+    url: '/home/coop_codeUpdate.do',
+    response: ({ query }) => {
+      return {
+        success: true,
+        code: "",
+        message: "",
+        timeStamp: Date.now(),
+        data: null
+      }
+    },
+  },
   {
     url: '/home/index.do',
     response: ({ query }) => {
-      const signDay = Math.random() * 7 >> 0;
       return {
         success: true,
         code: "",
@@ -28,53 +39,63 @@ export default [
           myEndTime: Date.now() + 1 * 24 * 60 * 60 * 1000,
           uid: '234234',
           ruleText: 'rulerulerulerulerulerulerule',
-          "bigStartConfig": [
-            {
-              "prizeImg": "Duis Excepteur cupidatat",
-              "titleImg": "sint magna sunt dolore"
-            },
-            {
-              "prizeImg": "non fugiat culpa ad",
-              "titleImg": "cillum id ex laborum"
+          "bigStartConfig": new Array(5).fill(1).map((_, index) => {
+            return {
+              "prizeImg": "//yun.duiba.com.cn/polaris/redpacket_img.3e5efeebc67c039d147cf881bf72c7de4b7b1efd.png",
+              "titleImg": "//yun.duiba.com.cn/polaris/redpacket_tag.e917e7cffb11dbfe48822d0b977e19fb7bab9d21.png"
             }
-          ],
+          }),
           "firstMoneyPop": {
             "agreementText": "文案文案文案文案文案文案文案文案 文案文案文案文案",
             "experienceNum": 59442359
           },
           firstMoneyPop: null,
           "virtualAssets": {
-            "preDayIncome": "pariatur labore esse enim nulla",
-            "availableFunds": "pariatur ullamco",
-            "totalMoney": "eu eiusmod aute nisi",
+            "preDayIncome": "656",
+            "availableFunds": "10284329.43",
+            "totalMoney": "359998480.1",
             "realBuyJumpUrl": "anim consectetur dolor",
-            "totalIncome": "sunt non"
+            "totalIncome": "8390.22"
           },
           "checkIn": {
-            "totalCheckIn": "Excepteur",
+            "totalCheckIn": "4",
             "checkInConfig": [
               {
-                "days": "tempor in esse",
-                "experienceNum": "et qui",
-                "status": "exercitation"
+                "id": 1,
+                "days": "3",
+                "experienceNum": "1",
+                "status": '2'
+              },
+              {
+                "id": 2,
+                "days": "5",
+                "experienceNum": "3",
+                "status": '1'
               },
               {
-                "days": "laborum",
-                "experienceNum": "voluptate ea",
-                "status": "culpa in quis consectetur"
-              }
+                "id": 3,
+                "days": "10",
+                "experienceNum": "6",
+                "status": '0'
+              },
+              {
+                "id": 4,
+                "days": "20",
+                "experienceNum": "9",
+                "status": '0'
+              },
             ]
           },
           "recommendProductConfig": new Array(7).fill(1).map((_, index) => {
             return {
-              "name": `产品${index + 1}`,
-              "shenShuGuiZei": "elit eiusmod",
-              "touZiQiXianText": "non in id aliquip cillum",
-              "qigouText": "nisi velit ipsum",
-              "baiFenBiText": "veniam ut sunt",
-              "fengXian": "officia laborum reprehenderit enim",
-              "code": "adipisicing",
-              "status": "dolor cul",
+              "name": `固收纯债最短持有7天A款Z${index + 1}`,
+              "shenShuGuiZei": "交易日申赎",
+              "touZiQiXianText": "近1个月年化收益率(截至2023/03/26)",
+              "qigouText": "1元起购",
+              "baiFenBiText": "90%活动用户选购本产品t",
+              "fengXian": "中低风险",
+              "code": "23112008P",
+              "status": index % 2 === 0 ? '1' : '0',
               "realBuyJumpUrl": `https://www.baidu.com?t=${index}`
             }
           }),
@@ -118,24 +139,26 @@ export default [
     },
   },
   {
-    url: '/main/sign.do',
+    url: '/home/doCheckIn.do',
     response: ({ query }) => {
       return {
         success: true,
         code: "",
         message: "",
-        data: {
-          signCredits: 100,
-          extraCredits: 100,
-          boolLimit: true,
-          vipLevel: 3,
-          multipleValue: 3,
-          url: "urlurlurlurlurl",
-          taskId: "taskId",
-          newLuckCreditsNum: 33,
-        },
+        data: 'ok',
       }
     },
   },
-  
+  {
+    url: '/home/doRewards.do',
+    response: ({ query }) => {
+      return {
+        success: true,
+        code: "",
+        message: "",
+        data: 'ok',
+      }
+    },
+  },
+
 ]

spark.config.json

-{"proName":"未命名项目","proDesc":"","proPath":"F:\\2025\\20250609天天领积分","createTime":1729847802806}
+{"proName":"华夏理财-模拟理财-20250701","proDesc":"","proPath":"/Users/yujiating/Documents/programme/华夏理财-模拟理财-20250701/HuaXiaSimulate_20250701","createTime":1729847802806}

src/app.less

@@ -34,6 +34,13 @@ body {
   overflow: hidden;
 }
 
+.com_Container {
+  width: 100%;
+  height: 100vh;
+  position: relative;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
 
 input {
   outline: none;

src/panels/rulepop/rulepop.jsx

@@ -14,9 +14,6 @@ class Rulepop extends React.Component {
     super(props);
   }
 
-  async componentDidMount() {
-    store.initRule();
-  }
 
   handleClose = _asyncThrottle(() => {
     ModalCtrl.closeModal()
@@ -26,7 +23,7 @@ class Rulepop extends React.Component {
     return (
       <div className="rulepop modal_center">
         <span className="bg"></span>
-        <div className="text" dangerouslySetInnerHTML={{ __html: store.ruleInfo }}></div>
+        <div className="text" dangerouslySetInnerHTML={{ __html: store.indexData.ruleText }}></div>
         <Button className="close" onClick={this.handleClose} />
       </div>
     );

src/store/store.ts

@@ -57,6 +57,7 @@ class Store {
   indexData: {
     actStartTime?: number,
     actEndTime?: number,
+    currentTime?: number, // 前端自定义
     // 我的终点时间
     myEndTime?: number,
     ruleText?: string,
@@ -83,6 +84,7 @@ class Store {
     checkIn?: {
       totalCheckIn?: string,
       checkInConfig?: Array<{
+        id?: number,
         days?: string,
         experienceNum?: string,
         status?: string,