diff --git a/pages/task/index.vue b/pages/task/index.vue index 40c6a2d..844300b 100644 --- a/pages/task/index.vue +++ b/pages/task/index.vue @@ -21,7 +21,7 @@ {{ item.status == 1 ? '已签到' : '待签到' }} - + {{ item.signDay.substr(5, 8) }} @@ -295,12 +295,12 @@ url: urls }) } else { + console.log(item, '林区') if (item.jumpType == 0) { if (item.buttonTitle.indexOf("领取") != -1) { let res = await taskReceive({ id: item.id }) - console.log(res,'调试') if (res.code == 0) { uni.showToast({ title: res.id == 15 ? '签到成功' : '领取成功', @@ -355,21 +355,45 @@ } } else if (item.jumpType == 1) { let buttonUrl = item.buttonUrl - console.log(buttonUrl, 'debug') if (item.title && item.title.indexOf('每周打卡奖励') != -1) { buttonUrl = item.buttonUrl + '?source=2' + + uni.navigateTo({ + url: buttonUrl + }) } if (item.title && item.title.indexOf('每月打卡奖励1') != -1) { buttonUrl = item.buttonUrl + '?source=3' + + uni.navigateTo({ + url: buttonUrl + }) } if (item.title && item.title.indexOf('每月打卡奖励2') != -1) { - buttonUrl = - `${item.buttonUrl}?standard=${item.discNumber == null ? true : false}&taskId=${item.id}` + + let res = await taskReceive({ + id: item.id + }) + if (res.code == 0) { + uni.showToast({ + title: res.id == 15 ? '签到成功' : '领取成功', + icon: 'none' + }) + setTimeout(() => { + getTaskdata() + getsignIn() + }, 1000) + } else { + uni.showToast({ + title: res.msg, + icon: 'none' + }) + } + + // buttonUrl = + // `${item.buttonUrl}?standard=${item.discNumber == null ? true : false}&taskId=${item.id}` } - uni.navigateTo({ - url: buttonUrl - }) } else if (item.jumpType == 3) { uni.switchTab({