修复：购物车结算按钮可能不显示的问题

优化：商户积分和平台积分同一个支付订单中只能使用一种

pages/order_addcart/order_addcart.vue

@@ -1108,7 +1108,7 @@
 	}
 	.shoppingCart .footer.on {
 		// #ifndef H5
-		bottom: 0rpx;
+		//bottom: 0rpx;
 		// #endif
 	}
 	.shoppingCart .footer .checkAll {

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(){