diff --git a/commons/config.js b/commons/config.js index bf78f27..e11ef6d 100644 --- a/commons/config.js +++ b/commons/config.js @@ -1,6 +1,6 @@ //打包时修改env的值即可 -const env='production' //test , production,local +const env='test' //test , production,local export const encryptKey='1234567890123456' // http数据加解密的key diff --git a/pages/task/index.vue b/pages/task/index.vue index 5e6e413..92fe011 100644 --- a/pages/task/index.vue +++ b/pages/task/index.vue @@ -231,7 +231,7 @@ extra: uni.getStorageSync('userInfo').userId + "" + new Date().getTime(), } datas.adRewardedVideoloadNum = 0 - + adRewarded.value.load(); }) }) @@ -295,123 +295,122 @@ // 播放中途退出 } } - async function goNav(item, url) { - console.log(item, url, '调试111') + async function goNav(item) { + console.log(item, '请求参数') // jumpType (integer, optional): 跳转类型 1 内部路径 2 外部路径 , // type (integer, optional): 任务类型 1 普通任务 2 打卡任务 9 其它 , - if (url) { - let urls = '' - if (url == '/pages/task/prizeList') { - urls = url + '?source=2' - } - if (url == '/pages/task/receiveMember') { - urls = url + `?standard=${item.discNumber == null ? true : false}&taskId=${item.id}` - } - uni.navigateTo({ - url: urls - }) - } else { - console.log(item, '林区') - if (item.jumpType == 0) { - if (item.buttonTitle.indexOf("领取") != -1) { - let res = await taskReceive({ - id: item.id + // if (url) { + // let urls = '' + // if (url == '/pages/task/prizeList') { + // urls = url + '?source=2' + // } + // if (url == '/pages/task/receiveMember') { + // urls = url + `?standard=${item.discNumber == null ? true : false}&taskId=${item.id}` + // } + // uni.navigateTo({ + // url: urls + // }) + // } else { + + // } + if (item.jumpType == 0) { + if (item.buttonTitle.indexOf("领取") != -1) { + let res = await taskReceive({ + id: item.id + }) + if (res.code == 0) { + uni.showToast({ + title: res.id == 15 ? '签到成功' : '领取成功', + icon: 'none' }) - if (res.code == 0) { - uni.showToast({ - title: res.id == 15 ? '签到成功' : '领取成功', - icon: 'none' - }) - setTimeout(() => { - getTaskdata() - getsignIn() - }, 1000) - } else { - uni.showToast({ - title: res.msg, - icon: 'none' - }) - } - } else if (item.title.indexOf("新人福利") != -1) { - let res = await taskReceive({ - id: item.id + setTimeout(() => { + getTaskdata() + getsignIn() + }, 1000) + } else { + uni.showToast({ + title: res.msg, + icon: 'none' }) - if (res.code == 0) { - uni.showToast({ - title: res.id == 15 ? '签到成功' : '领取成功', - icon: 'none' - }) - setTimeout(() => { - getTaskdata() - getsignIn() - }, 1000) - } else { - uni.switchTab({ - url: '/pages/index/index' - }) - } - } else if (item.buttonTitle.indexOf("观看视频") != -1) { - // 首次加载广告 - if (!datas.adRewardedShow) { - uni.showToast({ - icon: 'none', - title: '广告加载失败,请稍后重试' - }); - return - } - - console.log(datas.urlCallback) - adRewarded.value.show(); + } + } else if (item.title.indexOf("新人福利") != -1) { + 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.switchTab({ - url: "/pages/index/index" + url: '/pages/index/index' }) } - } else if (item.jumpType == 1) { - let buttonUrl = item.buttonUrl - if (item.title && item.title.indexOf('每周打卡奖励') != -1) { - buttonUrl = item.buttonUrl + '?source=2' - - + } else if (item.buttonTitle.indexOf("观看视频") != -1) { + // 首次加载广告 + if (!datas.adRewardedShow) { + uni.showToast({ + icon: 'none', + title: '广告加载失败,请稍后重试' + }); + return } - if (item.title && item.title.indexOf('每月打卡奖励1') != -1) { - buttonUrl = item.buttonUrl + '?source=3' - } - if (item.title && item.title.indexOf('每月打卡奖励2') != -1) { - // 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) { + console.log(datas.urlCallback) + adRewarded.value.show(); + } else { uni.switchTab({ - url: item.buttonUrl + url: "/pages/index/index" }) } - } + } else if (item.jumpType == 1) { + let buttonUrl = item.buttonUrl + if (item.title && item.title.indexOf('每周打卡奖励') != -1) { + buttonUrl = item.buttonUrl + '?source=2' + + } + if (item.title && item.title.indexOf('每月打卡奖励1') != -1) { + buttonUrl = item.buttonUrl + '?source=3' + } + if (item.title && item.title.indexOf('每月打卡奖励2') != -1) { + + // 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({ + url: item.buttonUrl + }) + } } // 获得签到 @@ -444,10 +443,11 @@