Skip to content

K
kww_dayDayGetCredits_250512
Commit e48c1068 authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	dist/index.html
parents 6464611d a95f8df6
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 82 deletions
config/AssetsMin/pngquant/macos/pngquant 100644 → 100755
View file @ e48c1068
File mode changed from 100644 to 100755
dist/index.html
View file @ e48c1068
<!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/1747621241875/assets/index-DJIH5p0R.js"></script> <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747620838828/assets/index-Lip6coJ6.js"></script>
<link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747621241875/assets/vendor-CzylL8D3.js"> <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747620838828/assets/vendor-Dxjd_hop.js">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747621241875/assets/vendor-BQh5NVNk.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747620838828/assets/vendor-BQh5NVNk.css">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747621241875/assets/index-CR0HLAE6.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747620838828/assets/index-BXmxRDbp.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/1747621241875/assets/polyfills-legacy-arANKBzQ.js"></script> <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1747620838828/assets/polyfills-legacy-arANKBzQ.js"></script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1747621241875/assets/index-legacy-DUTdIdqz.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/1747620838828/assets/index-legacy-CL0wEnlx.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
</body> </body>
</html> </html>
\ No newline at end of file
mock/challenge.ts
View file @ e48c1068
...@@ -48,7 +48,7 @@ export default [ ...@@ -48,7 +48,7 @@ export default [
], ],
"hasChallengeDay": 5, "hasChallengeDay": 5,
"latestChallengeSuccessTime": 5, "latestChallengeSuccessTime": 5,
"boolNeedResign": true, "boolNeedResign": false,
"boolNeedResignPop": false, "boolNeedResignPop": false,
"taskInfoList": [ "taskInfoList": [
{ {
...@@ -61,6 +61,7 @@ export default [ ...@@ -61,6 +61,7 @@ export default [
"intervalType": -18649400.705077305, "intervalType": -18649400.705077305,
"jumpUrl": '', "jumpUrl": '',
"boolShowCompletePop": false, "boolShowCompletePop": false,
"id": 1,
}, },
{ {
"code": "xhqg_{200}", "code": "xhqg_{200}",
...@@ -72,6 +73,7 @@ export default [ ...@@ -72,6 +73,7 @@ export default [
"intervalType": 69737947.09434697, "intervalType": 69737947.09434697,
"jumpUrl": '', "jumpUrl": '',
"boolShowCompletePop": false, "boolShowCompletePop": false,
"id": 2,
}, },
{ {
"code": "xhjf_{300}", "code": "xhjf_{300}",
...@@ -83,6 +85,7 @@ export default [ ...@@ -83,6 +85,7 @@ export default [
"intervalType": 15800400.399293274, "intervalType": 15800400.399293274,
"jumpUrl": '', "jumpUrl": '',
"boolShowCompletePop": false, "boolShowCompletePop": false,
"id": 3,
}, },
{ {
"code": "yqzl", "code": "yqzl",
...@@ -94,6 +97,7 @@ export default [ ...@@ -94,6 +97,7 @@ export default [
"intervalType": -54395962.26549375, "intervalType": -54395962.26549375,
"jumpUrl": '', "jumpUrl": '',
"boolShowCompletePop": false, "boolShowCompletePop": false,
"id": 4,
}, },
{ {
"code": "yqzl_new", "code": "yqzl_new",
...@@ -105,6 +109,7 @@ export default [ ...@@ -105,6 +109,7 @@ export default [
"intervalType": -54395962.26549375, "intervalType": -54395962.26549375,
"jumpUrl": '', "jumpUrl": '',
"boolShowCompletePop": false, "boolShowCompletePop": false,
"id": 5,
}, },
{ {
"code": "scan", "code": "scan",
...@@ -116,6 +121,7 @@ export default [ ...@@ -116,6 +121,7 @@ export default [
"intervalType": -54395962.26549375, "intervalType": -54395962.26549375,
"jumpUrl": '', "jumpUrl": '',
"boolShowCompletePop": false, "boolShowCompletePop": false,
"id": 6,
}, },
{ {
"code": "browse_{x}", "code": "browse_{x}",
...@@ -127,6 +133,7 @@ export default [ ...@@ -127,6 +133,7 @@ export default [
"intervalType": -54395962.26549375, "intervalType": -54395962.26549375,
"jumpUrl": 'https://www.baidu.com/index.html', "jumpUrl": 'https://www.baidu.com/index.html',
"boolShowCompletePop": false, "boolShowCompletePop": false,
"id": 7,
}, },
], ],
"boolNeedChallengeCompletePop": false, "boolNeedChallengeCompletePop": false,
......
src/pages/HomePage/Check/Check.tsx
View file @ e48c1068
...@@ -39,7 +39,8 @@ class Check extends React.Component<any, any> { ...@@ -39,7 +39,8 @@ class Check extends React.Component<any, any> {
} }
// 按钮 // 按钮
handlegofinish = async (type, n, code, title, jumpUrl) => { handlegofinish = async (type, n, code, title, jumpUrl, id) => {
handleLogClick(4, id)
const { jfNum = 0, qgNum = 0 } = store?.baseInfo || {}; const { jfNum = 0, qgNum = 0 } = store?.baseInfo || {};
if (type === "xhqg") { if (type === "xhqg") {
if (n <= qgNum) { if (n <= qgNum) {
...@@ -68,7 +69,7 @@ class Check extends React.Component<any, any> { ...@@ -68,7 +69,7 @@ class Check extends React.Component<any, any> {
handlegosign = _asyncThrottle((hasChallengeDay, resignJf, resignQg, type) => { handlegosign = _asyncThrottle((hasChallengeDay, resignJf, resignQg, type) => {
// if (type === 'task') handleLogClick(5) if (type === 'task') handleLogClick(5)
// else if (type === 'calendar') handleLogClick(6) // else if (type === 'calendar') handleLogClick(6)
ModalCtrl.showModal(Renewmodule, { hasChallengeDay, resignJf, resignQg }); ModalCtrl.showModal(Renewmodule, { hasChallengeDay, resignJf, resignQg });
}); });
...@@ -154,21 +155,23 @@ class Check extends React.Component<any, any> { ...@@ -154,21 +155,23 @@ 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 } = v || {}; const { title, subTitle, icon, code, completedSize, intervalLimitSize, jumpUrl, id } = v || {};
// 获取按钮状态 // 获取按钮状态
const renderActionButton = (code, completedSize, intervalLimitSize) => { const renderActionButton = (code, completedSize, intervalLimitSize) => {
// 先判断是否为续签状态 // 先判断是否为续签状态
if (boolNeedResign) { if (boolNeedResign) {
return <Button className="gosign md5" onClick={() => this.handlegosign(hasChallengeDay, resignJf, resignQg, 'task')} /> handleLogExposure(5)
return <Button className="gosign" onClick={() => this.handlegosign(hasChallengeDay, resignJf, resignQg, 'task')} />
} else if (completedSize < intervalLimitSize) { } else if (completedSize < intervalLimitSize) {
handleLogExposure(4, id)
switch (true) { switch (true) {
// 签到 // 签到
case code.startsWith("sign"): { case code.startsWith("sign"): {
return ( return (
<Button <Button
className="gofinish" className="gofinish"
onClick={() => this.handlegofinish("sign", '', code, title, '')} onClick={() => this.handlegofinish("sign", '', code, title, '', id)}
/> />
); );
} }
...@@ -179,7 +182,7 @@ class Check extends React.Component<any, any> { ...@@ -179,7 +182,7 @@ class Check extends React.Component<any, any> {
return ( return (
<Button <Button
className="gofinish" className="gofinish"
onClick={() => this.handlegofinish("xhqg", n, code, title, '')} onClick={() => this.handlegofinish("xhqg", n, code, title, '', id)}
/> />
); );
} }
...@@ -190,7 +193,7 @@ class Check extends React.Component<any, any> { ...@@ -190,7 +193,7 @@ class Check extends React.Component<any, any> {
return ( return (
<Button <Button
className="gofinish" className="gofinish"
onClick={() => this.handlegofinish("xhjf", n, code, title, '')} onClick={() => this.handlegofinish("xhjf", n, code, title, '', id)}
/> />
); );
} }
...@@ -199,7 +202,7 @@ class Check extends React.Component<any, any> { ...@@ -199,7 +202,7 @@ class Check extends React.Component<any, any> {
return ( return (
<Button <Button
className="gofinish" className="gofinish"
onClick={() => this.handlegofinish("yqzl", '', code, title, '')} onClick={() => this.handlegofinish("yqzl", '', code, title, '', id)}
/> />
) )
} }
...@@ -208,7 +211,7 @@ class Check extends React.Component<any, any> { ...@@ -208,7 +211,7 @@ class Check extends React.Component<any, any> {
return ( return (
<Button <Button
className="gofinish" className="gofinish"
onClick={() => this.handlegofinish("yqzl_new", '', code, title, '')} onClick={() => this.handlegofinish("yqzl_new", '', code, title, '', id)}
/> />
) )
} }
...@@ -219,7 +222,7 @@ class Check extends React.Component<any, any> { ...@@ -219,7 +222,7 @@ class Check extends React.Component<any, any> {
return ( return (
<Button <Button
className="gofinish" className="gofinish"
onClick={() => this.handlegofinish("scan", '', code, title, jumpUrl)} onClick={() => this.handlegofinish("scan", '', code, title, jumpUrl, id)}
/> />
); );
} }
...@@ -228,7 +231,7 @@ class Check extends React.Component<any, any> { ...@@ -228,7 +231,7 @@ class Check extends React.Component<any, any> {
return ( return (
<Button <Button
className="gofinish" className="gofinish"
onClick={() => this.handlegofinish("browse", '', code, title, jumpUrl)} onClick={() => this.handlegofinish("browse", '', code, title, jumpUrl, id)}
/> />
); );
} }
......
src/store/store.ts
View file @ e48c1068
...@@ -171,6 +171,7 @@ class Store { ...@@ -171,6 +171,7 @@ class Store {
resignQg: number; resignQg: number;
}>; }>;
taskInfoList?: Array<{ taskInfoList?: Array<{
id: string | number;
code: string; code: string;
icon: string; icon: string;
subTitle: string; subTitle: string;
......
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