diff --git a/pages/login/register.vue b/pages/login/register.vue index 621940c..6f48436 100644 --- a/pages/login/register.vue +++ b/pages/login/register.vue @@ -244,17 +244,10 @@ platform: platform, qdCode: qdCodeion, }) - if (res.code === 0) { uni.setStorageSync('token', res.token) - uni.setStorageSync('userId', res.user.userId) - uni.setStorageSync('phone', res.user.phone) - uni.setStorageSync('invitationCode', res.user.invitationCode) - //设置渠道码 - if (res.user.qdCod) { - uni.setStorageSync('qdCod', res.user.qdCod) - } - + uni.setStorageSync('userInfo', res.user) + uni.showToast({ title: '注册成功', icon: 'none' diff --git a/pages/me/gold_record.vue b/pages/me/gold_record.vue index dba0694..5d25343 100644 --- a/pages/me/gold_record.vue +++ b/pages/me/gold_record.vue @@ -5,7 +5,10 @@ 类型:{{ item.title }} 内容:{{ item.content }} 时间:{{ item.createTime }} - +{{ item.money }} + + +{{ item.money }} + -{{ item.money }} + @@ -25,6 +28,11 @@ const listData = reactive({ status: 'loading' }); +onReachBottom(() => { + listData.page++; + getList(); +}); + async function getList() { try { const res = await queryUserMoneyDetails({ @@ -83,8 +91,13 @@ page { .btm { display: flex; justify-content: flex-end; - color: rgb(253, 100, 22); font-weight: bold; + .add { + color: rgb(253, 100, 22); + } + .sub { + color: #5aaf2e; + } } } } diff --git a/pages/me/withdraw/index.vue b/pages/me/withdraw/index.vue index 827f029..dac6b4f 100644 --- a/pages/me/withdraw/index.vue +++ b/pages/me/withdraw/index.vue @@ -83,7 +83,7 @@ - @@ -113,7 +113,7 @@ cashMoney: 0, urlCallback: {}, adpid: null, - adRewardedShow: true, + adRewardedShow: false, adRewardedVideoloadNum: 0, isWithdraw: false, userInfo: null, @@ -121,14 +121,14 @@ ruleList: [] }) - const adRewarded = ref(null); + const adRewardedw = ref(null); onLoad(() => { - if ( uni.getSystemInfoSync().platform == 'android' ) { - data.adpid = 1531580352 - } - if ( uni.getSystemInfoSync().platform == 'ios' ) { + // if ( uni.getSystemInfoSync().platform == 'android' ) { + // data.adpid = 1531580352 + // } + // if ( uni.getSystemInfoSync().platform == 'ios' ) { data.adpid = 1373604770 - } + // } getExtractFei(); getMoneyDetail(); @@ -145,7 +145,7 @@ onReady(() => { nextTick(()=>{ data.adRewardedVideoloadNum = 0 - adRewarded.value.load(); + adRewardedw.value.load(); }) getCanCash() }) @@ -227,14 +227,13 @@ */ function onaderror(e) { if ( data.adRewardedVideoloadNum >=3 ) { - data.adRewardedShow = false; return } data.adRewardedVideoloadNum++ setTimeout(() => { - adRewarded.value.load(); + adRewardedw.value.load(); }, 1000); // 10 - console.log("广告加载失败") + console.log("广告加载失败",e) } /** @@ -263,13 +262,19 @@ * 提现触发 */ function goWithdraw() { - if ( !data.isWithdraw ) { + if(!data.adRewardedShow){ + uni.showToast({ + icon: 'none', + title: '广告加载失败,请稍后重试' + }); + return + } data.urlCallback = { userId: uni.getStorageSync('userInfo').userId, extra: 'cash:'+uni.getStorageSync('userInfo').userId + "" + new Date().getTime(), } - adRewarded.value.show(); + adRewardedw.value.show(); } else { getOut() } diff --git a/pages/task/index.vue b/pages/task/index.vue index f657839..9d3f685 100644 --- a/pages/task/index.vue +++ b/pages/task/index.vue @@ -62,7 +62,7 @@ - @@ -104,20 +104,19 @@ list: [], urlCallback: {}, adpid: null, - adRewardedShow: true, + adRewardedShow: false, adRewardedVideoloadNum: 0, }) const adRewarded = ref(null); onShow(() => { - // 判断ios是否审核 $common.init() - if (uni.getSystemInfoSync().platform == 'android') { - datas.adpid = 1531580352 - } - if (uni.getSystemInfoSync().platform == 'ios') { + // if ( uni.getSystemInfoSync().platform == 'android' ) { + // datas.adpid = 1531580352 + // } + // if ( uni.getSystemInfoSync().platform == 'ios' ) { datas.adpid = 1373604770 - } + // } if (uni.getStorageSync("token")) { getTaskdata() getsignIn() @@ -249,7 +248,6 @@ */ function onaderror(e) { if (datas.adRewardedVideoloadNum >= 3) { - datas.adRewardedShow = false; return } datas.adRewardedVideoloadNum++ @@ -318,6 +316,13 @@ } } else if (item.buttonTitle.indexOf("观看视频") != -1) { // 首次加载广告 + if(!datas.adRewardedShow){ + uni.showToast({ + icon: 'none', + title: '广告加载失败,请稍后重试' + }); + return + } datas.urlCallback = { userId: uni.getStorageSync('userId'), extra: uni.getStorageSync('userId') + "" + new Date().getTime(),