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/1750679530963/assets/index-Dq8_oAXY.js"></script>
-  <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750679530963/assets/vendor-NRXRkH43.js">
-  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750679530963/assets/vendor-DhjHFO43.css">
-  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750679530963/assets/index-CXhHG4ei.css">
+  <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1750736466862/assets/index-Tfid51vi.js"></script>
+  <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750736466862/assets/vendor-dTyHSdUj.js">
+  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750736466862/assets/vendor-DhjHFO43.css">
+  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1750736466862/assets/index-8yh-DX7K.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/1750679530963/assets/polyfills-legacy-C2MhNPfJ.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1750679530963/assets/index-legacy-iFuuz5ux.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/1750736466862/assets/polyfills-legacy-C2MhNPfJ.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1750736466862/assets/index-legacy-CZKxK87g.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>
\ No newline at end of file

src/app.less

@@ -19,6 +19,8 @@ body {
   user-select: none;
   -webkit-touch-callout: none;
 
+  -webkit-tap-highlight-color: transparent;
+  
   overflow: hidden;
 }
 

src/panels/longImgPop/longImgPop.jsx

@@ -8,6 +8,7 @@ import DPlayer from "dplayer";
 import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
 import Taskpop from "../taskpop/taskpop";
 import { Button } from "@grace/ui";
+import musicStore from "@/store/musicStore.ts";
 
 @observer
 class LongImgPop extends React.Component {
@@ -22,10 +23,15 @@ class LongImgPop extends React.Component {
     this.stop = false;
     this.dp = null;
   }
-
+  
   componentDidMount() {
     console.log('this.props?.type',this.props?.type)
     if (this.props?.type == 2) {
+      this.musicMute = musicStore.mute
+      // 停止背景音乐
+      if (!musicStore.mute) {
+        musicStore.mute = true
+      }
       this.dp = new DPlayer({
         container: this.videoNode,
         video: {
@@ -52,6 +58,9 @@ class LongImgPop extends React.Component {
 
   componentWillUnmount() {
     if (this.timer) clearInterval(this.timer);
+    if (this.props?.type == 2) {
+      musicStore.mute = this.musicMute
+    }
   }
 
   /** 开始倒计时 */

src/store/share.js

@@ -222,7 +222,7 @@ const shareStore = makeAutoObservable({
       CFG.projectId == "pd3ee4a37"
         ? "https://lifeapp.picclife.cn/portal/app_manager/downloadapps.html?operate_link=" +
         encodeURIComponent(
-          `https://lifeapp-api.picclife.cn/lifeapi/lifeapp-svc-gw/api/auth_code/authorize/v1?activity_code=613402&redirect_type=0&redirect_uri=${isIos()
+          `https://lifeapp-api.picclife.cn/lifeapi/lifeapp-svc-gw/api/auth_code/authorize/v1?activity_code=613602&redirect_type=0&redirect_uri=${isIos()
             ? encodeURIComponent(
               encodeURIComponent(
                 `${location.origin}/customShare/share?id=${prodCustomId}` +
@@ -240,7 +240,7 @@ const shareStore = makeAutoObservable({
         "&isBindManager=1&isNeedAuth=1&operate_type=3"
         : "https://lifeapp-test.picclife.cn/portal-web/app_manager/downloadapps.html?operate_link=" +
         encodeURIComponent(
-          `https://lifeapp-api-test.picclife.cn/lifeapi/lifeapp-svc-rel-gw/api/auth_code/authorize/v1?activity_code=613402&redirect_type=0&redirect_uri=${isIos()
+          `https://lifeapp-api-test.picclife.cn/lifeapi/lifeapp-svc-rel-gw/api/auth_code/authorize/v1?activity_code=613602&redirect_type=0&redirect_uri=${isIos()
             ? encodeURIComponent(
               encodeURIComponent(
                 `${location.origin}/customShare/share?id=${testCustomId}` +

src/utils/errorHandler.ts

@@ -10,7 +10,7 @@ export const errMessageMap = {
   100001: "登录过期啦，请重新登录哦～",
   200306: "无法为自己助力哦～",
   200302: '非新用户，助力失败～',
-  200303: '助力机会已用完，一起来参与活动吧～',
+  200303: '非新用户，助力失败～',
   200304: "好友今日助力次数已达上限～",
   200305: "已为好友助力哦～",
   20002: "活动已结束",