From 2ffd66db40fb3790069ea0714b028a6e0f5b1092 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 21 Jul 2022 15:18:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B5=8B=E8=AF=95=E8=82=AF=E5=BE=B7=E5=9F=BA?=
 =?UTF-8?q?=20=E6=98=9F=E5=B7=B4=E5=85=8B=E9=97=AE=E9=A2=98=20=E5=B9=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rec-confirmation/rec-confirmation.vue     | 258 +++++++++++++++--
 pages.json                                    |  30 +-
 pages/goods/refuel-details/refuel-details.vue |  96 +++---
 pages/tabBar/home/home.vue                    |   4 +-
 qianzhu-KFC/confirmOrder/confirmOrder.vue     | 273 ++++++++++++++++--
 qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue   |  13 +-
 qianzhu-KFC/menu-list/menu-list.vue           |  64 ++--
 qianzhu-KFC/order-details/order-details.vue   |  76 +++--
 .../unionComfirmation/unionComfirmation.vue   |  55 ++--
 uni.scss                                      |   3 +
 10 files changed, 673 insertions(+), 199 deletions(-)

diff --git a/member-Recharge/rec-confirmation/rec-confirmation.vue b/member-Recharge/rec-confirmation/rec-confirmation.vue
index e112b5c..64437b1 100644
--- a/member-Recharge/rec-confirmation/rec-confirmation.vue
+++ b/member-Recharge/rec-confirmation/rec-confirmation.vue
@@ -9,7 +9,7 @@
 			</view>
 			<view class="width100 bor-botm1 mart10 marb10"></view>
 			<view class="width100">
-				<view class="width100 alijusstart mart10 bor-botm1">
+				<view class="width100 alijusstart mart10 bor-botm1 paddbotm10">
 					<view class="width70 padleft15">
 						<view class="width100 font14 fcor333 fontwig6">{{goodName}}</view>
 						<view class="width100 font12 fcor999 mart5">
@@ -19,18 +19,40 @@
 					<view class="width20">
 						<view class="width100 fcor333 font12">¥<text class="fontwig6 font16">{{totalprice}}</text>
 						</view>
-						<view class="width100 fcor999 font12" v-if="totalprice != oldPrice" style="text-decoration: line-through;">¥{{oldPrice}}
+						<view class="width100 fcor999 font12" v-if="totalprice != oldPrice"
+							style="text-decoration: line-through;">¥{{oldPrice}}
 						</view>
 					</view>
 				</view>
 				<view class="width90 fotrt height50 font13 fcor999">
 					共 <text class="fcor333 fontwig6" style="margin: 0px 5px;"> 1 </text> 件 小计:
 					<text class="font16 colorc3 fontwig6 margle"> ¥{{totalprice}}</text>
+					<text class="font12 fcor999 fontwig6 margle" style="text-decoration: line-through;">
+						¥{{orderPrice}}</text>
 				</view>
 			</view>
 		</view>
 		<view class="width94 concont mart10 backcorfff">
-			<view class="width92 alijusstart paddtop20">
+			<view class="height50 width100 paddtop5 backcorfff" @click="showPopup()">
+				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+					优惠抵扣<text class="yhqky">{{OrderPreList.length}}张可用</text>
+				</view>
+				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+					style="align-items: center;" v-if="deductionPrice == 0">
+					未使用
+					<image style="width: 40rpx;height: 40rpx;" src="../../static/img/jt.png"></image>
+				</view>
+				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcoreb5 alijun"
+					style="align-items: center;" v-else>
+					-￥{{deductionPrice}}
+					<image style="width: 40rpx;height: 40rpx;" src="../../static/img/jt.png"></image>
+				</view>
+			</view>
+			<view class="width94 line1 mart5 marb5"></view>
+			<view class="Bubble alijusstart font14 fcor999">
+				选取: <text class="tests fotct font14 colorc3 paddleft5 paddtright5">{{priceValue[1]}}</text> 分
+			</view>
+			<view class="width92 alijusstart paddtop10">
 				<view class="width30 fcor333 fontwig6 font16">
 					积分抵扣
 				</view>
@@ -64,7 +86,7 @@
 					</view>
 					<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
 						style="align-items: center;" v-if="isUse">
-						<radio :checked="paytype=='2'" color="#089bf5" />
+						<radio :checked="paytype=='2'" color="#c72a20"/>
 					</view>
 				</view>
 				<view class="width94 line1 mart5 marb5" v-if="item == 3"></view>
@@ -74,7 +96,7 @@
 					</view>
 					<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
 						style="align-items: center;" v-if="isUse">
-						<radio :checked="paytype=='3'" @click="changeRiado()" color="#089bf5" />
+						<radio :checked="paytype=='3'" @click="changeRiado()" color="#c72a20" />
 					</view>
 				</view>
 			</view>
@@ -91,20 +113,47 @@
 				</view>
 			</view>
 		</view>
