diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 075b9c5..261ce48 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,6 +2,10 @@ // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数 "version": "0.0", "configurations": [{ + "app-plus" : + { + "launchtype" : "remote" + }, "default" : { "launchtype" : "remote" diff --git a/subPages/rechargeDetails/rechargeDetails.vue b/subPages/rechargeDetails/rechargeDetails.vue index f6d04b0..fc3917a 100644 --- a/subPages/rechargeDetails/rechargeDetails.vue +++ b/subPages/rechargeDetails/rechargeDetails.vue @@ -78,7 +78,7 @@ - 优惠券金额 : + 优惠抵扣 : ¥{{recinfo.discountDeductionPrice}} @@ -94,7 +94,7 @@ - 积分抵扣金额 : + 积分抵扣 : ¥{{recinfo.integralDeductionPrice}} diff --git a/subPages/unionComfirmation/unionComfirmation.vue b/subPages/unionComfirmation/unionComfirmation.vue index 7fd73b2..088d302 100644 --- a/subPages/unionComfirmation/unionComfirmation.vue +++ b/subPages/unionComfirmation/unionComfirmation.vue @@ -617,19 +617,20 @@ }) } }, - submitHandle(e) { + submitHandle(e) { + uni.showLoading({ + title: '支付中...' + }) this.PaymentPassword = e.value; if (this.PaymentPassword == '') { uni.showToast({ title: '请勿手动关闭弹窗', icon: 'none', duration: 2000 - }) + }) + uni.hideLoading(); return; } - uni.showLoading({ - title: '支付中...' - }) if (this.payPrice == 0) { let params = { "memDiscountId": this.memDiscountId, @@ -638,9 +639,9 @@ "integralNum": this.priceValue[1], "password": this.PaymentPassword } - addOrderPay(params).then(res => { + addOrderPay(params).then(res => { + uni.hideLoading(); if (res.return_code == '000000') { - uni.hideLoading(); this.orderId = res.return_data.id; uni.reLaunch({ url: '../Phone-recharge-details/Phone-recharge-details?id=' +