Merge branch 'daily-20250721' of...

Merge branch 'daily-20250721' of http://gitlab2.dui88.com/sparkprojects/HuaXiaSimulate_20250701 into daily-20250721

Merge branch 'daily-20250721' of...
Merge branch 'daily-20250721' of http://gitlab2.dui88.com/sparkprojects/HuaXiaSimulate_20250701 into daily-20250721
db871dc7 · zhangyuan · 65057426 · 3061cfb3 · db871dc7 · db871dc7
Commit db871dc7 authored Jul 29, 2025 by zhangyuan
6 changed files
--- a/dist/index.html
+++ b/dist/index.html
@@ -65,10 +65,10 @@
    }

  </script>
-  <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1753768613370/assets/index-CgkBFOpJ.js"></script>
-  <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753768613370/assets/vendor-BiCVt3x5.js">
-  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753768613370/assets/vendor-BQh5NVNk.css">
-  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753768613370/assets/index-DgRvRctR.css">
+  <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1753769499211/assets/index-DBFCJ1aX.js"></script>
+  <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753769499211/assets/vendor-BiCVt3x5.js">
+  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753769499211/assets/vendor-BQh5NVNk.css">
+  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753769499211/assets/index-CEoLLnMQ.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>
@@ -76,8 +76,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/1753768613370/assets/polyfills-legacy-D0AVcSo7.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1753768613370/assets/index-legacy-C9hKh_vw.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/1753769499211/assets/polyfills-legacy-D0AVcSo7.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1753769499211/assets/index-legacy-BQO0gkMb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>

 </html>
\ No newline at end of file
--- a/mock/main.ts
+++ b/mock/main.ts
@@ -53,7 +53,7 @@ export default [
            {
              "channel": "1",
              "endTime": "14:00:00",
-              "joinStatus": true,
+              "joinStatus": false,
              "rainId": "1",
              "ruId": null,
              "startTime": "08:00:00"
@@ -64,7 +64,7 @@ export default [
              "joinStatus": true,
              "rainId": "2",
              "ruId": null,
-              "startTime": "14:10:30"
+              "startTime": "14:01:30"
            }
          ],
          "redRainCountDownTime": 0,
@@ -133,10 +133,13 @@ export default [
              "max": 900,
            }
          }),
-          "firstMoneyPop1": {
+          "firstMoneyPop": {
            "notifyText": "文案文案文案文案文案文案文案文案 文案文文案文案文案文案文案 文案文文案文案文案文案文案 文案文文案文案文案文案文案 文案文文案文案文案文案文案 文案文文案文案文案文案文案 文案文文案文案文案文案文案 文案文案文案文案",
            "experienceNum": 59442359
          },
+          "giftPop1": {
+            todayPopFlag: true
+          },
          "virtualAssets": {
            "preDayIncome": "656",
            "availableFunds": "10284329.43",

--- a/src/App.tsx
+++ b/src/App.tsx
@@ -35,7 +35,7 @@ class App extends Component {
      prize: PrizePage,
      share: SharePage
    }[skinId] || HomePage;
-    PageCtrl.changePage(defaultPage);
+    PageCtrl.changePage(HomePage);
  }

  async componentDidMount() {

--- a/src/pages/HomePage/HomePage.tsx
+++ b/src/pages/HomePage/HomePage.tsx
@@ -23,6 +23,7 @@ import { SvgaPlayer } from '@grace/svgaplayer';
 import mainPageTitle from '../../assets/svga/mainPageTitle.svga';
 import redFenwei from '../../assets/svga/redFenwei.svga';
 import RedPackCountPanel from '@/panels/redPackCountPanel/index.jsx';
+import FirstPop from '@/panels/firstPop/firstPop';

 @observer
 class HomePage extends React.Component<any, any> {
@@ -43,6 +44,9 @@ class HomePage extends React.Component<any, any> {
  async componentDidMount() {
    await store.judgeIsWhiteUser();
    store.judgeRedModal();
+    if (store.indexData?.firstMoneyPop) {
+      ModalCtrl.showModal(FirstPop, store.indexData?.firstMoneyPop);
+    }
    const { bigStartConfig, virtualAssets } = store.indexData;

    const lockArr = (bigStartConfig || []).filter(el => {

--- a/src/panels/newbieModal/newbieModal.tsx
+++ b/src/panels/newbieModal/newbieModal.tsx
@@ -78,7 +78,7 @@ export class NewbieModal extends Component<any, any> {

        return <div className="newbieModal modal_center">
            <div className={`bg${type}`}/>
-            <div className="TurnTable1">
+            {actPrizeVO?.length > 0 && <div className="TurnTable1">
                <CircleTurntable
                    className="tt_box"
                    // @ts-ignore
@@ -100,7 +100,7 @@ export class NewbieModal extends Component<any, any> {
                    }}
                    didStop={this.onStop}
                />
-            </div>
+            </div>}
            {type == 1 && <Button className="feelBtn md12" onClick={this.drawHandle}/>}
            {type == 2 && <Button className="drawBtn md13" onClick={this.drawHandle}/>}
            <Button className="close" onClick={this.clickClose}/>

--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -9,7 +9,7 @@ import { getDomain } from '@spark/dbdomain';
 import { showShareGuide } from '@spark/share';
 import Loginpop from '@/panels/loginpop/loginpop';
 import InvalidPop from '@/panels/invalidPop/invalidPop';
-import FirstPop from '@/panels/firstPop/firstPop';
+
 import Tipspop from '@/panels/tipspop/tipspop';
 import { isWeiXin, queryAppFundDetail } from '@/AppTools';
 import { CHANNEL } from '@/AppTools';
@@ -181,9 +181,6 @@ class Store {
      this.percent = 0;
    }

-    if (firstMoneyPop) {
-      ModalCtrl.showModal(FirstPop, firstMoneyPop);
-    }
    // 更新产品信息
    if (codeList?.length && CFG.channel == CHANNEL.HXLC) {
      this.updateFundInfo(codeList)