From a6fe827135a8468ff04e218cd152aaea5349ecc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com> Date: Fri, 8 Oct 2021 17:32:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=BC=80=E6=B3=A8=E9=87=8A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=BC=80=E5=B1=8F=E5=B9=BF=E5=91=8A=EF=BC=9B?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=93=81=E7=89=8C=EF=BC=9B=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=8E=B7=E5=8F=96=E9=AA=8C=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index/index.vue | 14 +++++++------- pages/order/pointconfirm/confirm.vue | 4 +++- pages/point/exchangeRecord/exchangeRecord.vue | 2 +- pages/user/loginType/loginType.vue | 4 ++-- pages/user/my/newPhone.vue | 15 +++++++++++---- pages/user/my/setPassword.vue | 16 +++++++++++++--- pages/user/my/verificationPhone.vue | 16 +++++++++++++--- 7 files changed, 50 insertions(+), 21 deletions(-) diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue index 822ab76..67eac28 100644 --- a/pages/index/index/index.vue +++ b/pages/index/index/index.vue @@ -212,13 +212,13 @@ // 生命周期 onLoad(e) { // 进入开屏广告页 - // if(app.globalData.app_first_full){ - // getApp().globalData.app_first_full = false; - // this.$url('/pages/index/openScreenAd/openScreenAd', {type: 'launch'}); - // }else if(app.globalData.app_first_alert){ - // getApp().globalData.app_first_alert = false; - // this.getAlertAd(); - // } + if(app.globalData.app_first_full){ + getApp().globalData.app_first_full = false; + this.$url('/pages/index/openScreenAd/openScreenAd', {type: 'launch'}); + }else if(app.globalData.app_first_alert){ + getApp().globalData.app_first_alert = false; + this.getAlertAd(); + } // 第三方平台配置颜色 var gbConfig = this.$cookieStorage.get('globalConfig') || ''; diff --git a/pages/order/pointconfirm/confirm.vue b/pages/order/pointconfirm/confirm.vue index ab2ca55..4851d18 100644 --- a/pages/order/pointconfirm/confirm.vue +++ b/pages/order/pointconfirm/confirm.vue @@ -229,7 +229,9 @@ this.address = res.data.data.address; uni.hideLoading() }else{ - this.$msg('订单提交失败!', {icon: 'error'}) + this.$msg(res.data.message || '订单提交失败!').then(() => { + this.$toBack(); + }); } }).catch(err => uni.hideLoading()) }, diff --git a/pages/point/exchangeRecord/exchangeRecord.vue b/pages/point/exchangeRecord/exchangeRecord.vue index e70a5d8..ec1f386 100644 --- a/pages/point/exchangeRecord/exchangeRecord.vue +++ b/pages/point/exchangeRecord/exchangeRecord.vue @@ -10,7 +10,7 @@ - {{item.from}} + {{item.brand.name}} diff --git a/pages/user/loginType/loginType.vue b/pages/user/loginType/loginType.vue index fcd64fc..09507ea 100644 --- a/pages/user/loginType/loginType.vue +++ b/pages/user/loginType/loginType.vue @@ -43,7 +43,7 @@ code: '', is_code: false, timer: null, - num: 10 + num: 60 } }, onLoad(){ @@ -70,7 +70,7 @@ if(this.num <= 0){ clearInterval(this.timer); this.timer = null; - this.num = 10; + this.num = 60; this.is_code = false; } }, 1000); diff --git a/pages/user/my/newPhone.vue b/pages/user/my/newPhone.vue index 2acfba7..b87b3f8 100644 --- a/pages/user/my/newPhone.vue +++ b/pages/user/my/newPhone.vue @@ -33,7 +33,7 @@ code: '', is_code: false, timer: null, - num: 10, + num: 60, token: '' } }, @@ -64,7 +64,7 @@ if(this.num <= 0){ clearInterval(this.timer); this.timer = null; - this.num = 10; + this.num = 60; this.is_code = false; } }, 1000); @@ -80,9 +80,16 @@ Authorization: this.token } }).then(res => { - console.log("-------", res); - if(res.data.code == 200){ + if(res.data.success){ this.$msg(res.data.message, {icon: 'success'}); + }else{ + this.$msg(res.data.message); + if(this.timer){ + clearInterval(this.timer); + this.timer = null; + this.num = 60; + this.is_code = false; + } } }) }, diff --git a/pages/user/my/setPassword.vue b/pages/user/my/setPassword.vue index c1ce413..8fd6bd1 100644 --- a/pages/user/my/setPassword.vue +++ b/pages/user/my/setPassword.vue @@ -37,7 +37,7 @@ code: '', is_code: false, timer: null, - num: 10, + num: 60, show_pay: false, show_again_pay: false, token: '', @@ -72,7 +72,7 @@ if(this.num <= 0){ clearInterval(this.timer); this.timer = null; - this.num = 10; + this.num = 60; this.is_code = false; } }, 1000); @@ -88,7 +88,17 @@ Authorization: this.token } }).then(res => { - this.$msg(res.data.message, {icon: 'success'}); + if(res.data.success){ + this.$msg(res.data.message, {icon: 'success'}); + }else{ + this.$msg(res.data.message); + if(this.timer){ + clearInterval(this.timer); + this.timer = null; + this.num = 60; + this.is_code = false; + } + } }) }, // 下一步 diff --git a/pages/user/my/verificationPhone.vue b/pages/user/my/verificationPhone.vue index 6e66689..807ce56 100644 --- a/pages/user/my/verificationPhone.vue +++ b/pages/user/my/verificationPhone.vue @@ -33,7 +33,7 @@ code: '', is_code: false, timer: null, - num: 10, + num: 60, token: '' } }, @@ -64,7 +64,7 @@ if(this.num <= 0){ clearInterval(this.timer); this.timer = null; - this.num = 10; + this.num = 60; this.is_code = false; } }, 1000); @@ -80,7 +80,17 @@ Authorization: this.token } }).then(res => { - this.$msg(res.data.message, {icon: 'success'}); + if(res.data.success){ + this.$msg(res.data.message, {icon: 'success'}); + }else{ + this.$msg(res.data.message); + if(this.timer){ + clearInterval(this.timer); + this.timer = null; + this.num = 60; + this.is_code = false; + } + } }) }, next(){