feat:merge

c4a986a4 · 邱旭 · 7afde8ea · c4a986a4 · c4a986a4 · c4a986a4
Commit c4a986a4 authored Jul 25, 2025 by 邱旭
Showing with 10 additions and 10 deletions

index.html dist/index.html +6 -6

main.ts mock/main.ts +1 -1

project.settings.json project.settings.json +1 -1

spark.config.json spark.config.json +1 -1

store.ts src/store/store.ts +1 -1

No files found.
--- a/dist/index.html
+++ b/dist/index.html
@@ -61,10 +61,10 @@
      // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
    }
  </script>
-  <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1753410015967/assets/index-B0WrsUkC.js"></script>
-  <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753410015967/assets/vendor-oDoDBzst.js">
-  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753410015967/assets/vendor-BQh5NVNk.css">
-  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753410015967/assets/index-BgFwN6C8.css">
+  <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1753422880763/assets/index-_j9biD6L.js"></script>
+  <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753422880763/assets/vendor-oDoDBzst.js">
+  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753422880763/assets/vendor-BQh5NVNk.css">
+  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753422880763/assets/index-HNAPSveX.css">
  <script type="module">import.meta.url;import("_").catch(()=>1);(async function*(){})().next();if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
  <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 </head>
@@ -72,8 +72,8 @@
 <body>
  <div id="root"></div>
  <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1753410015967/assets/polyfills-legacy-D0AVcSo7.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1753410015967/assets/index-legacy-BQguZlEx.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1753422880763/assets/polyfills-legacy-D0AVcSo7.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1753422880763/assets/index-legacy-BlX54cfE.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>

 </html>

--- a/mock/main.ts
+++ b/mock/main.ts
@@ -49,7 +49,7 @@ export default [
        message: "",
        timeStamp: Date.now(),
        data: {
-          redRainCountDownTime: 10,
+          "redRainConfig":[{"channel":"2","endTime":"15:00:00","joinStatus":false,"rainId":"1","ruId":null,"startTime":"08:00:00"},{"channel":"2","endTime":"23:00:00","joinStatus":false,"rainId":"2","ruId":null,"startTime":"16:00:00"}],"redRainCountDownTime":10,
          actStartTime: Date.now() - 1 * 24 * 60 * 60 * 1000,
          actEndTime: Date.now() + 3 * 24 * 60 * 60 * 1000,
          endPoint: Date.now() + 0.0001 * 24 * 60 * 60 * 1000,

--- a/project.settings.json
+++ b/project.settings.json
-{"proSetting":{"projectxIDs":{"testId":[{"label":"主链路","value":"p476a83d1"},{"label":"签到","value":"p1225e7d8"}],"prodId":[{"label":"线上测试","value":"pf909ff04"}]},"skinVariables":[],"mockSetting":{"projectId":"","pageId":""}},"envSetting":{},"psdSetting":{"psdFSSetting":true,"psdCenterSetting":true}}
+{"proSetting":{"projectxIDs":{"testId":[{"label":"主链路","value":"p476a83d1"},{"label":"签到","value":"p1225e7d8"},{"label":"迭代","value":"pe8805796"}],"prodId":[{"label":"线上测试","value":"pf909ff04"}]},"skinVariables":[],"mockSetting":{"projectId":"","pageId":""}},"envSetting":{},"psdSetting":{"psdFSSetting":true,"psdCenterSetting":true}}
--- a/spark.config.json
+++ b/spark.config.json
-{"proName":"华夏理财-模拟理财-20250701","proDesc":"","proPath":"D:\\Duiba\\华夏银行\\模拟理财\\模拟理财_250701","createTime":1729847802806}
+{"proName":"华夏理财-模拟理财-20250701","proDesc":"","proPath":"/Users/qiuxu/Documents/Work/project/20250723_华夏理财/HuaXiaSimulate_20250701","createTime":1729847802806}
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -192,7 +192,7 @@ class Store {
    const redRainConfig = this.indexData?.redRainConfig
    // 红包雨时间段判断
    const everyJoinStatus = redRainConfig?.some(item => !item?.joinStatus);
-    if(!everyJoinStatus) {
+    if(everyJoinStatus) {
      const len = redRainConfig?.length;
      for(let i = 0; i < len; i++) {
        const redItem = redRainConfig?.[i];