Merge remote-tracking branch 'origin/master'

bd210096 · haiyoucuv · 55feaaed · ba136ab8 · bd210096 · 55feaaed
Commit bd210096 authored May 12, 2025 by haiyoucuv
5 changed files
--- a/dist/index.html
+++ b/dist/index.html
@@ -33,17 +33,17 @@
        // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
      }
    </script>
-    <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747020272554/assets/index-BYgRNr4P.js"></script>
-    <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747020272554/assets/vendor-Cp3UQKqt.js">
-    <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747020272554/assets/vendor-CWeaUrOh.css">
-    <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747020272554/assets/index-DQJZ8wQ5.css">
+    <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747030895660/assets/index-BCGGlkge.js"></script>
+    <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747030895660/assets/vendor-g_Lszowt.js">
+    <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747030895660/assets/vendor-CWeaUrOh.css">
+    <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747030895660/assets/index-DqKw4FuE.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>
  <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/1747020272554/assets/polyfills-legacy-C2MhNPfJ.js"></script>
-    <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1747020272554/assets/index-legacy-Ds49zfd7.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/1747030895660/assets/polyfills-legacy-C2MhNPfJ.js"></script>
+    <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1747030895660/assets/index-legacy-BIdZ32py.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
  </body>
 </html>

--- a/src/assets/homePage/taskfinishbtn.png
+++ b/src/assets/homePage/taskfinishbtn.png
--- a/src/pages/HomePage/HomePage.tsx
+++ b/src/pages/HomePage/HomePage.tsx
@@ -55,14 +55,18 @@ class HomePage extends React.Component<any, any> {
  })

  /** 规则按钮*/
-  clickRule = () => {
+  clickRule = _asyncThrottle(() => {
    if (!store.judgeActTime(true, false)) return;
    ModalCtrl.showModal(Rulepop);
-  }
-  clickDraw = () => {
+  })
+  clickDraw = _asyncThrottle(() => {
    if (!store.judgeActTime()) return;
+    if (store.indexData.remainDrawTimes == 0) {
+      Toast.show('暂无抽奖机会哦')
+      return;
+    }
    ModalCtrl.showModal(Drawpop, {});
-  }
+  })
  clickShop = () => {
    console.info('shop')
    // if (!store.judgeActTime()) return;
@@ -116,7 +120,7 @@ class HomePage extends React.Component<any, any> {
        <div className="rankinfo" onClick={this.clickRank}>
          <span className="rankarr"></span>
          <span className="ranklab">我的排名</span>
-          <span className="ranknum">{rank?.rank == -1 ? "未上榜" : rank?.rank + "名"}</span>
+          <span className="ranknum">{rank?.rank == -1 ? "999+" : rank?.rank > 999 ? '999+' : (rank?.rank + "名")}</span>
        </div>
      </div>
      <span className="title"></span>

--- a/src/pages/rankpage/rankpage.tsx
+++ b/src/pages/rankpage/rankpage.tsx
@@ -130,7 +130,7 @@ class Rankpage extends React.Component<{}, RankpageState> {
        <div className="list" style={{ height: `${(689 - (1624 - document.body.clientHeight * 750 / document.body.clientWidth) / 2) / 100}rem` }}>
          {
            rankInfos.length != 0 && <div className="myinfo">
-              <span className="myrank">{myRank.index == -1 ? '未上榜' : (myRank.index > 999 ? '999+' : myRank.index)}</span>
+              <span className="myrank">{myRank.index == -1 ? '999+' : (myRank.index > 999 ? '999+' : myRank.index)}</span>
              <span className="myname">{myRank.userName}（我）</span>
              <span className="myscore">{myRank.score}</span>
              <span className="mybg"></span>

--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -85,6 +85,9 @@ class Store {
        ModalCtrl.showModal(Ranknoprizepop, { ...data.rankPopInfo })
      }
    }
+    if (data.newAssist > 0) {
+      Toast.show(`成功邀请${data.newAssist}位好友助力`)
+    }
  }

  judgeActTime(brakeStart = true, brakeEnd = true) {