moliparty/moliparty-h5
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复签到bug

Browse Source
This commit is contained in:
dragon
2024-04-26 19:26:42 +08:00
parent da180fef1c
commit 3984328459
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
view/molistar/activity/2024-loginGift/js/index.js
View File

@@ -72,16 +72,30 @@ function getTask() {
$(`.box1 .signInIcon${i + 1}`).removeClass('signInIconActive');
}
}
// 處理是否能簽到
if (res.timestamp >= val.startTime && res.timestamp <= val.endTime) {
});
for (let index = 0; index < res.data[0].children.length; index++) {
if (res.timestamp >= res.data[0].children[index].startTime && res.timestamp <= res.data[0].children[index].endTime) {
$('.box1 .butBox .but2').attr('click', '1');
$('.box1 .butBox .but2').attr('src', './images/signIn.png');
hideLoading(layerIndex)
return
} else {
$('.box1 .butBox .but2').attr('click', '0');
$('.box1 .butBox .but2').attr('src', './images/notSignIn.png');
}
}
// res.data[0].children.forEach((val, i) => {
// if (res.timestamp >= val.startTime && res.timestamp <= val.endTime) {
// $('.box1 .butBox .but2').attr('click', '1');
// $('.box1 .butBox .but2').attr('src', './images/signIn.png');
// return
// } else {
// $('.box1 .butBox .but2').attr('click', '0');
// $('.box1 .butBox .but2').attr('src', './images/notSignIn.png');
// }
});
// });
} else {
toastMsg(res.message)
}

8
view/molistar/common/js/common2.js
View File

@@ -736,9 +736,9 @@ function getInfoFromClient() {
} else {
// 非app环境调试参数
pubInfo.uid = sessionStorage.getItem("uid") ? sessionStorage.getItem("uid") : '2283';
pubInfo.ticket = sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0aWNrZXRfdHlwZSI6bnVsbCwidWlkIjoyMjgzLCJ0aWNrZXRfaWQiOiJiYmNlYmQ2MS1jNTg1LTQ1MjgtODI3Ny0zNjZiYTdiODQ0YzAiLCJleHAiOjM2MDAsImNsaWVudF9pZCI6ImVyYmFuLWNsaWVudCJ9.qYkMV5XUoU4ySrdDm9GdYXho2ZmUk4nTwjc9KvWVeXE';
// pubInfo.h5_token = sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : '';
pubInfo.uid = sessionStorage.getItem("uid") ? sessionStorage.getItem("uid") : '';
pubInfo.ticket = sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : '';
pubInfo.h5_token = sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : '';
pubInfo.deviceId = "0";
pubInfo.deviceInfo = {
app: 'molistarApp',
@@ -1064,7 +1064,7 @@ function networkRequest(reqObj = {}, type) {
pubHeader.client = 'h5'
pubHeader.pub_uid = window.location.pathname.match(/login.html/) ? 0 : pubInfo.uid
pubHeader['Accept-Language'] = pubInfo['Accept-Language']
if (true) {//browser.app
if (browser.app) {//true
pubHeader.pub_ticket = pubInfo.ticket
} else {
pubHeader.h5_token = sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : '';