Skip to content

K
kww_dayDayGetCredits_250512
Commit 1e075a4c authored by 徐士卿's avatar 徐士卿
Browse files
Options

dabao

parent d175d4c4
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 94 deletions
dist/index.html
View file @ 1e075a4c
<!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/1747639085084/assets/index-D8h8yOhx.js"></script> <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747646741670/assets/index-CJ2la97Q.js"></script>
<link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747639085084/assets/vendor-DdwO98ss.js"> <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747646741670/assets/vendor-CqVmyQtN.js">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747639085084/assets/vendor-BQh5NVNk.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747646741670/assets/vendor-BQh5NVNk.css">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747639085084/assets/index-CPIZp9tn.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747646741670/assets/index-C3XGu9T-.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/1747639085084/assets/polyfills-legacy-arANKBzQ.js"></script> <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1747646741670/assets/polyfills-legacy-arANKBzQ.js"></script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1747639085084/assets/index-legacy-S8o1xsgX.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/1747646741670/assets/index-legacy-b-kOZsnL.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 @ 1e075a4c
...@@ -8,14 +8,15 @@ export default [ ...@@ -8,14 +8,15 @@ export default [
"success": true, "success": true,
"message": "dolor reprehenderit ex culpa veniam", "message": "dolor reprehenderit ex culpa veniam",
"data": { "data": {
"choosedChallengeId": "2", "choosedChallengeId": "1",
"challengeStartTime": 27404105.225178465, "challengeStartTime": 27404105.225178465,
"challengeEndTime": -87229323.37597737, "challengeEndTime": -87229323.37597737,
"boolShowFailPop": false, "boolShowFailPop": false,
"challengeSuccessPopInfo": { "challengeSuccessPopInfo": null,
"prizeName": "30天的奖励", // {
"prizeImg": "//yun.duiba.com.cn/polaris/045CCBB8-F6C7-43DB-9F81-45F52430A878.441c8f13daf61c48b85fe383e764d9089f1d4a66.png" // "prizeName": "30天的奖励",
}, // "prizeImg": "//yun.duiba.com.cn/polaris/045CCBB8-F6C7-43DB-9F81-45F52430A878.441c8f13daf61c48b85fe383e764d9089f1d4a66.png",
// },
"challengeConfigList": [ "challengeConfigList": [
{ {
"challengeId": "1", "challengeId": "1",
...@@ -50,8 +51,8 @@ export default [ ...@@ -50,8 +51,8 @@ export default [
"resignQg": 999, "resignQg": 999,
} }
], ],
"hasChallengeDay": 60, "hasChallengeDay": 23,
"boolNeedResign": false, "boolNeedResign": true,
"boolNeedResignPop": false, "boolNeedResignPop": false,
"taskInfoList": [ "taskInfoList": [
{ {
......
src/components/choice_challenge/choice_challenge.jsx
View file @ 1e075a4c
...@@ -31,10 +31,9 @@ class Choice_challenge extends React.Component { ...@@ -31,10 +31,9 @@ class Choice_challenge extends React.Component {
}); });
console.log(id); console.log(id);
if (success) { if (success) {
store.getTaskInfo();
ModalCtrl.closeModal(); ModalCtrl.closeModal();
store.getTaskInfo();
} }
store.getTaskInfo()
}; };
// handleclose = () => { // handleclose = () => {
......
src/components/consume_credits/consume_credits.jsx
View file @ 1e075a4c
...@@ -23,7 +23,7 @@ class Consume_credits extends React.Component { ...@@ -23,7 +23,7 @@ class Consume_credits extends React.Component {
await pre_reduce_score( await pre_reduce_score(
{ {
toPlaywayId: "challenge", toPlaywayId: "challenge",
toActionId: "taskComplet", toActionId: "taskComplete",
desc: "taskComplete_credits_desc", desc: "taskComplete_credits_desc",
credits: n, credits: n,
}, },
...@@ -35,9 +35,9 @@ class Consume_credits extends React.Component { ...@@ -35,9 +35,9 @@ class Consume_credits extends React.Component {
if (success) { if (success) {
ModalCtrl.closeModal(); ModalCtrl.closeModal();
} }
store.getTaskInfo()
} }
); );
store.getTaskInfo()
}; };
handleclose = () => { handleclose = () => {
......
src/components/consume_qg/consume_qg.jsx
View file @ 1e075a4c
...@@ -40,7 +40,7 @@ class Consume_qg extends React.Component { ...@@ -40,7 +40,7 @@ class Consume_qg extends React.Component {
<span className="tip1">消耗{n}青果</span> <span className="tip1">消耗{n}青果</span>
<span className="tip2">完成打卡</span> <span className="tip2">完成打卡</span>
<Button className="close" onClick={this.handleclose} /> <Button className="close" onClick={this.handleclose} />
<Button className="clock" onClick={this.handleclock} /> <Button className="clock" onClick={() => this.handleclock(code)} />
<span className="icon"></span> <span className="icon"></span>
<span className="ditu"></span> <span className="ditu"></span>
</div> </div>
......
src/components/renewmodule/renewmodule.jsx
View file @ 1e075a4c
...@@ -33,10 +33,9 @@ class Renewmodule extends React.Component { ...@@ -33,10 +33,9 @@ class Renewmodule extends React.Component {
}; };
handleUse = async (activeChoice, inferQg, inferJf, resignJf) => { handleUse = async (activeChoice, inferQg, inferJf, resignJf) => {
handleLogClick(18) handleLogClick(18);
if (activeChoice === "credits") { if (activeChoice === "credits") {
// 执行积分续签逻辑 todo // 执行积分续签逻辑 todo
ModalCtrl.closeModal();
if (!inferJf) return Toast.show("积分不足"); if (!inferJf) return Toast.show("积分不足");
await pre_reduce_score( await pre_reduce_score(
{ {
...@@ -54,23 +53,23 @@ class Renewmodule extends React.Component { ...@@ -54,23 +53,23 @@ class Renewmodule extends React.Component {
ModalCtrl.closeModal(); ModalCtrl.closeModal();
ModalCtrl.showModal(Finish_resign); ModalCtrl.showModal(Finish_resign);
} }
store.getTaskInfo();
} }
); );
} else { } else {
// 执行青果续签逻辑 todo // 执行青果续签逻辑 todo
ModalCtrl.closeModal();
if (!inferQg) return Toast.show("青果不足"); if (!inferQg) return Toast.show("青果不足");
const { success } = await API.getChallengeResign({ costType: 1 }); const { success } = await API.getChallengeResign({ costType: 1 });
if (success) { if (success) {
ModalCtrl.closeModal(); ModalCtrl.closeModal();
ModalCtrl.showModal(Finish_resign); ModalCtrl.showModal(Finish_resign);
} }
store.getTaskInfo();
} }
store.getTaskInfo();
}; };
render() { render() {
handleLogExposure(18) handleLogExposure(18);
const { activeChoice } = this.state; const { activeChoice } = this.state;
const { hasChallengeDay, resignJf, resignQg } = this.props; const { hasChallengeDay, resignJf, resignQg } = this.props;
const { jfNum, qgNum } = store?.baseInfo || {}; const { jfNum, qgNum } = store?.baseInfo || {};
......
src/pages/HomePage/Check/Check.less
View file @ 1e075a4c
...@@ -315,6 +315,15 @@ ...@@ -315,6 +315,15 @@
.webpBg("HomePage/sampleBg.png"); .webpBg("HomePage/sampleBg.png");
} }
.duigou {
position: absolute;
top: 48px;
width: 19px;
height: 15px;
.webpBg("HomePage/duigou.png");
}
.renew { .renew {
position: absolute; position: absolute;
width: 67px; width: 67px;
......
src/pages/HomePage/Check/Check.tsx
View file @ 1e075a4c
...@@ -46,18 +46,18 @@ class Check extends React.Component<any, any> { ...@@ -46,18 +46,18 @@ class Check extends React.Component<any, any> {
if (n <= qgNum) { if (n <= qgNum) {
ModalCtrl.showModal(Consume_qg, { n, code, title }); ModalCtrl.showModal(Consume_qg, { n, code, title });
} else { } else {
Toast.show("很抱歉，您的青果不足"); Toast.show("青果不足！");
} }
} else if (type === "xhjf") { } else if (type === "xhjf") {
if (n <= jfNum) { if (n <= jfNum) {
ModalCtrl.showModal(Consume_credits, { n, code, title }); ModalCtrl.showModal(Consume_credits, { n, code, title });
} else { } else {
Toast.show("很抱歉，您的积分不足"); Toast.show("积分不足！");
} }
} else if (type === "yqzl" || type === "yqzl_new") { } else if (type === "yqzl" || type === "yqzl_new") {
store.doInvite(code) store.doInvite(code)
} else if (type === "scan") { } else if (type === "scan") {
await API.getChallenegeComplete({ taskCode: code }); // await API.getChallenegeComplete({ taskCode: code });
wx.miniProgram.switchTab({ url: jumpUrl }); wx.miniProgram.switchTab({ url: jumpUrl });
} else if (type === "browse") { } else if (type === "browse") {
await API.getChallenegeComplete({ taskCode: code }); await API.getChallenegeComplete({ taskCode: code });
...@@ -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,7 @@ class Check extends React.Component<any, any> { ...@@ -250,7 +250,7 @@ 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}</span> <span className="item-title">{title}(completedSize / intervalLimitSize) </span>
<span className="item-tip">{subTitle}</span> <span className="item-tip">{subTitle}</span>
</div> </div>
{renderActionButton(code, completedSize, intervalLimitSize)} {renderActionButton(code, completedSize, intervalLimitSize)}
...@@ -271,8 +271,11 @@ class Check extends React.Component<any, any> { ...@@ -271,8 +271,11 @@ class Check extends React.Component<any, any> {
className={`sample ${dayIndex === challengeTotalDay - 1 ? 'new-style' : ''}`} className={`sample ${dayIndex === challengeTotalDay - 1 ? 'new-style' : ''}`}
key={dayIndex} key={dayIndex}
> >
{dayIndex < hasChallengeDay - 1 && ( {dayIndex <= hasChallengeDay - 1 && challengeTotalDay !== dayIndex + 1 && (
<span className="done"></span> <>
<span className="done"></span>
<span className="duigou"></span>
</>
)} )}
{boolNeedResign && dayIndex === hasChallengeDay && ( {boolNeedResign && dayIndex === hasChallengeDay && (
<Button className="renew md6" onClick={() => this.handlegosign(hasChallengeDay, resignJf, resignQg, 'calendar')} /> <Button className="renew md6" onClick={() => this.handlegosign(hasChallengeDay, resignJf, resignQg, 'calendar')} />
......
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