Commit bee927e8 authored by 邱旭's avatar 邱旭

feat:merge

parents a83052dc a2e6ca09
...@@ -57,6 +57,18 @@ ...@@ -57,6 +57,18 @@
CFG.prizePageQrcodeUrl = CFG.domain + CFG.prize + "&off=1"; CFG.prizePageQrcodeUrl = CFG.domain + CFG.prize + "&off=1";
// 分享落地页 // 分享落地页
CFG.shareUrl = "/projectx/" + CFG.projectId + "/share.html?appID=" + CFG.appID + '&channel=' + CFG.channel; CFG.shareUrl = "/projectx/" + CFG.projectId + "/share.html?appID=" + CFG.appID + '&channel=' + CFG.channel;
if (CFG.projectId === 'pe8805796') {
// 测试环境
// http://activity.m.duibatest.com.cn/projectx/pe8805796/share.html?appKey=jlg88lyxz7siqtmr&openBs=openbs&appID=1
CFG.shareUrl = CFG.shareUrl + "&appKey=jlg88lyxz7siqtmr&openBs=openbs"
}
if (CFG.projectId === 'pf909ff04') {
// 线上测试
// https://90548-activity.dexfu.cn/projectx/pf909ff04/share.html?appKey=3oLQF9j3y7BKJUquwGn56hL6zzCW&openBs=openbs&appID=90548
CFG.shareUrl = CFG.shareUrl + "&appKey=3oLQF9j3y7BKJUquwGn56hL6zzCW&openBs=openbs"
}
CFG.inviteCode = getUrlParam('inviteCode'); CFG.inviteCode = getUrlParam('inviteCode');
...@@ -65,10 +77,17 @@ ...@@ -65,10 +77,17 @@
} }
</script> </script>
<<<<<<< HEAD
<script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1753870437437/assets/index-UsXWFjRT.js"></script> <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1753870437437/assets/index-UsXWFjRT.js"></script>
<link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753870437437/assets/vendor-BiCVt3x5.js"> <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753870437437/assets/vendor-BiCVt3x5.js">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753870437437/assets/vendor-BQh5NVNk.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753870437437/assets/vendor-BQh5NVNk.css">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753870437437/assets/index-D3iWqOrS.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753870437437/assets/index-D3iWqOrS.css">
=======
<script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1753928101858/assets/index-DJFU6AUc.js"></script>
<link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753928101858/assets/vendor-BiCVt3x5.js">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753928101858/assets/vendor-BQh5NVNk.css">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1753928101858/assets/index-9UylR0pW.css">
>>>>>>> origin/daily-20250721
<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">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> <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> </head>
...@@ -76,8 +95,13 @@ ...@@ -76,8 +95,13 @@
<body> <body>
<div id="root"></div> <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>!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>
<<<<<<< HEAD
<script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1753870437437/assets/polyfills-legacy-D0AVcSo7.js"></script> <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1753870437437/assets/polyfills-legacy-D0AVcSo7.js"></script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1753870437437/assets/index-legacy-ChWRjzN8.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script> <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1753870437437/assets/index-legacy-ChWRjzN8.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/1753928101858/assets/polyfills-legacy-D0AVcSo7.js"></script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1753928101858/assets/index-legacy-DQNrKq4D.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
>>>>>>> origin/daily-20250721
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -57,6 +57,18 @@ ...@@ -57,6 +57,18 @@
CFG.prizePageQrcodeUrl = CFG.domain + CFG.prize + "&off=1"; CFG.prizePageQrcodeUrl = CFG.domain + CFG.prize + "&off=1";
// 分享落地页 // 分享落地页
CFG.shareUrl = "/projectx/" + CFG.projectId + "/share.html?appID=" + CFG.appID + '&channel=' + CFG.channel; CFG.shareUrl = "/projectx/" + CFG.projectId + "/share.html?appID=" + CFG.appID + '&channel=' + CFG.channel;
if (CFG.projectId === 'pe8805796') {
// 测试环境
// http://activity.m.duibatest.com.cn/projectx/pe8805796/share.html?appKey=jlg88lyxz7siqtmr&openBs=openbs&appID=1
CFG.shareUrl = CFG.shareUrl + "&appKey=jlg88lyxz7siqtmr&openBs=openbs"
}
if (CFG.projectId === 'pf909ff04') {
// 线上测试
// https://90548-activity.dexfu.cn/projectx/pf909ff04/share.html?appKey=3oLQF9j3y7BKJUquwGn56hL6zzCW&openBs=openbs&appID=90548
CFG.shareUrl = CFG.shareUrl + "&appKey=3oLQF9j3y7BKJUquwGn56hL6zzCW&openBs=openbs"
}
CFG.inviteCode = getUrlParam('inviteCode'); CFG.inviteCode = getUrlParam('inviteCode');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment