diff --git a/subPackages/register/register-info.vue b/subPackages/register/register-info.vue index 47f0f35..ec78a99 100644 --- a/subPackages/register/register-info.vue +++ b/subPackages/register/register-info.vue @@ -250,6 +250,7 @@ this.show = false; }, opened() { + const that = this; // 获取支付配置 registePay({ method: "post", @@ -258,11 +259,36 @@ store_id: uni.getStorageSync('store_id') || '11001', } }).then((res) => { - // console.log(res, 'pay'); uni.showLoading({ title: "加载中" }); + if (res.data.errcode != 0) { + uni.hideLoading(); + that.$refs.uToast.show({ + title: res.data.msg || '支付失败', + type: 'default', + icon: false + }); + return; + } + + if (res.data.data.is_paid == 1) { + uni.hideLoading(); + setTimeout(() => { + uni.showToast({ + title: '支付成功', + duration: 1500, + mask: false, + icon: 'success' + }); + }, 400); + setTimeout(() => { + that.getInfo(); + }, 2900); + return; + } + uni.requestPayment({ provider: res.data.data.appId, timeStamp: res.data.data.timestamp, @@ -270,8 +296,7 @@ package: res.data.data.package, signType: res.data.data.signType, paySign: res.data.data.paySign, - success: (res) => { - // console.log('success:' + JSON.stringify(res)); + success: () => { uni.hideLoading(); setTimeout(() => { uni.showToast({ @@ -279,27 +304,32 @@ duration: 1500, mask: false, icon: 'success' - }) - }, 400) - + }); + }, 400); setTimeout(() => { - this.getInfo() - }, 2900) + that.getInfo(); + }, 2900); }, fail: function(err) { - // console.log('fail:' + JSON.stringify(err)); uni.hideLoading(); setTimeout(() => { - uni.showToast({ - title: res.data.msg || '支付失败', - duration: 1500, - mask: false, - icon: 'error' - }) - }, 400) + that.$refs.uToast.show({ + title: (err && err.errMsg) || '支付失败', + type: 'default', + icon: false + }); + }, 400); } - }) - }) + }); + }).catch((err) => { + console.error('registePay', err); + uni.hideLoading(); + that.$refs.uToast.show({ + title: '支付失败', + type: 'default', + icon: false + }); + }); }, // 返回首页 goHome() { diff --git a/subPackages/register/register.vue b/subPackages/register/register.vue index ad1fe06..1b0986d 100644 --- a/subPackages/register/register.vue +++ b/subPackages/register/register.vue @@ -1,5 +1,12 @@