Merge branch 'master' of gitlab2.dui88.com:sparkprojects/rb-studychina-20250617

dist/index.html

@@ -84,10 +84,10 @@
       // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
     }
   </script>
-  <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1750596681786/assets/index-DFyFtdTQ.js"></script>
-  <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750596681786/assets/vendor-DWHb8WZT.js">
-  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750596681786/assets/vendor-DhjHFO43.css">
-  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750596681786/assets/index-DmQfCqdL.css">
+  <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1750665809894/assets/index-D1aTBpKa.js"></script>
+  <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750665809894/assets/vendor-E5YBvmaG.js">
+  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750665809894/assets/vendor-DhjHFO43.css">
+  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750665809894/assets/index-DzI7cJzF.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>
@@ -96,8 +96,8 @@
   <div id="root"></div>
   <!-- <script src="https://yun.duiba.com.cn/db_games/RB_yanxue/250620/js/output.js"></script> -->
   <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/1750596681786/assets/polyfills-legacy-C2MhNPfJ.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1750596681786/assets/index-legacy-mXsV-BKH.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/1750665809894/assets/polyfills-legacy-C2MhNPfJ.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1750665809894/assets/index-legacy-C-tCmzI4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>
\ No newline at end of file

src/components/rulepop/rulepop.jsx

@@ -16,9 +16,12 @@ class Rulepop extends React.Component {
     super(props);
   }
 
-  componentDidMount() {
+  async componentDidMount() {
     store.initRule();
-    API.completeGuide({ flag: 1})
+    if (store.indexData.newGuideFlag === 0) {
+      await API.completeGuide({ flag: 1})
+      store.updateIndex()
+    }
 
     pageView("b14294", {
         page_name: "活动规则弹窗",

src/panels/taskpop/taskpop.jsx

@@ -120,8 +120,6 @@ class Taskpop extends React.Component {
           {
             taskList?.length > 0 &&
             taskList.map((val, key) => {
-              val?.taskStatus == 0 && handleLogExposure(24, val?.code, 1)
-              val?.taskStatus == 1 && handleLogExposure(24, val?.code, 2)
               return (
                 <div className="item" key={key}>
                   <span className="bg_item"></span>

src/store/share.js

@@ -214,7 +214,7 @@ const shareStore = makeAutoObservable({
   goAppPrize() {
     // windowJumpUrl(CFG.toAppPrizeUrl);
     //CFG.projectId三元判断为真，前面的是正式，需要修改的地方为中间页链接，可咨询东哥链接(奖品页唤端)  ios需要多encode一次
-    const testCustomId = "Did1NjEwNzk"; //奖品-测试中间页
+    const testCustomId = "Did1NjE0NDc"; //奖品-测试中间页
     const prodCustomId = "Did1NjExMjc"; //奖品-正式中间页
     //pd3ee4a37 为正式项目 需替换为正式项目ID
     // TODO

src/store/store.ts

@@ -129,7 +129,7 @@ class Store {
     }
 
 
-    if (data.rulePop) {
+    if (data.newGuideFlag === 0) {
       ModalCtrl.showModal(RulePop)
     }
   }
@@ -182,7 +182,7 @@ class Store {
 
     // 抽奖次数为0
     if (!leftDrawTimes) {
-      return Toast.show("抽奖次数不足，快去猜谜赚次数吧～");
+      return Toast.show("抽奖次数不足～");
     }
 
     // 打开抽奖出奖弹窗

src/store/task.ts

@@ -12,6 +12,7 @@ import { Toast } from "@grace/ui";
 import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
 import LongImgPop from "@/panels/longImgPop/longImgPop.jsx";
 import { md5 } from "@spark/utils";
+import { handleLogExposure } from "@/MD.js";
 
 interface TaskItem {
   jumpUrl?: string;
@@ -38,6 +39,10 @@ const taskStore = makeAutoObservable({
     });
     if ((success && data)) {
       this.taskList = data?.item || [];
+      (data?.item || []).map((item)=>{
+        item?.taskStatus == 0 && handleLogExposure(24, item?.code, 1)
+        item?.taskStatus == 1 && handleLogExposure(24, item?.code, 2)
+      })
     }
   },