From cc48696d673c9d8eb2afda75d68e8c9baf24fd5d Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 14 Nov 2023 10:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E7=BB=93=E7=AE=97=E6=8C=89=E9=92=AE=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=95=86=E6=88=B7=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E5=92=8C=E5=B9=B3=E5=8F=B0=E7=A7=AF=E5=88=86=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E4=B8=AD=E5=8F=AA?=
 =?UTF-8?q?=E8=83=BD=E4=BD=BF=E7=94=A8=E4=B8=80=E7=A7=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order_addcart/order_addcart.vue |  2 +-
 pages/users/order_confirm/index.vue   | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index 63f0efd..afb9719 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -1108,7 +1108,7 @@
 	}
 	.shoppingCart .footer.on {
 		// #ifndef H5
-		bottom: 0rpx;
+		//bottom: 0rpx;
 		// #endif
 	}
 	.shoppingCart .footer .checkAll {
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 3731fe9..8cbf8a0 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -658,10 +658,8 @@
 				this.payMode[2].payStatus = n
 			}
 		},
-		onReady() {
-		},
-		mounted: function() {
-		},
+		onReady() {},
+		mounted: function() {},
 		onLoad: function(options) {
 			this.seckillId = options.seckillId
 			// #ifdef H5
@@ -747,8 +745,16 @@
 			changeIntegral: function(type) {
         console.log("--------- 变更类型 ---------------",type);
 				// this.use_integral = !this.use_integral;
-        if(type === 'mer') this.use_mer_integral = !this.use_mer_integral;
-        if(type === 'platform') this.use_platform_integral = !this.use_platform_integral;
+        if(type === 'mer') {
+          this.use_mer_integral = !this.use_mer_integral;
+          // 判断：开启商户积分 则不开启平台积分
+          if(this.use_mer_integral) this.use_platform_integral = false;
+        }
+        if(type === 'platform') {
+          this.use_platform_integral = !this.use_platform_integral;
+          // 判断：开启平台积分 则不开启商户积分
+          if(this.use_platform_integral) this.use_mer_integral = false;
+        }
 				this.getConfirm(this.addressId);
 			},
 			showPresellAgree(){