+
+		<wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true">
+			<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
+			<view class="width92 height110 tccs mart10" v-for="(items, index) in OrderPreList" :key="index"
+				@click="radioChanges(items)">
+				<image mode="widthFix" class="mart10" :src="imageUrl+items.discountImg"></image>
+				<view class="contrig">
+					<view class="width80p flleft">
+						<view class="font16 fontwig6 fcor333 text1 paddtop25">{{items.discountName}}</view>
+						<view class="font13 fcor999 mart5">有效期:{{items.useEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+						</view>
+					</view>
+					<view class="width20 flright">
+						<view class="yhprice">
+							<radio v-if="items.discountCondition && orderPrice > items.discountCondition"
+								color="#c72a20" :checked="items.id == memDiscountId" />
+							<radio v-if="items.discountCondition && orderPrice < items.discountCondition"
+								color="#c72a20" disabled="true" :checked="items.id == memDiscountId" />
+							<radio v-if="!items.discountCondition" color="#c72a20"
+								:checked="items.id == memDiscountId" />
+						</view>
+					</view>
+				</view>
+			</view>
+		</wybPopup>
 		<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
 	</view>
 </template>
 
 <script>
 	import cjSlider from '@/components/cj-slider/cj-slider.vue';
-	import ssPaymentPassword from '@/components/sanshui-payment-password/index.vue'
+	import ssPaymentPassword from '@/components/sanshui-payment-password/index.vue';
+	import wybPopup from '../../components/wyb-popup/wyb-popup.vue';
 	import {
 		xbkaddOrder,
 		getThirdPartyByDetail,
 		getHuiLianTongCardBalance,
 		findUser,
-		qianzhuorderToPayByWx,
-		czhltUnionCardPay
+		qianzhuorderToPayByWx,
+		czhltUnionCardPay,
+		getUserOrderPreList
 	} from '../../Utils/Api.js';
 	// #ifdef H5
 	var jweixin = require('jweixin-module');
@@ -113,7 +162,8 @@
 	export default {
 		components: {
 			cjSlider,
-			ssPaymentPassword
+			ssPaymentPassword,
+			wybPopup
 		},
 		data() {
 			return {
@@ -121,8 +171,8 @@
 				paytype: '', //支付方式
 				priceValue: [0, 0], // 积分可以指定默认值
 				availIntegal: 0, // 可用积分
-				totalprice: 0, //总价
-				oldPrice:0, //原价
+				totalprice: 0, //总价
+				oldPrice: 0, //原价
 				disconutprice: 0, //优惠价格
 				totalnum: '', //总数量
 				customerMobile: '', //电话号码
@@ -135,19 +185,27 @@
 				isDiscount: true, //刷新组件
 				showType: '', //平台
 				memDiscountId: '', //优惠券id
-				PaymentPassword: '', //支付密码
-				goodId:'' ,//商品id
-				goodName:'' ,//商品name
-				orderId:'' //订单id
+				PaymentPassword: '', //支付密码
+				goodId: '', //商品id
+				goodName: '', //商品name
+				orderId: '', //订单id
+				deductionPrice: '0.00', //优惠金额
+				OrderPreList: [], //优惠券数据
+				imageUrl: app.globalData.imgUrl, //图片地址
+				orderPrice: 0, //订单价格
+				rechargeDes: '', // 支付详情
 			}
 		},
 		onLoad(options) {
-			this.goodId = options.goodid;
-			this.oldPrice = options.oldprice;
+			this.goodId = options.goodid;
+			this.oldPrice = options.oldprice;
+			this.orderPrice = options.oldprice;
 			this.totalprice = options.price;
-			this.payPrice = options.price;
+			this.payPrice = options.price;
 			this.goodName = options.name;
 			this.customerMobile = app.globalData.userInfo.phone;
+		},
+		onShow() {
 			this.findUser();
 		},
 		methods: {
@@ -166,6 +224,7 @@
 				}
 				getThirdPartyByDetail(datas).then(res => {
 					if (res.return_code == '000000') {
+						this.rechargeDes = res.return_data;
 						this.paytypeList = res.return_data.productPayType.split(',');
 						this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
 						let zkprice = parseFloat(res.return_data.integralDiscount / 100).toFixed(2);
@@ -186,8 +245,9 @@
 					if (res.return_code == '000000') {
 						app.globalData.userInfo = res.return_data;
 						this.user = res.return_data;
-						this.getHuiLianTongCardBalance();
+						this.getHuiLianTongCardBalance();
 						this.getThirdPartyByDetail();
+						this.getUserOrderPreList();
 						uni.setStorage({
 							key: "user",
 							data: res.return_data
@@ -219,9 +279,17 @@
 			blockMoving() {
 				// console.log('正在滑动中')
 			},
+
 			//滑动结束
 			blockEnd() {
-				this.payPrice = parseFloat(this.totalprice - parseFloat(this.priceValue[1] / 100).toFixed(2)).toFixed(2);
+				this.isDiscount = 1;
+				if (this.deductionPrice == 0) {
+					this.payPrice = Math.abs(parseFloat(this.totalprice - parseFloat(this.priceValue[1] / 100).toFixed(2)).toFixed(
+						2));
+				} else {
+					this.payPrice = Math.abs(parseFloat(this.orderPrice - parseFloat(this.priceValue[1] / 100).toFixed(2) - this
+						.deductionPrice).toFixed(2));
+				}
 				if (this.payPrice == 0) {
 					this.isUse = false;
 					this.paytype = '';
@@ -292,17 +360,114 @@
 
 				xbkaddOrder(datas).then(res => {
 					uni.hideLoading();
-					if (res.return_code == '000000') {
-						this.orderId =  res.return_data.id;
+					if (res.return_code == '000000') {
+						this.orderId = res.return_data.id;
 						let params = {
 							"orderId": res.return_data.id,
 							"openId": app.globalData.openId,
 							"openIdType": this.showType
 						}
 						this.qianzhuorderToPayByWx(params);
+					}else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
 					}
 				})
 			},
+			//查询优惠券
+			getUserOrderPreList() {
+				let params = {
+					useScope: 6
+				}
+				getUserOrderPreList(params).then(res => {
+					if (res.return_code == '000000') {
+						this.OrderPreList = res.return_data;
+					}
+				});
+			},
+			//弹出优惠券
+			showPopup() {
+				this.$refs.popup.show();
+			},
+			//选择优惠券
+			radioChanges(item) {
+				this.rechangeload();
+				if (this.memDiscountId == item.id) { // 如果已经选中，则取消选中
+					this.memDiscountId = '';
+					this.deductionPrice = '0.00';
+					this.priceCaluc(this.totalprice);
+				} else { // 否则进行选中赋值
+					if (item.discountType == 1) {
+						if (this.orderPrice > item.discountCondition) {
+							this.memDiscountId = item.id;
+							//满减价格
+							this.deductionPrice = item.discountPrice;
+							let oldprice = this.orderPrice - this.deductionPrice;
+							this.priceCaluc(oldprice);
+						} else {
+							uni.showToast({
+								title: '请满' + item.discountCondition + '使用此券',
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					}
+					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))
+							.toFixed(2);
+						let oldprice = parseFloat(this.orderPrice * item.discountPrice).toFixed(2);
+						this.priceCaluc(oldprice);
+
+					}
+				}
+				this.$refs.popup.hide();
+			},
+			//计算价格
+			priceCaluc(item) {
+				let zkprice = parseFloat(this.rechargeDes.integralDiscount / 100).toFixed(2);
+				let pprice = parseFloat(item * 100).toFixed(0);
+				let payprice = parseFloat(item * 100 * zkprice).toFixed(0);
+				if (payprice > this.user.gold) {
+					this.availIntegal = this.user.gold;
+					this.priceValue[1] = 0;
+				} else {
+					this.availIntegal = payprice;
+					this.priceValue[1] = 0;
+				}
+				this.reload();
+				this.calculatepayPrice();
+			},
+			//计算支付价格
+			calculatepayPrice() {
+				if (this.deductionPrice == 0) {
+					this.payPrice = Math.abs(parseFloat(this.totalprice - (parseFloat(this.priceValue[1] / 100).toFixed(2)))
+						.toFixed(2));
+				} else {
+					this.payPrice = Math.abs(parseFloat(this.orderPrice - (parseFloat(this.priceValue[1] / 100).toFixed(2)) - this
+						.deductionPrice).toFixed(2));
+				}
+			},
+			rechangeload() {
+				this.isUse = false;
+				this.$nextTick(() => (this.isUse = true))
+			},
+			//刷新组件
+			reload() {
+				this.isDiscount = false;
+				this.$nextTick(() => (this.isDiscount = true))
+			},
 			//获取订单数据
 			qianzhuorderToPayByWx(item) {
 				let that = this;
@@ -326,7 +491,8 @@
 										title: '支付成功'
 									})
 									uni.reLaunch({
-										url: '/qianzhu-KFC/order-details/order-details?id=' + that.orderId
+										url: '/qianzhu-KFC/order-details/order-details?id=' +
+											that.orderId
 									})
 								},
 								fail: function(err) {
@@ -503,7 +669,8 @@
 								title: '支付成功'
 							})
 							uni.reLaunch({
-								url: '/qianzhu-KFC/order-details/order-details?id=' + that.orderId
+								url: '/qianzhu-KFC/order-details/order-details?id=' + that
+									.orderId
 							})
 						},
 						cancel: function(r) {
@@ -540,6 +707,17 @@
 		border-radius: 12px;
 	}
 
+	.Bubble {
+		margin-left: 50%;
+		padding-top: 15px;
+	}
+
+	.tests {
+		border-radius: 15px;
+		height: 22px;
+		line-height: 22px;
+	}
+
 	.jfrecharge {
 		padding: 3px 20rpx;
 		color: #fff;
@@ -578,4 +756,36 @@
 		align-items: center;
 		display: flex;
 	}
+
+	.yhqky {
+		background: #ff0034;
+		color: #ffffff;
+		font-size: 14px;
+		padding-left: 5px;
+		padding-right: 5px;
+		margin-left: 8px;
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+
+	.yhprice {
+		margin-top: -30px;
+	}
+
+	.contrig {
+		margin-left: 180rpx;
+	}
+
+	.tccs {
+		box-shadow: 0rpx 0rpx 10rpx rgba(0, 0, 0, 0.2);
+		border: 1px solid #f6f6f6;
+		border-radius: 8px;
+
+		image {
+			float: left;
+			width: 170rpx;
+			max-height: 170rpx;
+			margin-left: 10px;
+		}
+	}
 </style>
diff --git a/pages.json b/pages.json
index 19aedeb..9da3bbc 100644
--- a/pages.json
+++ b/pages.json
@@ -461,7 +461,7 @@
 				"navigationBarTextStyle": "white"
 			}
 		}
-    ],
+	],
 	"subpackages": [{
 		"root": "subPages",
 		"pages": [{
@@ -748,11 +748,11 @@
 
 			}, {
 				"path": "scancodeCoupons/scancodeCoupons",
-				"style": {
-					"navigationBarTextStyle": "white",
-					"navigationBarTitleText": "扫码领券",
-					"navigationBarBackgroundColor": "#0083f5",
-					"backgroundColorTop": "#0083f5",
+				"style": {
+					"navigationBarTextStyle": "white",
+					"navigationBarTitleText": "扫码领券",
+					"navigationBarBackgroundColor": "#0083f5",
+					"backgroundColorTop": "#0083f5",
 					"onReachBottomDistance": 50
 				}
 
@@ -831,16 +831,14 @@
 				"enablePullDownRefresh": false
 			}
 
-		},{
-            "path" : "payment-method/payment-method",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "继续支付",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-		]
+		}, {
+			"path": "payment-method/payment-method",
+			"style": {
+				"navigationBarTitleText": "继续支付",
+				"enablePullDownRefresh": false
+			}
+
+		}]
 	}, {
 		"root": "qianzhu-Starbucks",
 		"pages": [{
diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue
index 1e2614e..8f47a33 100644
--- a/pages/goods/refuel-details/refuel-details.vue
+++ b/pages/goods/refuel-details/refuel-details.vue
@@ -77,14 +77,18 @@
 		<view class="width90 height40 mart10">
 			<view class="flleft width50 font15 fcor666">加油升数:<text class="fcoreb5 margle">
 					{{oilLiters}}L</text></view>
-			<view class="flright width50 font15 fcor666">平台折扣:<text class="fcoreb5 margle">
-					{{discount}}折</text></view>
+			<view class="flright width50 font15 fcor666">油站直降:<text class="fcoreb5 margle">
+					¥{{pricePreferences}}</text>
+			</view>
 		</view>
 		<view class="width90 height40">
-			<view class="flleft width50 font15 fcor666">优惠价格:<text class="fcoreb5 margle">
-					¥{{pricePreferences}}</text></view>
-			<view class="flright width50 font15 fcor666">加油补贴:<text class="fcoreb5 margle">
-					¥{{oilSubsidy}}</text></view>
+			<view class="flleft width50 font15 fcor666">平台补贴:
+				<text class="fcoreb5 margle">¥{{oilSubsidy}}</text>
+			</view>
+			<view class="flright width50 font15 fcor666">平台折扣:
+				<text class="fcoreb5 margle" v-if="discount != 1">{{(discount * 100).toFixed(2)}}折</text>
+				<text class="fcoreb5 margle" v-else>无</text>
+			</view>
 		</view>
 		<view class="width90 height40">
 			<view class="flleft width50 font15 fcor666">每升优惠:<text class="fcoreb5 margle">
@@ -115,7 +119,7 @@
 			<button class="reBtn flright" v-if="user.phone == null" @click="jumpH5Bding">去支付</button>
 			<button class="reBtn flright" v-else @click="postionIng">去支付</button>
 			<!-- #endif -->
-		</view>
+		</view>
 		<!-- 底部弹窗 -->
 		<wybPopup ref="popup" type="bottom" height="600" width="500" radius="6" :showCloseIcon="true">
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 1">选择油号</view>
@@ -136,7 +140,7 @@
 				</view>
 			</view>
 		</wybPopup>
-		<view class="height30"></view>
+		<view class="height30"></view>
 	</view>
 </template>
 
@@ -215,12 +219,12 @@
 			this.counId = options.desId;
 			if (app.globalData.accountId) {
 				this.isTyAgent = true;
-			}
-			
-			if(app.globalData.gasKey){
-				this.store_key = app.globalData.gasKey;
-			}else{
-				app.globalData.staffCode = '';
+			}
+
+			if (app.globalData.gasKey) {
+				this.store_key = app.globalData.gasKey;
+			} else {
+				app.globalData.staffCode = '';
 			}
 			// #ifdef H5
 			if (app.globalData.accountType && app.globalData.accountType == '000000#/') {
@@ -321,7 +325,7 @@
 							this.priceVip = res.return_data.oilPriceList[0].priceVip;
 							this.priceGun = res.return_data.oilPriceList[0].priceGun;
 							this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial;
-							this.detailList = res.return_data.oilPriceList;
+							this.detailList = res.return_data.oilPriceList;
 							this.counId = res.return_data.goodsId;
 							this.oilType = res.return_data.oilPriceList[0].oilType;
 							this.gasGunList = res.return_data.gasGunList;
@@ -372,7 +376,7 @@
 			//选择油号
 			changeValue(item) {
 				this.gunnumber = [];
-				this.oilNo = item.oilNoName;
+				this.oilNo = item.oilNoName;
 				this.gunNo = '';
 				for (var i = 0; i < this.gasGunList.length; i++) {
 					if (this.oilNo == this.gasGunList[i].oilNoName) {
@@ -482,9 +486,9 @@
 						this.totalPrice = res.return_data.payPrice;
 						this.oilLiters = res.return_data.oilLiters;
 						this.discount = res.return_data.discount;
-						this.oilSubsidy = res.return_data.oilSubsidy;
+						this.oilSubsidy = res.return_data.preferentialMargin;
 						this.litersPreferences = res.return_data.litersPreferences;
-						this.pricePreferences = res.return_data.pricePreferences;
+						this.pricePreferences = res.return_data.gasStationDrop;
 						this.totalPreferences = res.return_data.totalPreferences;
 						if (this.priceVip != this.priceOfficial) {
 							// let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
@@ -528,14 +532,14 @@
 						duration: 2000
 					});
 					return;
-				}
-				if(this.gunNo == ''){
-					uni.showToast({
-						title: '请选择枪号',
-						icon: "none",
-						duration: 2000
-					});
-					return;
+				}
+				if (this.gunNo == '') {
+					uni.showToast({
+						title: '请选择枪号',
+						icon: "none",
+						duration: 2000
+					});
+					return;
 				}
 
 				// #ifdef H5
@@ -579,17 +583,17 @@
 				// 			that.getGasDetailByStoreKey();
 				// 		}
 				// 		setTimeout(() => {
-							that.toPay();
+				that.toPay();
 				// 		}, 500);
 				// 	},
 				// 	err => {
-				// 		if (app.globalData.accountType && app.globalData.accountType == '000000#/') {
-				// 			that.recentGasStation();
-				// 		} else {
-				// 			that.getGasDetailByStoreKey();
-				// 		}
-				// 		setTimeout(() => {
-				// 			that.toPay();
+				// 		if (app.globalData.accountType && app.globalData.accountType == '000000#/') {
+				// 			that.recentGasStation();
+				// 		} else {
+				// 			that.getGasDetailByStoreKey();
+				// 		}
+				// 		setTimeout(() => {
+				// 			that.toPay();
 				// 		}, 500);
 				// 	}
 				// );
@@ -661,8 +665,8 @@
 				})
 				let goods = {
 					"identificationCode": app.globalData.identificationCode,
-					"isTyAgent": this.isTyAgent,
-					"gasStaffCode":app.globalData.staffCode,
+					"isTyAgent": this.isTyAgent,
+					"gasStaffCode": app.globalData.staffCode,
 					"highChildOrderList": [{
 						"goodsType": 3,
 						"goodsId": this.counId,
@@ -678,16 +682,16 @@
 				}
 				addOrder(goods).then(res => {
 					uni.hideLoading();
-					if (res.return_code == '000000') {
-						if(app.globalData.gasKey){
-							 app.globalData.gasKey = '';
-							 app.globalData.staffCode = '';
-							 uni.removeStorage({
-							 	key: 'gasKey'
-							 })
-							 uni.removeStorage({
-							 	key: 'staffCode'
-							 })
+					if (res.return_code == '000000') {
+						if (app.globalData.gasKey) {
+							app.globalData.gasKey = '';
+							app.globalData.staffCode = '';
+							uni.removeStorage({
+								key: 'gasKey'
+							})
+							uni.removeStorage({
+								key: 'staffCode'
+							})
 						}
 						uni.redirectTo({
 							url: '/pages/goods/refuel-confirm/refuel-confirm?payprice=' + res.return_data
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 85ed232..a485513 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -237,7 +237,7 @@
 				app.globalData.h5code = arr2[1];
 			} else {
 				// 获取openid
-				that.jumpcdx();
+				// that.jumpcdx();
 				uni.setStorage({
 					key: "accountId",
 					data: arr2[1]
@@ -355,7 +355,7 @@
 		methods: {
 			jumpcdx() {
 				location.href =
-					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
+					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
 			},
 			//获取首页功能
 			getCmsContentcmsContent() {
diff --git a/qianzhu-KFC/confirmOrder/confirmOrder.vue b/qianzhu-KFC/confirmOrder/confirmOrder.vue
index c6b1845..a81d26f 100644
--- a/qianzhu-KFC/confirmOrder/confirmOrder.vue
+++ b/qianzhu-KFC/confirmOrder/confirmOrder.vue
@@ -52,14 +52,44 @@
 				</view>
 				<view class="width90 fotrt height50 font13 fcor999">
 					共 <text class="fcor333 fontwig6" style="margin: 0px 5px;"> {{totalnum}} </text> 件 小计:
-					<text class="font16 colorc3 fontwig6 margle" v-if="typeid == 1"> ¥{{totalprice}}</text>
-					<text class="font16 color2f6f43 fontwig6 margle" v-if="typeid == 2"> ¥{{totalprice}}</text>
+					<text class="font16 colorc3 fontwig6 margle" v-if="typeid == 1 && memDiscountId">
+						¥{{orderPrice}}</text>
+					<text class="font16 colorc3 fontwig6 margle" v-if="typeid == 1 && !memDiscountId">
+						¥{{totalprice}}</text>
+					<text class="font12 fcor999 fontwig6 margle" v-if="typeid == 1  && !memDiscountId"
+						style="text-decoration: line-through;"> ¥{{orderPrice}}</text>
+
+					<text class="font16 color2f6f43 fontwig6 margle" v-if="typeid == 2 && memDiscountId">
+						¥{{orderPrice}}</text>
+					<text class="font16 color2f6f43 fontwig6 margle" v-if="typeid == 2 && !memDiscountId">
+						¥{{totalprice}}</text>
+					<text class="font12 fcor999 fontwig6 margle" v-if="typeid == 2 && !memDiscountId"
+						style="text-decoration: line-through;"> ¥{{orderPrice}}</text>
 				</view>
 			</view>
 		</view>
 		<view class="width94 concont mart10 backcorfff">
+			<view class="height50 width100 paddtop5 backcorfff" @click="showPopup()">
+				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+					优惠抵扣<text class="yhqky">{{OrderPreList.length}}张可用</text>
+				</view>
+				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+					style="align-items: center;" v-if="deductionPrice == 0">
+					未使用
+					<image style="width: 40rpx;height: 40rpx;" src="../../static/img/jt.png"></image>
+				</view>
+				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcoreb5 alijun"
+					style="align-items: center;" v-else>
+					-￥{{deductionPrice}}
+					<image style="width: 40rpx;height: 40rpx;" src="../../static/img/jt.png"></image>
+				</view>
+			</view>
+			<view class="width94 line1 mart5 marb5"></view>
 			<view class="Bubble alijusstart font14 fcor999">
-				选取: <text class="tests fotct font14 fcor089 paddleft5 paddtright5">{{priceValue[1]}}</text> 分
+				选取: <text class="tests fotct font14 colorc3 paddleft5 paddtright5"
+					v-if="typeid == 1">{{priceValue[1]}}</text><text
+					class="tests fotct font14 color2f6f43 paddleft5 paddtright5"
+					v-if="typeid == 2">{{priceValue[1]}}</text> 分
 			</view>
 			<view class="width92 alijusstart paddtop10">
 				<view class="width30 fcor333 fontwig6 font16">
@@ -123,7 +153,7 @@
 			<view class="width94 font12 fcor999 mart5 paddbotm10">经用于接收取餐码,请正确填写</view>
 		</view>
 
-		<view class="concont width94 mart20 backcorfff marb100" v-if="typeid == 1">
+		<view class="concont width94 mart20 backcorfff marb150" v-if="typeid == 1">
 			<view class="width94 paddtop10 font14 fcor333 fontwig6">
 				就餐方式
 			</view>
@@ -140,7 +170,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="concont width94 mart20 backcorfff marb100 font13" v-if="typeid == 2">
+		<view class="concont width94 mart20 backcorfff marb150 font13" v-if="typeid == 2">
 			<view class="width94 alijusstart paddtop10 font14" @click="radioChange()">
 				<view class="width50 fcor333">购买须知</view>
 				<!-- <view ></view> -->
@@ -179,6 +209,42 @@
 				</view>
 			</view>
 		</view>
+
+		<wybPopup ref="popup" type="bottom" width="500" :scrollY="true" radius="6" :showCloseIcon="true">
+			<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
+			<view class="width92 height110 tccs mart10" v-for="(items, index) in OrderPreList" :key="index"
+				@click="radioChanges(items)">
+				<image mode="widthFix" class="mart10" :src="imageUrl+items.discountImg"></image>
+				<view class="contrig">
+					<view class="width80p flleft">
+						<view class="font16 fontwig6 fcor333 text1 paddtop25">{{items.discountName}}</view>
+						<view class="font13 fcor999 mart5">有效期:{{items.useEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+						</view>
+					</view>
+					<view class="width20 flright">
+						<view class="yhprice">
+							<radio v-if="typeid == 1 && items.discountCondition && orderPrice > items.discountCondition"
+								color="#c72a20" :checked="items.id == memDiscountId" />
+
+							<radio v-if="typeid == 1 && items.discountCondition && orderPrice < items.discountCondition"
+								color="#c72a20" disabled="true" :checked="items.id == memDiscountId" />
+
+							<radio v-if="typeid == 1 && !items.discountCondition" color="#c72a20"
+								:checked="items.id == memDiscountId" />
+
+							<radio v-if="typeid == 2 && items.discountCondition && orderPrice > items.discountCondition"
+								color="#2f6f43" :checked="items.id == memDiscountId" />
+
+							<radio v-if="typeid == 2 && items.discountCondition && orderPrice < items.discountCondition"
+								disabled="true" color="#2f6f43" :checked="items.id == memDiscountId" />
+
+							<radio v-if="typeid == 2 && !items.discountCondition" color="#2f6f43"
+								:checked="items.id == memDiscountId" />
+						</view>
+					</view>
+				</view>
+			</view>
+		</wybPopup>
 		<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
 	</view>
 </template>
@@ -186,13 +252,15 @@
 <script>
 	import cjSlider from '@/components/cj-slider/cj-slider.vue';
 	import ssPaymentPassword from '@/components/sanshui-payment-password/index.vue'
+	import wybPopup from '@/components/wyb-popup/wyb-popup.vue'
 	import {
 		xbkaddOrder,
 		getThirdPartyByDetail,
 		getHuiLianTongCardBalance,
 		findUser,
 		qianzhuorderToPayByWx,
-		czhltUnionCardPay
+		czhltUnionCardPay,
+		getUserOrderPreList
 	} from '../../Utils/Api.js';
 	// #ifdef H5
 	var jweixin = require('jweixin-module');
@@ -201,7 +269,8 @@
 	export default {
 		components: {
 			cjSlider,
-			ssPaymentPassword
+			ssPaymentPassword,
+			wybPopup
 		},
 		data() {
 			return {
@@ -228,7 +297,12 @@
 				showType: '', //支付方式
 				memDiscountId: '', //优惠券id
 				PaymentPassword: '', //支付密码
-				orderId: '' //订单id
+				orderId: '', //订单id
+				deductionPrice: '0.00', //优惠金额
+				OrderPreList: [], //优惠券数据
+				imageUrl: app.globalData.imgUrl, //图片地址
+				orderPrice: 0, //订单价格
+				rechargeDes: '', // 支付详情
 			}
 		},
 		onLoad() {
@@ -237,6 +311,8 @@
 			this.customerMobile = app.globalData.userInfo.phone;
 			this.getAllPrice();
 			this.getAllCount();
+		},
+		onShow() {
 			this.findUser();
 		},
 		methods: {
@@ -262,6 +338,7 @@
 				}
 				getThirdPartyByDetail(datas).then(res => {
 					if (res.return_code == '000000') {
+						this.rechargeDes = res.return_data;
 						this.paytypeList = res.return_data.productPayType.split(',');
 						this.paytypeList = this.paytypeList.slice(0, this.paytypeList.length - 1);
 						let zkprice = parseFloat(res.return_data.integralDiscount / 100).toFixed(2);
@@ -284,6 +361,7 @@
 						this.user = res.return_data;
 						this.getHuiLianTongCardBalance();
 						this.getThirdPartyByDetail();
+						this.getUserOrderPreList();
 						uni.setStorage({
 							key: "user",
 							data: res.return_data
@@ -310,7 +388,7 @@
 				let result = 0;
 				let result1 = 0;
 				this.orderList.forEach((good) => {
-					result1 += this.accMul(good.num, good.price)
+					result1 += this.accMul(good.num, good.price);
 					result = result1.toFixed(2);
 				})
 
@@ -321,10 +399,9 @@
 					this.disconutprice = (result3 - result).toFixed(2);
 				})
 
+				this.orderPrice = result3;
 				this.totalprice = result;
 				this.payPrice = result;
-
-
 			},
 			//总数
 			getAllCount() {
@@ -356,11 +433,7 @@
 			changedissr(item) {
 				this.sttypeid = item;
 			},
-			//刷新组件
-			reload() {
-				this.isDiscount = false;
-				this.$nextTick(() => (this.isDiscount = true))
-			},
+
 			//滑动开始
 			blockStart() {},
 			blockMoving() {
@@ -368,7 +441,16 @@
 			},
 			//滑动结束
 			blockEnd() {
-				this.payPrice = parseFloat(this.totalprice - parseFloat(this.priceValue[1] / 100).toFixed(2)).toFixed(2);
+				this.isDiscount = 1;
+				if (this.deductionPrice == 0) {
+					this.payPrice = Math.abs(parseFloat(this.totalprice - parseFloat(this.priceValue[1] / 100).toFixed(2))
+						.toFixed(
+							2));
+				} else {
+					this.payPrice = Math.abs(parseFloat(this.orderPrice - parseFloat(this.priceValue[1] / 100).toFixed(2) -
+						this
+						.deductionPrice).toFixed(2));
+				}
 				if (this.payPrice == 0) {
 					this.isUse = false;
 					this.paytype = '';
@@ -460,18 +542,11 @@
 						platformId: this.showType,
 						orderItems: data2,
 						eatType: this.sttypeid,
-						integralNum: this.priceValue[1]
+						integralNum: this.priceValue[1],
+						memDiscountId: this.memDiscountId
 					}
 				}
 				if (this.typeid == 2) {
-					// if (this.radiostu != 1) {
-					// 	uni.showToast({
-					// 		title: '请勾选协议表示同意',
-					// 		icon: 'none',
-					// 		duration: 2000
-					// 	})
-					// 	return;
-					// }
 					datas = {
 						customerMobile: this.customerMobile,
 						regionId: app.globalData.cityId,
@@ -479,10 +554,10 @@
 						productType: this.productType,
 						platformId: this.showType,
 						orderItems: this.orderList,
-						integralNum: this.priceValue[1]
+						integralNum: this.priceValue[1],
+						memDiscountId: this.memDiscountId
 					}
 				}
-
 				xbkaddOrder(datas).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
@@ -493,9 +568,115 @@
 							"openIdType": this.showType
 						}
 						this.qianzhuorderToPayByWx(params);
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
 					}
 				})
 			},
+			//查询优惠券
+			getUserOrderPreList() {
+				let cope;
+				if (this.productType == 1) {
+					cope = 5;
+				} else {
+					cope = 4;
+				}
+				let params = {
+					useScope: cope
+				}
+				getUserOrderPreList(params).then(res => {
+					if (res.return_code == '000000') {
+						this.OrderPreList = res.return_data;
+					}
+				});
+			},
+			//弹出优惠券
+			showPopup() {
+				this.$refs.popup.show();
+			},
+			//选择优惠券
+			radioChanges(item) {
+				this.rechangeload();
+				if (this.memDiscountId == item.id) { // 如果已经选中，则取消选中
+					this.memDiscountId = '';
+					this.deductionPrice = '0.00';
+					this.priceCaluc(this.totalprice);
+
+				} else { // 否则进行选中赋值
+					if (item.discountType == 1) {
+						if (this.orderPrice > item.discountCondition) {
+							this.memDiscountId = item.id;
+							//满减价格
+							this.deductionPrice = item.discountPrice;
+							let oldprice = this.orderPrice - this.deductionPrice;
+							this.priceCaluc(oldprice);
+						} else {
+							uni.showToast({
+								title: '请满' + item.discountCondition + '使用此券',
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					}
+					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))
+							.toFixed(2);
+						let oldprice = parseFloat(this.orderPrice * item.discountPrice).toFixed(2);
+						this.priceCaluc(oldprice);
+
+					}
+				}
+				this.$refs.popup.hide();
+			},
+			//计算价格
+			priceCaluc(item) {
+				let zkprice = parseFloat(this.rechargeDes.integralDiscount / 100).toFixed(2);
+				let pprice = parseFloat(item * 100).toFixed(0);
+				let payprice = parseFloat(item * 100 * zkprice).toFixed(0);
+				if (payprice > this.user.gold) {
+					this.availIntegal = this.user.gold;
+					this.priceValue[1] = 0;
+				} else {
+					this.availIntegal = payprice;
+					this.priceValue[1] = 0;
+				}
+				this.reload();
+				this.calculatepayPrice();
+			},
+			//计算支付价格
+			calculatepayPrice() {
+				if (this.deductionPrice == 0) {
+					this.payPrice = Math.abs(parseFloat(this.totalprice - (parseFloat(this.priceValue[1] / 100).toFixed(
+							2)))
+						.toFixed(2));
+				} else {
+					this.payPrice = Math.abs(parseFloat(this.orderPrice - (parseFloat(this.priceValue[1] / 100).toFixed(
+							2)) - this
+						.deductionPrice).toFixed(2));
+				}
+			},
+			rechangeload() {
+				this.isUse = false;
+				this.$nextTick(() => (this.isUse = true))
+			},
+			//刷新组件
+			reload() {
+				this.isDiscount = false;
+				this.$nextTick(() => (this.isDiscount = true))
+			},
 			//获取订单数据
 			qianzhuorderToPayByWx(item) {
 				let that = this;
@@ -722,7 +903,8 @@
 								title: '支付成功'
 							})
 							uni.reLaunch({
-								url: '/qianzhu-KFC/order-details/order-details?id=' + that
+								url: '/qianzhu-KFC/order-details/order-details?id=' +
+									that
 									.orderId
 							})
 						},
@@ -783,7 +965,6 @@
 
 	.footbtn {
 		bottom: 0px;
-		z-index: 9999;
 		position: fixed;
 	}
 
@@ -810,4 +991,36 @@
 		align-items: center;
 		display: flex;
 	}
+
+	.yhqky {
+		background: #ff0034;
+		color: #ffffff;
+		font-size: 14px;
+		padding-left: 5px;
+		padding-right: 5px;
+		margin-left: 8px;
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+
+	.yhprice {
+		margin-top: -30px;
+	}
+
+	.contrig {
+		margin-left: 180rpx;
+	}
+
+	.tccs {
+		box-shadow: 0rpx 0rpx 10rpx rgba(0, 0, 0, 0.2);
+		border: 1px solid #f6f6f6;
+		border-radius: 8px;
+
+		image {
+			float: left;
+			width: 170rpx;
+			max-height: 170rpx;
+			margin-left: 10px;
+		}
+	}
 </style>
diff --git a/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue b/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
index c683b54..59706d4 100644
--- a/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
+++ b/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
@@ -77,7 +77,7 @@
 
 
 		<!-- 弹窗选择规格 -->
-		<wybPopup ref="popup" type="bottom" width="500" height="1000" scrollY="true" radius="6" :showCloseIcon="true">
+		<wybPopup ref="popup" type="bottom" width="500" height="700"  scrollY="true" radius="6" :showCloseIcon="true">
 			<image mode="widthFix" class="width40w mart40" :src="kfcimgs"></image>
 			<view class="width100 line1 mart10"></view>
 			<view class="mart20 width90 font18 fontwig6 fcor333">{{kfcname}}</view>
@@ -89,9 +89,9 @@
 					{{item.productName}}
 				</view>
 			</view>
-			<view class="height20"></view>
+			<view class="height150"></view>
 			<view class="wybfot width100">
-				<view class="height50 pricefot alijusstart ">
+				<view class="height50 pricefot alijusstart backcorfff">
 					<view class="width60 margle10">
 						¥<text class="font24 fontwig6 fcor333 margle">{{kfcprice}}</text>
 					</view>
@@ -564,13 +564,6 @@
 
 	}
 
-	.footbtn {
-		height: 50px;
-		background-color: #000000;
-		display: flex;
-		bottom: 0px;
-	}
-
 	.pricefot {
 		border-radius: 15px 15px 0 0;
 		box-shadow: 0px 5px 20px #333333;
diff --git a/qianzhu-KFC/menu-list/menu-list.vue b/qianzhu-KFC/menu-list/menu-list.vue
index fdd6d59..97208e6 100644
--- a/qianzhu-KFC/menu-list/menu-list.vue
+++ b/qianzhu-KFC/menu-list/menu-list.vue
@@ -46,15 +46,21 @@
 							<view class="width100 font12 color2f6f43">¥<text
 									class="font18 fontwig6 margle">{{titem.salesTallPrice}}</text>
 							</view>
-							<view class="width100 font14 mart5 color2f6f43" v-if="titem.marketTallPrice != titem.salesTallPrice">
-								已减¥{{(titem.marketTallPrice - titem.salesTallPrice).toFixed(2)}}元</view>
-								<view class="width100 height20 font14 mart5 color2f6f43" v-if="titem.marketTallPrice == titem.salesTallPrice">
-									</view>
-							<view class="width100 font14 mart5 fcor999" v-if="titem.marketTallPrice != titem.salesTallPrice" style="text-decoration: line-through;">
+							<view class="width100 font14 mart5 color2f6f43"
+								v-if="titem.marketTallPrice != titem.salesTallPrice">
+								已减¥{{(titem.marketTallPrice - titem.salesTallPrice).toFixed(2)}}元</view>
+							<view class="width100 height20 font14 mart5 color2f6f43"
+								v-if="titem.marketTallPrice == titem.salesTallPrice">
+							</view>
+							<view class="width100 font14 mart5 fcor999"
+								v-if="titem.marketTallPrice != titem.salesTallPrice"
+								style="text-decoration: line-through;">
 								原价¥{{titem.marketTallPrice}}
-							</view>
-							<view class="width100 height20 font14 mart5 fcor999" v-if="titem.marketTallPrice == titem.salesTallPrice" style="text-decoration: line-through;">
-								
+							</view>
+							<view class="width100 height20 font14 mart5 fcor999"
+								v-if="titem.marketTallPrice == titem.salesTallPrice"
+								style="text-decoration: line-through;">
+
 							</view>
 							<view class="mart10 icon-click fotrt">
 								<!-- <image class="btn-reduce" mode="widthFix" src="../static/imgs/reduce.png"></image> -->
@@ -73,9 +79,9 @@
 
 
 		<!-- 弹窗选择规格 -->
-		<wybPopup ref="popup" type="bottom" width="500" height="1000" scrollY="true" radius="6" :showCloseIcon="true">
+		<wybPopup ref="popup" type="bottom" width="500" height="700" :scrollY="true" radius="6" :showCloseIcon="true">
 			<image mode="widthFix" class="width40w mart40" :src="cbkchangelist.defaultImage"></image>
-			<view class="width100 line1 mart10"></view>
+			<view class="width100 line1"></view>
 			<view class="mart20 width90 font18 fontwig6 fcor333">{{cbkchangelist.name}}</view>
 			<view class="width90 mart10">
 				<view class="fcor333 font16 fontwig6">杯型</view>
@@ -125,7 +131,7 @@
 					{{item}}
 				</view>
 			</view>
-			<view class="height30"></view>
+			<view class="height150"></view>
 			<view class="wybfot width100">
 				<view class="height70 pricefot alijusstart backcorfff">
 					<view class="width60 margle10">
@@ -300,12 +306,12 @@
 
 			},
 			decreaseCart(item) {
-				if (item.num) {
+				if (item.num) {
 					item.num--
-					this.shoppingcart.forEach((good) => {
-						if (this.checinfo(good, item) === true) {
-							good.num = item.num
-						} 
+					this.shoppingcart.forEach((good) => {
+						if (this.checinfo(good, item) === true) {
+							good.num = item.num
+						}
 					})
 				}
 			},
@@ -415,18 +421,18 @@
 					"imgs": this.cbkchangelist.defaultImage,
 					"price": this.salesTallPrice,
 					"oldprice": this.marketTallPrice
-				}
+				}
 				let istue = 0;
 				if (this.shoppingcart.length != 0) {
 					this.shoppingcart.forEach((good) => {
 						if (this.checinfo(good, datas) === true) {
-							good.num = good.num + this.nums;
-							istue = 1;
-						} 
-					})
-					if(istue == 0){
-						this.shoppingcart.push(datas);
-					}
+							good.num = good.num + this.nums;
+							istue = 1;
+						}
+					})
+					if (istue == 0) {
+						this.shoppingcart.push(datas);
+					}
 				} else {
 					this.shoppingcart.push(datas);
 				}
@@ -543,6 +549,7 @@
 		border-radius: 15px;
 		background: #fff;
 		min-height: 150px;
+
 		&:after {
 			content: '';
 			flex: 99;
@@ -553,7 +560,7 @@
 
 	.qzgoodsimg {
 		margin-top: -10px;
-		width: 120px;
+		width: 120px;
 		min-height: 100px;
 	}
 
@@ -598,13 +605,6 @@
 
 	}
 
-	.footbtn {
-		height: 50px;
-		background-color: #000000;
-		display: flex;
-		bottom: 0px;
-	}
-
 	.pricefot {
 		border-radius: 15px 15px 0 0;
 		box-shadow: 0px 5px 20px #333333;
diff --git a/qianzhu-KFC/order-details/order-details.vue b/qianzhu-KFC/order-details/order-details.vue
index d0d1582..3d1305f 100644
--- a/qianzhu-KFC/order-details/order-details.vue
+++ b/qianzhu-KFC/order-details/order-details.vue
@@ -12,7 +12,8 @@
 			<view class="stubtn mart15 backcorf2f6" v-if="typeid == 9">立即支付</view>
 			<!-- <view class="stubtn mart15 backcorf2f6" v-if="colorc3 == 9">¥ {{orderList.payPrice}}</view>
 			<view class="stubtn mart15 backcorf2f6" v-if="typeid == 4 || typeid == 10">¥ {{orderList.payPrice}}</view> -->
-			<view class="stubtn mart15" v-if="typeid == 4 || typeid == 10" style="background-color: #c72a20;" @click="jumppay()">立即支付
+			<view class="stubtn mart15" v-if="typeid == 4 || typeid == 10" style="background-color: #c72a20;"
+				@click="jumppay()">立即支付
 			</view>
 		</view>
 
@@ -37,12 +38,17 @@
 					</view>
 				</view>
 				<view v-if="typeid == 9 && orderList.object.orderItems[0].code">
-					<view class="fotct font18 width100 mart10 color2f6f43" v-for="(item,index) in orderList.object.orderItems" :key='index'>{{item.code}}</view>
+					<view class="fotct font18 width100 mart10 color2f6f43"
+						v-for="(item,index) in orderList.object.orderItems" :key='index'>{{item.code}}</view>
 				</view>
 				<view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && orderList.list">请取餐</view>
-				<view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && !orderList.list">{{orderList.statusDesc}}</view>
-				<view class="fotct font20 width100 mart10 color2f6f43" v-if="typeid == 9 && orderList.object.orderItems[0].code">请取餐</view>
-				<view class="fotct font20 width100 mart10 color2f6f43" v-if="typeid == 9 && !orderList.object.orderItems[0].code">{{orderList.statusDesc}}</view>
+				<view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && !orderList.list">
+					{{orderList.statusDesc}}
+				</view>
+				<view class="fotct font20 width100 mart10 color2f6f43"
+					v-if="typeid == 9 && orderList.object.orderItems[0].code">请取餐</view>
+				<view class="fotct font20 width100 mart10 color2f6f43"
+					v-if="typeid == 9 && !orderList.object.orderItems[0].code">{{orderList.statusDesc}}</view>
 				<view class="fotct font13 width100 mart15 fcor666">请至柜台凭取餐码取餐</view>
 				<view class="fotct font13 width100 mart5 fcor666">如有询问手机号尾号请告知</view>
 			</view>
@@ -70,9 +76,9 @@
 					<view class="width40 font13 fcor666">{{item.goodsName}}</view>
 					<view class="width10 font12 fcor999">x{{item.saleCount}}</view>
 					<view class="width20">
-						<view class="width100 fcor333 font12">¥<text class="fontwig6 font16">{{item.totalPrice}}</text>
+						<view class="width100 fcor333 font12">¥<text class="fontwig6 font16">{{item.goodsActualPrice}}</text>
 						</view>
-						<view class="width100 fcor999 font12" style="text-decoration: line-through;">
+						<view class="width100 fcor999 font12" v-if="item.goodsActualPrice != item.goodsPrice" style="text-decoration: line-through;">
 							¥{{item.goodsPrice}}</view>
 					</view>
 				</view>
@@ -97,14 +103,14 @@
 			<view class="width94 alijusstart mart20 font14 fcor666">
 				<view class="width30">订单号</view>
 				<view class="width70 fotrt">{{orderList.orderNo}}</view>
-			</view>
-			<view class="width94 alijusstart mart20 font14 fcor666" v-if="orderList.paySerialNo">
-				<view class="width30">支付流水号</view>
-				<view class="width70 fotrt">{{orderList.paySerialNo}}</view>
-			</view>
-			<view class="width94 alijusstart mart20 font14 fcor666" v-if="orderList.paySerialNo">
-				<view class="width30">下单时间</view>
-				<view class="width70 fotrt">{{orderList.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
+			</view>
+			<view class="width94 alijusstart mart20 font14 fcor666" v-if="orderList.paySerialNo">
+				<view class="width30">支付流水号</view>
+				<view class="width70 fotrt">{{orderList.paySerialNo}}</view>
+			</view>
+			<view class="width94 alijusstart mart20 font14 fcor666" v-if="orderList.paySerialNo">
+				<view class="width30">下单时间</view>
+				<view class="width70 fotrt">{{orderList.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
 			</view>
 			<view class="width94 alijusstart mart20 font14 fcor666" v-if="typeid == 4">
 				<view class="width30">就餐方式</view>
@@ -119,6 +125,10 @@
 			<view class="width94 alijusstart mart20 font14 fcor666">
 				<view class="width30">积分抵扣</view>
 				<view class="width70 fotrt">¥ {{(orderList.payGold / 100).toFixed(2)}}</view>
+			</view>
+			<view class="width94 alijusstart mart20 font14 fcor666">
+				<view class="width30">优惠券抵扣</view>
+				<view class="width70 fotrt">¥ {{orderList.deductionPrice}}</view>
 			</view>
 			<view class="width94 alijusstart mart20 font14 fcor666" v-if="orderList.payType">
 				<view class="width30">支付方式</view>
@@ -166,6 +176,7 @@
 				countdowns: '',
 				productType: '',
 				timer: null, //重复执行
+				timerdjs: null, //倒计时刷新
 				typeid: '', //类型区分
 				orderId: '', //订单id
 				coutnums: 0, //商品数量
@@ -182,12 +193,13 @@
 		},
 		onLoad(options) {
 			this.orderId = options.id;
+		},
+		onShow() {
 			this.getThirdOrderByOrderId();
-
-
 		},
 		onUnload() {
 			clearInterval(this.timer);
+			clearInterval(this.timerdjs);
 		},
 		methods: {
 			getAllCount() {
@@ -213,7 +225,17 @@
 								this.showtime()
 							})
 						}
+						if (this.orderList.orderStatus == 2) {
+							this.setTimer();
+						}
+						this.coutnums = 0;
 						this.getAllCount();
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
 					}
 				})
 			},
@@ -260,15 +282,29 @@
 				});
 			},
 			//跳转支付
-			jumppay() {
-				uni.redirectTo({
-					url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.orderList.id + '&amount=' + this.orderList.payPrice + '&productType=' + this.orderList.productType
+			jumppay() {
+				uni.redirectTo({
+					url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.orderList.id + '&amount=' +
+						this.orderList.payPrice + '&productType=' + this.orderList.productType
 				})
 			},
 			//选择方式
 			changedissr(item) {
 				this.sttypeid = item;
 			},
+			//定时刷新
+			setTimer() {
+				let holdTime = 10;
+				this.timerdjs = setInterval(() => {
+					if (holdTime <= 0) {
+						clearInterval(this.timerdjs);
+						this.getThirdOrderByOrderId();
+						holdTime = 10;
+						return;
+					}
+					holdTime--;
+				}, 1000)
+			},
 			//倒计时
 			showtime() {
 				var nowtime = new Date(), //获取当前时间
diff --git a/subPages/unionComfirmation/unionComfirmation.vue b/subPages/unionComfirmation/unionComfirmation.vue
index 43d4998..027baef 100644
--- a/subPages/unionComfirmation/unionComfirmation.vue
+++ b/subPages/unionComfirmation/unionComfirmation.vue
@@ -135,9 +135,9 @@
 		</view>
 		<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
-			<view class="width92 height110 tccs mart10" v-for="(items, index) in OrderPreList" :key="items"
+			<view class="width92 height110 tccs mart10" v-for="(items, index) in OrderPreList" :key="index"
 				@click="radioChanges(items)">
-				<image mode="widthFix" class="flleft mart10" :src="imageUrl+items.discountImg"></image>
+				<image mode="widthFix" class="mart10" :src="imageUrl+items.discountImg"></image>
 				<view class="contrig">
 					<view class="width80p flleft">
 						<view class="font16 fontwig6 fcor333 text1 paddtop25">{{items.discountName}}</view>
@@ -145,7 +145,14 @@
 					</view>
 					<view class="width20 flright">
 						<view class="yhprice">
-							<radio color="#0083f5" :checked="items.id == memDiscountId" />
+							<radio color="#0083f5"
+								v-if="items.discountCondition && orderPrice > items.discountCondition"
+								:checked="items.id == memDiscountId" />
+							<radio color="#0083f5"
+								v-if="items.discountCondition && orderPrice < items.discountCondition" disabled="true"
+								:checked="items.id == memDiscountId" />
+							<radio color="#0083f5" v-if="!items.discountCondition"
+								:checked="items.id == memDiscountId" />
 						</view>
 					</view>
 				</view>
@@ -322,7 +329,7 @@
 			},
 			//选择优惠券
 			radioChanges(item) {
-				this.paytheprice = this.orderPrice;
+				this.paytheprice = this.orderPrice;
 				this.rechangeload();
 				if (this.memDiscountId == item.id) { // 如果已经选中，则取消选中
 					this.memDiscountId = '';
@@ -333,9 +340,19 @@
 					this.memDiscountId = item.id;
 					if (item.discountType == 1) {
 						//满减价格
-						this.deductionPrice = item.discountPrice;
-						let oldprice = this.paytheprice - this.deductionPrice;
-						this.priceCaluc(oldprice);
+						if (this.orderPrice > item.discountCondition) {
+							this.memDiscountId = item.id;
+							//满减价格
+							this.deductionPrice = item.discountPrice;
+							let oldprice = this.orderPrice - this.deductionPrice;
+							this.priceCaluc(oldprice);
+						} else {
+							uni.showToast({
+								title: '请满' + item.discountCondition + '使用此券',
+								icon: 'none',
+								duration: 2000
+							})
+						}
 					}
 					if (item.discountType == 2) {
 						//抵扣价格
@@ -359,17 +376,17 @@
 				let pprice = parseFloat(item * 100).toFixed(0);
 				let payprice = parseFloat(item * 100 * zkprice).toFixed(0);
 				if (payprice > this.user.gold) {
-					this.availIntegal = this.user.gold;
+					this.availIntegal = this.user.gold;
 					this.priceValue[1] = 0;
 					// if (this.availIntegal < this.priceValue[1]) {
 					// 	this.priceValue[1] = this.user.gold;
-						// this.reload();
+					// this.reload();
 					// }
 				} else {
 					this.availIntegal = payprice;
 					this.priceValue[1] = 0;
 					// this.reload();
-				}
+				}
 				this.reload();
 				this.calculatepayPrice();
 			},
@@ -382,10 +399,10 @@
 					this.payPrice = parseFloat(this.orderPrice - (parseFloat(this.priceValue[1] / 100).toFixed(2)) - this
 						.deductionPrice).toFixed(2);
 				}
-			},
-			rechangeload() {
-				this.isUse = false;
-				this.$nextTick(() => (this.isUse = true))
+			},
+			rechangeload() {
+				this.isUse = false;
+				this.$nextTick(() => (this.isUse = true))
 			},
 			//刷新组件
 			reload() {
@@ -623,9 +640,9 @@
 					})
 				}
 			},
-			submitHandle(e) {
-				uni.showLoading({
-					title: '支付中...'
+			submitHandle(e) {
+				uni.showLoading({
+					title: '支付中...'
 				})
 				this.PaymentPassword = e.value;
 				if (this.PaymentPassword == '') {
@@ -633,7 +650,7 @@
 						title: '请勿手动关闭弹窗',
 						icon: 'none',
 						duration: 2000
-					})
+					})
 					uni.hideLoading();
 					return;
 				}
@@ -645,7 +662,7 @@
 						"integralNum": this.priceValue[1],
 						"password": this.PaymentPassword
 					}
-					addOrderPay(params).then(res => {
+					addOrderPay(params).then(res => {
 						uni.hideLoading();
 						if (res.return_code == '000000') {
 							this.orderId = res.return_data.id;
diff --git a/uni.scss b/uni.scss
index b3beb0f..0be7c28 100644
--- a/uni.scss
+++ b/uni.scss
@@ -610,6 +610,9 @@ $uni-font-size-paragraph:30upx;
 }
 .marb100 {
   margin-bottom: 100px;
+}
+.marb150 {
+  margin-bottom: 150px;
 }
 .marb50 {
   margin-bottom: 50px;