From a07d1a827bcd63889085b3d0a2fa73563d63b5f3 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Mon, 12 Jun 2023 11:11:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E4=B8=8B=E5=8D=95=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E4=BD=BF=E7=94=A8=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rec-confirmation/rec-confirmation.vue           |  2 +-
 pages/order/confirmation.vue                        | 13 +++++++------
 qianzhu-KFC/confirmOrder/confirmOrder.vue           |  2 +-
 subPages/unionComfirmation/unionComfirmation.vue    |  7 ++++---
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/member-Recharge/rec-confirmation/rec-confirmation.vue b/member-Recharge/rec-confirmation/rec-confirmation.vue
index 3b3025d..9b4ac1b 100644
--- a/member-Recharge/rec-confirmation/rec-confirmation.vue
+++ b/member-Recharge/rec-confirmation/rec-confirmation.vue
@@ -450,7 +450,7 @@
 					this.priceCaluc(this.totalprice);
 				} else { // 否则进行选中赋值
 					if (item.discountType == 1) {
-						if (this.orderPrice > item.discountCondition) {
+						if (this.orderPrice >= item.discountCondition) {
 							this.memDiscountId = item.id;
 							//满减价格
 							this.deductionPrice = item.discountPrice;
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index a5b67e4..16489ae 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -498,7 +498,7 @@
 				this.$refs.popup.show();
 			},
 			//选择优惠券
-			radioChanges(item) {
+			radioChanges(item) {
 				this.paytheprice = this.orderPrice;
 				this.rechangeload();
 				if (this.memDiscountId == item.id) { // 如果已经选中，则取消选中
@@ -508,10 +508,9 @@
 					this.isDiscont = false;
 				} else { // 否则进行选中赋值
 					this.isDiscont = true;
-					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;
@@ -525,13 +524,15 @@
 							})
 						}
 					}
-					if (item.discountType == 2) {
+					if (item.discountType == 2) {
+						this.memDiscountId = item.id;
 						//抵扣价格
 						this.deductionPrice = item.discountPrice;
 						let oldprice = this.orderPrice - this.deductionPrice;
 						this.priceCaluc(oldprice);
 					}
-					if (item.discountType == 3) {
+					if (item.discountType == 3) {
+						this.memDiscountId = item.id;
 						// 打折
 						this.deductionPrice = parseFloat(this.orderPrice - (this.orderPrice * item
 								.discountPrice))
diff --git a/qianzhu-KFC/confirmOrder/confirmOrder.vue b/qianzhu-KFC/confirmOrder/confirmOrder.vue
index b34a1b8..cb060ac 100644
--- a/qianzhu-KFC/confirmOrder/confirmOrder.vue
+++ b/qianzhu-KFC/confirmOrder/confirmOrder.vue
@@ -690,7 +690,7 @@
 
 				} else { // 否则进行选中赋值
 					if (item.discountType == 1) {
-						if (this.orderPrice > item.discountCondition) {
+						if (this.orderPrice >= item.discountCondition) {
 							this.memDiscountId = item.id;
 							//满减价格
 							this.deductionPrice = item.discountPrice;
diff --git a/subPages/unionComfirmation/unionComfirmation.vue b/subPages/unionComfirmation/unionComfirmation.vue
index b6161ce..0b96898 100644
--- a/subPages/unionComfirmation/unionComfirmation.vue
+++ b/subPages/unionComfirmation/unionComfirmation.vue
@@ -376,7 +376,6 @@
 					this.priceCaluc(this.saveprice);
 
 				} else { // 否则进行选中赋值
-					this.memDiscountId = item.id;
 					if (item.discountType == 1) {
 						//满减价格
 						if (this.orderPrice >= item.discountCondition) {
@@ -393,13 +392,15 @@
 							})
 						}
 					}
-					if (item.discountType == 2) {
+					if (item.discountType == 2) {
+						this.memDiscountId = item.id;
 						//抵扣价格
 						this.deductionPrice = item.discountPrice;
 						let oldprice = this.paytheprice - this.deductionPrice;
 						this.priceCaluc(oldprice);
 					}
-					if (item.discountType == 3) {
+					if (item.discountType == 3) {
+						this.memDiscountId = item.id;
 						// 打折
 						this.deductionPrice = parseFloat(this.paytheprice - (this.paytheprice * item.discountPrice))
 							.toFixed(2);