From 5bf0d67123a4f4dd058a573dc9e2445c6c9c6c90 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 2 Jun 2022 13:59:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=AF=9D=E8=B4=B9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .hbuilderx/launch.json                           |  4 ++++
 subPages/rechargeDetails/rechargeDetails.vue     |  4 ++--
 subPages/unionComfirmation/unionComfirmation.vue | 15 ++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

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 @@
 			</view>
 			<view class="row" v-if="recinfo.discountDeductionPrice">
 				<view class="left">
-					优惠券金额 :
+					优惠抵扣 :
 				</view>
 				<view class="right">
 					￥{{recinfo.discountDeductionPrice}}
@@ -94,7 +94,7 @@
 			</view>
 			<view class="row" v-if="recinfo.integralDeductionPrice">
 				<view class="left">
-					积分抵扣金额 :
+					积分抵扣 :
 				</view>
 				<view class="right">
 					￥{{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=' +