Commit 4f42e90a authored by haiyoucuv's avatar haiyoucuv

Merge remote-tracking branch 'origin/master'

parents f64c13ed d2354c9e
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<link rel="dns-prefetch" href="//yun.duiba.com.cn" /> <link rel="dns-prefetch" href="//yun.duiba.com.cn" />
<link rel="preconnect" href="//embedlog.duiba.com.cn"> <link rel="preconnect" href="//embedlog.duiba.com.cn">
<title>天天领积分</title> <title>天天领积分</title>
<script type="text/javascript"> <script type="text/javascript">
if (localStorage && localStorage.isWebp) { if (localStorage && localStorage.isWebp) {
document document
.getElementsByTagName('html')[0] .getElementsByTagName('html')[0]
.setAttribute('duiba-webp', 'true'); .setAttribute('duiba-webp', 'true');
} }
</script> </script>
<script src="//yun.duiba.com.cn/js-libs/rem/1.1.3/rem.min.js"></script> <script src="//yun.duiba.com.cn/js-libs/rem/1.1.3/rem.min.js"></script>
<script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script> <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
<script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script> <script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
<script> <script>
var CFG = CFG || {}; var CFG = CFG || {};
CFG.projectId = location.pathname.split('/')[2] || '1'; CFG.projectId = location.pathname.split('/')[2] || '1';
function getUrlParam(name) { function getUrlParam(name) {
var search = window.location.search; var search = window.location.search;
var matched = search var matched = search
.slice(1) .slice(1)
.match(new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i')); .match(new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i'));
return search.length ? matched && matched[2] : null; return search.length ? matched && matched[2] : null;
} }
CFG.appID = '${APPID}'; CFG.appID = '${APPID}';
// 新小程序会传version=hg 旧小程序不会传 // 新小程序会传version=hg 旧小程序不会传
CFG.version = getUrlParam('version') || sessionStorage.getItem('version'); CFG.version = getUrlParam('version') || sessionStorage.getItem('version');
CFG.version && sessionStorage.setItem("version", CFG.version); CFG.version && sessionStorage.setItem("version", CFG.version);
CFG.isNewMiniVersion = CFG.version == 'hg'; CFG.isNewMiniVersion = CFG.version == 'hg';
CFG.subUrl = (CFG.isNewMiniVersion ? `/packages/activityCenter/subscibe` : `/pagesNews/subscribeMiddlePage/subscribeNews`) + CFG.subUrl = (CFG.isNewMiniVersion ? `/packages/activityCenter/subscibe` : `/pagesNews/subscribeMiddlePage/subscribeNews`) +
"?source=duiba&subId=1922853657613651969&activeNo=" + CFG.projectId + "&activityUrl=" + encodeURI(location.href) "?source=duiba&subId=1922853657613651969&activeNo=" + CFG.projectId + "&activityUrl=" + encodeURI(location.href)
CFG.index = '/projectx/' + CFG.projectId + '/index.html?appID=' + CFG.appID; CFG.index = '/projectx/' + CFG.projectId + '/index.html?appID=' + CFG.appID;
// 免登中间页id // 免登中间页id
CFG.loginMidId = "Did1NjAwMDc"; // 线上正式 CFG.loginMidId = "Did1NjAwMDc"; // 线上正式
if (location.href.indexOf("duibatest") > -1) { if (location.href.indexOf("duibatest") > -1) {
CFG.loginMidId = "Did1MTM2NTU"; // 测试 CFG.loginMidId = "Did1MTM2NTU"; // 测试
} else if (CFG.projectId == 'p555448e6') { // TODO 线上测试id } else if (CFG.projectId == 'p555448e6') { // TODO 线上测试id
CFG.loginMidId = "Did1NTk5OTk"; // 线上测试 CFG.loginMidId = "Did1NTk5OTk"; // 线上测试
} }
// 免登中间页 // 免登中间页
CFG.loginMidUrl = "/customShare/share?id=" + CFG.loginMidId + "&source=duiba&projectId=" + CFG.projectId + "&redirectUrl="; CFG.loginMidUrl = "/customShare/share?id=" + CFG.loginMidId + "&source=duiba&projectId=" + CFG.projectId + "&redirectUrl=";
if (!getUrlParam("appID")) { if (!getUrlParam("appID")) {
// alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。") // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
} }
</script> </script>
<script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747647448995/assets/index-BqIdDmgr.js"></script> <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747648083955/assets/index-C4QluBT4.js"></script>
<link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747647448995/assets/vendor-DE36uEso.js"> <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747648083955/assets/vendor-Qyc3nnr0.js">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747647448995/assets/vendor-BQh5NVNk.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747648083955/assets/vendor-BQh5NVNk.css">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747647448995/assets/index-CllFPL1A.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747648083955/assets/index-BSL3msYe.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">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>
<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>
<script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1747647448995/assets/polyfills-legacy-arANKBzQ.js"></script> <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1747648083955/assets/polyfills-legacy-arANKBzQ.js"></script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1747647448995/assets/index-legacy-DuYcneYr.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/1747648083955/assets/index-legacy-CshhqMiw.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -22,7 +22,7 @@ const API = generateAPI({ ...@@ -22,7 +22,7 @@ const API = generateAPI({
resetCookie: "/autoLogin/resetCookie", resetCookie: "/autoLogin/resetCookie",
userLogin: { userLogin: {
uri: "userLogin.check", uri: "userLogin.check",
showMsg: false, showMsg: true,
}, },
// 奖品记录 // 奖品记录
......
...@@ -155,7 +155,7 @@ class Check extends React.Component<any, any> { ...@@ -155,7 +155,7 @@ class Check extends React.Component<any, any> {
{Array.isArray(taskInfoList) && {Array.isArray(taskInfoList) &&
taskInfoList.length > 0 && taskInfoList.length > 0 &&
taskInfoList?.map((v, i) => { taskInfoList?.map((v, i) => {
const { title, subTitle, icon, code, completedSize, intervalLimitSize, jumpUrl, id, } = v || {}; const { title, subTitle, icon, code, completedSize, intervalLimitSize, jumpUrl, id, } = v || {};
// 获取按钮状态 // 获取按钮状态
const renderActionButton = (code, completedSize, intervalLimitSize) => { const renderActionButton = (code, completedSize, intervalLimitSize) => {
...@@ -250,7 +250,9 @@ class Check extends React.Component<any, any> { ...@@ -250,7 +250,9 @@ class Check extends React.Component<any, any> {
{/* <span className="item-bg"></span> */} {/* <span className="item-bg"></span> */}
<img className="item-icon" src={icon} alt="" /> <img className="item-icon" src={icon} alt="" />
<div className="item-name"> <div className="item-name">
<span className="item-title">{title}(completedSize / intervalLimitSize) </span> {(code.startsWith("yqzl") || code.startsWith("yqzl_new") || code.startsWith("scan")) ?
<span className="item-title">{title}{completedSize}/{intervalLimitSize} </span> :
<span className="item-title">{title} </span>}
<span className="item-tip">{subTitle}</span> <span className="item-tip">{subTitle}</span>
</div> </div>
{renderActionButton(code, completedSize, intervalLimitSize)} {renderActionButton(code, completedSize, intervalLimitSize)}
......
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