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

App.vue

@@ -65,7 +65,9 @@
 			//团油数据
 			pelletoilList: '',
 			//分享领取次数
-			shareNum:0,
+			shareNum: 0,
+			//是否查询数据
+			isSelect: false
 
 
 		},
@@ -263,6 +265,7 @@
 		border: solid 1px #cccccc !important;
 		overflow: hidden;
 	}
+
 	// 选中后的 对勾样式 
 	checkbox.mycheck .uni-checkbox-input-checked::before,
 	checkbox.mycheck .wx-checkbox-input-checked::before {
@@ -273,9 +276,10 @@
 
 	/* 解决小程序和app滚动条的问题 */
 	/* #ifdef MP-WEIXIN || APP-PLUS */
-			::-webkit-scrollbar{
+	::-webkit-scrollbar {
 		display: none;
 	}
+
 	/* #endif */
 	/* 解决H5 的问题 */
 	/* #ifdef H5 */
@@ -283,6 +287,7 @@
 		/* 隐藏滚动条，但依旧具备可以滚动的功能 */
 		display: none
 	}
+
 	/* #endif */
 
 
@@ -292,12 +297,13 @@
 		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{
+
+	.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

@@ -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;
@@ -526,12 +525,14 @@
 						}
 					}
 					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) {
+						this.memDiscountId = item.id;
 						// 打折
 						this.deductionPrice = parseFloat(this.orderPrice - (this.orderPrice * item
 								.discountPrice))

pages/tabBar/home/home.vue

@@ -138,8 +138,7 @@
 				</view>
 			</view>
 			<!-- 大图 -->
-			<view class="width90 mart20 alijusstart" v-if="item.type == 4"
-				@click="goGoodsList(item.jumpUrl)">
+			<view class="width90 mart20 alijusstart" v-if="item.type == 4" @click="goGoodsList(item.jumpUrl)">
 				<view class="width70 font18 fcor333">
 					{{item.name}}
 				</view>
@@ -222,10 +221,12 @@
 
 		onShow() {
 			// this.homeCateList = [];
-			// if (app.globalData.cityName != '') {
-			// 	this.city = app.globalData.qianzhuCityName;
-			// 	this.getCmsContentcmsContent();
-			// }
+			if (app.globalData.cityName != '') {
+				this.city = app.globalData.qianzhuCityName;
+				if (app.globalData.isSelect) {
+					this.getCmsContentcmsContent();
+				}
+			}
 		},
 		onLoad(options) {
 			let that = this;
@@ -338,6 +339,7 @@
 				getCmsContent(params).then(res => {
 					this.isdisplay = false;
 					if (res.return_code == '000000') {
+						app.globalData.isSelect = false;
 						this.homeCateList = res.return_data;
 					}
 				});

pages/user/positioning/positioning.vue

@@ -111,6 +111,7 @@
 						app.globalData.qianzhuCityName = res.return_data.cityName;
 						app.globalData.cityId = res.return_data.regionId;
 						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) {
@@ -394,12 +393,14 @@
 						}
 					}
 					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) {
+						this.memDiscountId = item.id;
 						// 打折
 						this.deductionPrice = parseFloat(this.paytheprice - (this.paytheprice * item.discountPrice))
 							.toFixed(2);