From 0554e4591e2097c807057ec309394c0eab08c7d9 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 12 May 2023 10:36:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E8=AF=9D=E8=B4=B9=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subPages/recharge-centre/recharge-centre.vue  | 20 ++++++++++++++++++-
 .../unionComfirmation/unionComfirmation.vue   |  8 ++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/subPages/recharge-centre/recharge-centre.vue b/subPages/recharge-centre/recharge-centre.vue
index 3e27a03..717da3f 100644
--- a/subPages/recharge-centre/recharge-centre.vue
+++ b/subPages/recharge-centre/recharge-centre.vue
@@ -266,6 +266,10 @@
 				this.explainReceiptTime = this.tabs[this.swiperTabIdx].explain_receipt_time;
 				this.amountList = this.tabs[this.swiperTabIdx].priceList;
 				this.amoutType = this.tabs[this.swiperTabIdx].id;
+				this.inputAmount = '';
+				this.price = '';
+				this.inputAmountId = '';
+				this.amoutstatus = '';
 			},
 			//滑动事件  自行完善需要的代码
 			SwiperChange: function(e) {
@@ -274,6 +278,10 @@
 				this.explainReceiptTime = this.tabs[this.swiperTabIdx].explain_receipt_time;
 				this.amountList = this.tabs[this.swiperTabIdx].priceList;
 				this.amoutType = this.tabs[this.swiperTabIdx].id;
+				this.inputAmount = '';
+				this.price = '';
+				this.inputAmountId = '';
+				this.amoutstatus = '';
 			},
 			/**
 			 * 提交订单
@@ -312,9 +320,19 @@
 					});
 					return false;
 				}
+				let cztype = '';
+				if (that.swiperTabIdx == 0) {
+					cztype = '中国电信'
+				}
+				if (that.swiperTabIdx == 1) {
+					cztype = '中国移动'
+				}
+				if (that.swiperTabIdx == 2) {
+					cztype = '中国联通'
+				}
 				uni.showModal({
 					title: '请确认充值号码',
-					content: '充值号码 : ' + that.inputPhone + ',充值成功后无法退款',
+					content: cztype + ' : ' + that.inputPhone + ',充值金额 : ' + that.inputAmount + '元,充值成功后无法退款',
 					success: function(res) {
 						if (res.confirm) {
 							uni.navigateTo({
diff --git a/subPages/unionComfirmation/unionComfirmation.vue b/subPages/unionComfirmation/unionComfirmation.vue
index 10802a5..b6161ce 100644
--- a/subPages/unionComfirmation/unionComfirmation.vue
+++ b/subPages/unionComfirmation/unionComfirmation.vue
@@ -166,7 +166,7 @@
 					<view class="width20 fotrt">
 						<view>
 							<radio color="#0083f5"
-								v-if="items.discountCondition && orderPrice > items.discountCondition"
+								v-if="items.discountCondition && orderPrice >= items.discountCondition"
 								:checked="items.id == memDiscountId" />
 							<radio color="#0083f5"
 								v-if="items.discountCondition && orderPrice < items.discountCondition" disabled="true"
@@ -245,7 +245,7 @@
 			};
 		},
 		onLoad(options) {
-			this.orderPrice = options.orderPrice;
+			this.orderPrice = options.orderPrice;
 			this.payPrice = options.payPrice;
 			this.saveprice = options.payPrice;
 			this.rechargeContent = options.rechargeContent;
@@ -378,8 +378,8 @@
 				} else { // 否则进行选中赋值
 					this.memDiscountId = item.id;
 					if (item.discountType == 1) {
-						//满减价格
-						if (this.orderPrice > item.discountCondition) {
+						//满减价格
+						if (this.orderPrice >= item.discountCondition) {
 							this.memDiscountId = item.id;
 							//满减价格
 							this.deductionPrice = item.discountPrice;