From b0c828aba9b5b9f1a8a9a887cd0994f497f73f16 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Tue, 14 Jan 2025 11:20:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E3=80=81=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/login/login.js | 10 +++++----- http/http.js | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/login/login.js b/api/login/login.js index 3c54372..fe02c70 100644 --- a/api/login/login.js +++ b/api/login/login.js @@ -5,9 +5,9 @@ import http from '@/http/http.js' */ export const login = (data) => { return http.request({ - url: '/Login/registerCode', + url: '/Login', method: 'POST', - params: data + data: data }) } @@ -23,11 +23,11 @@ export const setSendMsg = (mobile,type) => { /** * 注册 */ -export const register = (params) => { +export const register = (data) => { return http.request({ - url: '/Login/registerCode', + url: '/Login/register', method: 'POST', - params: params + data: data }) } diff --git a/http/http.js b/http/http.js index 72572f4..201fd1a 100644 --- a/http/http.js +++ b/http/http.js @@ -107,13 +107,13 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) { .catch((res) => { if (res.status == 404) { - infoBox.showErrorToast("接口404").then(() => {}); + infoBox.showToast("接口404").then(() => {}); reject(); return; } if (res.code == 401) { - infoBox.showErrorToast(res.message || "请登录").then(() => { + infoBox.showToast(res.message || "请登录").then(() => { uni.redirectTo({ url: "/pages/login/login", }); @@ -121,18 +121,18 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) { }); } if (res.code != 0) { - infoBox.showErrorToast(res.msg).then(() => {}); + infoBox.showToast(res.msg).then(() => {}); reject(); } if (res.code == 500) { - infoBox.showErrorToast(res.msg || "服务器异常").then(() => {}); + infoBox.showToast(res.msg || "服务器异常").then(() => {}); reject(); } reqFinishFunc(); // 请求完毕的动作 // 如果没有提示错误， 那么此处提示 异常。 if (!isShowErrorToast) { - infoBox.showErrorToast(`请求网络异常`); + infoBox.showToast(`请求网络异常`); } return Promise.reject(res); @@ -233,7 +233,7 @@ function upload(uri, data, file, showLoading = true, extParams = {}) { }) .catch((err) => { uni.hideLoading(); - infoBox.showErrorToast(`上传失败`); + infoBox.showToast(`上传失败`); }); }); } From 041b04bc828d794e2f540300bad6470d0e835d8c Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Tue, 14 Jan 2025 11:28:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/task/index.vue | 83 ++++++++++++++++++++++++++++++++------------ 1 file changed, 60 insertions(+), 23 deletions(-) diff --git a/pages/task/index.vue b/pages/task/index.vue index 6fca8ff..72abbe6 100644 --- a/pages/task/index.vue +++ b/pages/task/index.vue @@ -60,11 +60,12 @@ - + + + + + @@ -73,6 +74,7 @@ import { useCommonStore } from '@/store/common.js' const $common = useCommonStore() + import { selectUserMoney, selectPayDetails, canCash, state, withdraw } from '@/api/me/withdraw.js'; import { reactive, getCurrentInstance, @@ -80,6 +82,7 @@ import { } from "vue"; import { onShow, + onReady, onReachBottom } from '@dcloudio/uni-app' import { @@ -95,9 +98,11 @@ import { // ios审核 isExamine: $common.isExamine, urlCallback: {}, - adRewardedVideo: true, + adRewardedShow: true, + adRewardedVideoloadNum: 0, }) + const adRewarded = ref(null); onShow(() => { getTaskdata() getsignIn() @@ -106,24 +111,59 @@ import { // currentInstance.ctx.$refs.adRewardedVideo.load(); // }) }) - //广告播放成功回调 + onReady(() => { + nextTick(()=>{ + data.adRewardedVideoloadNum = 0 + adRewarded.value.load(); + }) + getCanCash() + }) + /** + * 获取看广告状态 + */ + async function getCanCash() { + canCash().then(res => { + data.isWithdraw = !res; + }) + + } + + /** + * 广告加载失败回调 + * @param {Object} e + */ + function onaderror(e) { + if ( data.adRewardedVideoloadNum >=3 ) { + data.adRewardedShow = false; + return + } + data.adRewardedVideoloadNum++ + setTimeout(() => { + adRewarded.value.load(); + }, 1000); // 10 + console.log("广告加载失败") + } + + /** + * 广告数据加载成功回调 + * @param {Object} e + */ + function onadload(e) { + data.adRewardedShow = true; + console.log('广告数据加载成功'); + } + /** + * 广告播放成功回调 + * @param {Object} e + */ async function onadclose(e) { const detail = e.detail if (detail && detail.isEnded) { // 正常播放结束 - // /sqx_fast/app/ad/state - let res = await this.$Request.getT('app/ad/state', { - extraKey: this.urlCallback.extra - }) - this.$Request.getT('/app/common/type/921').then(res => { - if (res.code == 0) { - console.log(res) - uni.showToast({ - title: '获得' + res.data.value + '分钟免费时长', - icon: 'none' - }) - } + let res = await state({ + extraKey: data.urlCallback.extra }) + getCanCash() } else { // 播放中途退出 } @@ -169,7 +209,7 @@ import { userId: uni.getStorageSync('userId'), extra: uni.getStorageSync('userId') + "" + new Date().getTime(), } - currentInstance.ctx.$refs.adRewardedVideo.show(); + adRewarded.value.show(); } else { uni.switchTab({ url: "/pages/index/index" @@ -202,9 +242,6 @@ import { } - function onadload(e) { - datas.adRewardedVideo = true; - } // 获得签到 async function getsignIn() { let res = await getUserSignData() From 4f11dc4e0682ef38568b1c8581f3127c1273c99d Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Tue, 14 Jan 2025 11:36:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E3=80=81=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/login/forgetPwd.vue | 4 ++-- pages/login/register.vue | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pages/login/forgetPwd.vue b/pages/login/forgetPwd.vue index e0f2e11..11f9710 100644 --- a/pages/login/forgetPwd.vue +++ b/pages/login/forgetPwd.vue @@ -96,9 +96,9 @@ data.sending = false; data.sendTime = '获取验证码'; } else { - data.count = count - 1; + data.count = data.count - 1; data.sending = true; - data.sendTime = count - 1 + '秒后重新获取'; + data.sendTime = data.count - 1 + '秒后重新获取'; setTimeout(countDown.bind(this), 1000); } } diff --git a/pages/login/register.vue b/pages/login/register.vue index 614f98c..621940c 100644 --- a/pages/login/register.vue +++ b/pages/login/register.vue @@ -122,14 +122,15 @@ * 验证码倒计时 */ function countDown() { + console.log(data.count) if (data.count === 1) { data.count = 60; data.sending = false; data.sendTime = '获取验证码'; } else { - data.count = count - 1; + data.count = data.count - 1; data.sending = true; - data.sendTime = count - 1 + '秒后重新获取'; + data.sendTime = data.count - 1 + '秒后重新获取'; setTimeout(countDown.bind(this), 1000); } }