1.优化下单无法使用优惠券

App.vue

@@ -63,10 +63,12 @@
 			//千猪名称
 			qianzhuCityName: '重庆市',
 			//团油数据
-			pelletoilList: '',
+			pelletoilList: '',
-			//分享领取次数
+			//分享领取次数
-			shareNum:0,
+			shareNum: 0,
-			
+			//是否查询数据
+			isSelect: false
+
 
 		},
 		onLaunch: function() {},
@@ -230,7 +232,7 @@
 					}
 				}
 			})
-			
+
 			// #endif
 		},
 		onHide: function() {}
@@ -241,7 +243,7 @@
 	/*每个页面公共css */
 	@import "/static/iconfont/font.scss";
 	@import "/static/iconfont/cart.scss";
-	
+
 	@keyframes noticeAnimation {
 		from {
 			transform: translateX(100rpx);
@@ -252,52 +254,56 @@
 			transform: translateX(-100%);
 		}
 	}
-	
+
 	//自定义checkbox的样式（ 元素使用的时候就是使用类名：mycheck）
-		checkbox.mycheck .wx-checkbox-input,
+	checkbox.mycheck .wx-checkbox-input,
-		checkbox.mycheck .uni-checkbox-input {
+	checkbox.mycheck .uni-checkbox-input {
-			width: 30rpx !important;
+		width: 30rpx !important;
-			height: 30rpx !important;
+		height: 30rpx !important;
-			background-color: #ffffff !important;
+		background-color: #ffffff !important;
-			border-radius: 50% !important;
+		border-radius: 50% !important;
-			border: solid 1px #cccccc !important;
+		border: solid 1px #cccccc !important;
-			overflow: hidden;
+		overflow: hidden;
-		}
+	}
-		// 选中后的 对勾样式 
+
-		checkbox.mycheck .uni-checkbox-input-checked::before,
+	// 选中后的 对勾样式 
-		checkbox.mycheck .wx-checkbox-input-checked::before {
+	checkbox.mycheck .uni-checkbox-input-checked::before,
-			font-size: 38rpx !important; // 对勾大小 30rpx /
+	checkbox.mycheck .wx-checkbox-input-checked::before {
-			// color: #FFCC1E;
+		font-size: 38rpx !important; // 对勾大小 30rpx /
-		}
+		// color: #FFCC1E;
-		
+	}
-		
+
-		/* 解决小程序和app滚动条的问题 */
-		/* #ifdef MP-WEIXIN || APP-PLUS */
-			::-webkit-scrollbar{
-			    display: none;
-			}
-		/* #endif */
-		/* 解决H5 的问题 */
-		/* #ifdef H5 */
-		    uni-scroll-view .uni-scroll-view::-webkit-scrollbar {
-		    	/* 隐藏滚动条，但依旧具备可以滚动的功能 */
-			display: none
-		    }
-		/* #endif */
-		
-		
-		
-		
-		.cart-num  .uni-numbox__minus {
-			border-top-left-radius: 10px !important;
-			border-bottom-left-radius: 10px !important;
-		}
-		.cart-num .uni-numbox-btns {
-			background-color: #f6f6f6 !important;
-		}	
-		.cart-num .uni-numbox__plus{
-			border-top-right-radius: 10px !important;
-			border-bottom-right-radius: 10px !important;
-		}
 
-</style>
+	/* 解决小程序和app滚动条的问题 */
+	/* #ifdef MP-WEIXIN || APP-PLUS */
+	::-webkit-scrollbar {
+		display: none;
+	}
+
+	/* #endif */
+	/* 解决H5 的问题 */
+	/* #ifdef H5 */
+	uni-scroll-view .uni-scroll-view::-webkit-scrollbar {
+		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
+		display: none
+	}
+
+	/* #endif */
+
+
+
+
+	.cart-num .uni-numbox__minus {
+		border-top-left-radius: 10px !important;
+		border-bottom-left-radius: 10px !important;
+	}
+
+	.cart-num .uni-numbox-btns {
+		background-color: #f6f6f6 !important;
+	}
+
+	.cart-num .uni-numbox__plus {
+		border-top-right-radius: 10px !important;
+		border-bottom-right-radius: 10px !important;
+	}
+</style>

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;

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

pages/user/positioning/positioning.vue

@@ -110,7 +110,8 @@
 						app.globalData.cityName = res.return_data.provinceName;
 						app.globalData.qianzhuCityName = res.return_data.cityName;
 						app.globalData.cityId = res.return_data.regionId;
-						app.globalData.companyId = res.return_data.companyId;
+						app.globalData.companyId = res.return_data.companyId;
+						app.globalData.isSelect = true;
 						uni.navigateBack({})
 					} else {
 						uni.showToast({

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;

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);