diff --git a/high-unionPay/Utils/Api.js b/high-unionPay/Utils/Api.js
index 9c7c89b..320b882 100644
--- a/high-unionPay/Utils/Api.js
+++ b/high-unionPay/Utils/Api.js
@@ -496,8 +496,8 @@ export const getRebateIntegral = params => {
 	return POST('POST', `${base}/common/getRebateIntegral`, params).then(res => res.data);
 }
 //站内信列表
-export const queryMsgByList = params => {
-	return POST('GET', `${base}/bsMsg/queryMsgByList`, params).then(res => res.data);
+export const getMsgByList = params => {
+	return POST('GET', `${base}/bsMsg/getMsgByList`, params).then(res => res.data);
 }
 
 
diff --git a/high-unionPay/pages.json b/high-unionPay/pages.json
index 7c7a0ec..bbc0b0b 100644
--- a/high-unionPay/pages.json
+++ b/high-unionPay/pages.json
@@ -942,17 +942,7 @@
 				}
 			}
 
-		}, {
-			"path": "kfc-details/kfc-details",
-			"style": {
-				"navigationBarTitleText": "详情",
-				"enablePullDownRefresh": false,
-				"app-plus": {
-					"titleNView": false //禁用原生导航栏
-				}
-			}
-
-		}, {
+		},{
 			"path": "kfc-menu-list/kfc-menu-list",
 			"style": {
 				"navigationBarTitleText": "菜单",
diff --git a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
index 1ed7a12..eb9c25d 100644
--- a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -77,13 +77,14 @@
 				¥0
 			</view>
 		</view>
-
-		<view class="width94 backcorfff mart10">
-			<view class="width94 alijusstart height50 font14 fcor666">
-				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">邀请码</view>
-				<input class="width60 fotrt font15" v-model="identificationCode" placeholder="请输入邀请码" />
+
+		<view class="width100 backcorfff mart10">
+			<view class="width96 alijusstart height50 font14 fcor666">
+				<view class="width40 fcor333 fontwig6 font16">邀请码</view>
+				<input class="width60 fotrt font15" style="padding-right: 6%;" v-model="identificationCode"
+					placeholder="请输入邀请码" />
 			</view>
-		</view>
+		</view>
 
 		<!-- //优惠券，积分抵扣 -->
 		<view class="width100 concont mart10 backcorfff">
@@ -150,37 +151,37 @@
 		<!-- //支付方式 -->
 		<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">支付方式:</view>
 		<view class="line1"></view>
-		<view class="width100 backcorfff">
+		<view class="width100 backcorfff" v-for="(item,index) in paytypeList" :key="index">
 
-			<view class="line1"></view>
-			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='weixin'">
+			<view class="line1" v-if="item == 4"></view>
+			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 4" @tap="paytype='4'">
 				<view class="width60 flleft font14">
 					银联支付
 				</view>
 				<view class="flright width30 fotct" v-if="isUse">
-					<radio :checked="paytype=='weixin'" color="#0083f5" />
+					<radio :checked="paytype=='4'" color="#0083f5" />
 				</view>
 			</view>
 
-			<view class="line1"></view>
-			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='oilcard'">
+			<view class="line1" v-if="item == 6"></view>
+			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 6" @tap="paytype='6'">
 				<view class="width60 flleft font14">
 					油卡支付<text class="font14 fcor666 margle">余额: {{oilPirce}}元</text>
 				</view>
 				<view class="flright width30 fotct" v-if="isUse">
-					<radio :checked="paytype=='oilcard'" @click="changeRiado()" color="#0083f5" />
+					<radio :checked="paytype=='6'" color="#0083f5" />
 				</view>
 			</view>
 
-			<!-- <view class="line1"></view>
-			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='gonghuika'">
-				<view class="width60 flleft fontwig6">
+			<view class="line1" v-if="item == 3"></view>
+			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 3" @tap="paytype='3'">
+				<view class="width60 flleft font14">
 					汇联通工会卡<text class="font14 fcor666 margle">余额: {{tongCardPrice}}元</text>
 				</view>
-				<view class="flright width30 fotct">
-					<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
+				<view class="flright width30 fotct" v-if="isUse">
+					<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
 				</view>
-			</view> -->
+			</view>
 		</view>
 
 		<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view>
@@ -202,25 +203,23 @@
 		<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 alijus" v-for="(items, index) in OrderPreList" :key="index"
-				@click="radioChanges(items.highDiscount,items)">
-				<image mode="widthFix" :src="imageUrl+items.highDiscount.discountImg"></image>
+				@click="radioChanges(items,items)">
+				<image mode="widthFix" :src="imageUrl+items.discountImg"></image>
 				<view class="alijus width60 margle10">
 					<view class="width80p">
-						<view class="font16 fontwig6 fcor333 text1">{{items.highDiscount.discountName}}</view>
+						<view class="font16 fontwig6 fcor333 text1">{{items.discountName}}</view>
 						<view class="font13 fcor999 mart5">
-							有效期:{{items.highDiscount.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+							有效期:{{items.useEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
 						</view>
 					</view>
 					<view class="width20 fotrt">
 						<view>
-							<radio
-								v-if="items.highDiscount.discountCondition && orderPrice >= items.highDiscount.discountCondition"
+							<radio v-if="items.discountCondition && orderPrice >= items.discountCondition"
 								color="#c72a20" :checked="items.id == memDiscountId" />
-							<radio
-								v-if="items.highDiscount.discountCondition && orderPrice < items.highDiscount.discountCondition"
+							<radio v-if="items.discountCondition && orderPrice < items.discountCondition"
 								color="#c72a20" disabled="true" :checked="items.id == memDiscountId" />
 
-							<radio v-if="!items.highDiscount.discountCondition" color="#c72a20"
+							<radio v-if="!items.discountCondition" color="#c72a20"
 								:checked="items.id == memDiscountId" />
 						</view>
 					</view>
@@ -234,19 +233,17 @@
 
 <script>
 	import {
-		orderToPay,
 		getHuiLianTongCardBalance,
-		hltUnionCardPay,
-		orderToGoldPay,
+		cardPay,
 		findUser,
-		oilCardPay,
 		getUserOrderPreList,
 		canUseDiscount,
-		addOrder,
-		cancelOrder,
+		create,
+		cancel,
 		unionPay,
 		oilPriceDiscountCompute,
-		getRebateIntegral
+		getRebateIntegral,
+		getThirdPartyByDetail
 	} from '../../../Utils/Api.js';
 	import ssPaymentPassword from '../../../components/sanshui-payment-password/index.vue';
 	import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
@@ -267,10 +264,8 @@
 				imageUrl: app.globalData.imgUrl,
 				oilPirce: 0, //油卡余额
 				user: '',
-				paytype: 'weixin',
+				paytype: '4',
 				PaymentPassword: '',
-				// timedeductionPrice: '0', //本次优惠金额
-
 				orderPrice: '', //原价
 				deductionPrice: '0.00', //优惠金额
 				OrderPreList: [], //优惠券数据
@@ -282,26 +277,51 @@
 				availIntegal: 0, // 可用积分
 				gasOrderList: '', //存的订单信息
 				rebateIntegral: '', //返回积分
-				Integrastu: 1 ,//返积分状态 
+				Integrastu: 1, //返积分状态 
 				identificationCode: '', //渠道商
+				paytypeList: [], //支付方式
 			}
 		},
 		onLoad(e) {
 			this.gasOrderList = app.globalData.pelletoilList;
-			this.orderPrice = this.gasOrderList.highChildOrderList[0].goodsPrice;
-			// #ifdef H5
-			this.identificationCode = app.globalData.staffCode;
-			// #endif
-			// #ifdef MP
-			this.identificationCode = app.globalData.identificationCode;
+			this.orderPrice = this.gasOrderList.highChildOrderList[0].goodsPrice;
+			// #ifdef H5
+			this.identificationCode = app.globalData.staffCode;
+			// #endif
+			// #ifdef MP
+			this.identificationCode = app.globalData.identificationCode;
 			// #endif
 		},
 		onShow() {
 			let that = this;
-			// that.paytype = '';
 			that.findUser();
 		},
 		methods: {
+			//查询支付方式
+			getThirdPartyByDetail() {
+				let datas = {
+					platformId: 3,
+					"companyId": app.globalData.companyId,
+					productType: 6
+				}
+				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);
+						let pprice = parseFloat(this.payPrice * 100).toFixed(0)
+						let payprice = parseFloat(this.payPrice * 100 * zkprice).toFixed(
+							0);
+						if (payprice > this.user.gold) {
+							this.availIntegal = this.user.gold;
+						} else {
+							this.availIntegal = payprice;
+						}
+					}
+				});
+			},
+			//查询我的资料
 			findUser() {
 				let params;
 				findUser(params).then(res => {
@@ -312,6 +332,9 @@
 							this.oilPirce = res.return_data.oilCard.amount;
 						}
 						this.canUseDiscount();
+						if (this.user.isSetHltCard) {
+							this.getHuiLianTongCardBalance();
+						}
 						this.oilPriceDiscountCompute();
 						uni.setStorage({
 							key: "user",
@@ -363,14 +386,9 @@
 					if (res.return_code == '000000') {
 						this.orderList = res.return_data;
 						this.payPrice = res.return_data.payPrice;
-						let payprice = parseFloat(this.payPrice * 100).toFixed(
-							0);
-						if (payprice > this.user.gold) {
-							this.availIntegal = this.user.gold;
-						} else {
-							this.availIntegal = payprice;
-						}
 						this.getRebateIntegral();
+						this.getThirdPartyByDetail();
+
 					}
 				})
 			},
@@ -448,7 +466,7 @@
 					this.payPrice = Math.abs(parseFloat(this.orderPrice - (parseFloat(this.priceValue[1] / 100).toFixed(
 							2)) - this
 						.deductionPrice).toFixed(2));
-				}
+				}
 				this.getRebateIntegral();
 			},
 			rechangeload() {
@@ -502,24 +520,20 @@
 				})
 				if (this.payPrice == 0 && !this.orderNo) {
 					let goods = {
-						"identificationCode": this.gasOrderList.identificationCode,
-						"promoteCode":this.identificationCode,
-						"payGold": this.priceValue[1],
-						"memDiscountId": this.memDiscountId,
-						"payPwd": this.PaymentPassword,
-						"highChildOrderList": [{
-							"goodsType": this.gasOrderList.highChildOrderList[0].goodsType,
-							"goodsId": this.gasOrderList.highChildOrderList[0].goodsId,
-							"saleCount": 1,
-							"goodsPrice": this.gasOrderList.highChildOrderList[0].goodsPrice,
+						"childOrderList": [{
 							"gasGunNo": this.gasOrderList.highChildOrderList[0].gasGunNo,
 							"gasOilNo": this.gasOrderList.highChildOrderList[0].gasOilNo,
-							"gasOilType": this.gasOrderList.highChildOrderList[0].gasOilType,
-							"gasPriceGun": this.gasOrderList.highChildOrderList[0].gasPriceGun,
-							"gasPriceVip": this.gasOrderList.highChildOrderList[0].gasPriceVip,
-						}]
+							"isTyAgent": this.gasOrderList.isTyAgent,
+							"goodsId": this.gasOrderList.highChildOrderList[0].goodsId,
+							"goodsPrice": this.gasOrderList.highChildOrderList[0].goodsPrice,
+							"goodsType": 3,
+							"saleCount": 1,
+						}],
+						"payGold": this.priceValue[1],
+						"promoteCode": this.identificationCode,
+						"payPwd": this.PaymentPassword
 					}
-					addOrder(goods).then(res => {
+					create(goods).then(res => {
 						uni.hideLoading();
 						if (res.return_code == '000000') {
 							if (app.globalData.gasKey) {
@@ -533,36 +547,11 @@
 								})
 
 							}
-							this.orderNo = res.return_data.id;
+							this.orderNo = res.return_data.orderNo;
 							uni.reLaunch({
-								url: '/pages/goods/refuel-succes/refuel-succes?id=' +
+								url: '/pages/user/order_details/order_details?id=' +
 									this.orderNo
 							});
-						} else {
-							uni.showToast({
-								title: res.return_msg,
-								icon: 'none',
-								duration: 2000
-							});
-						}
-					})
-					return;
-				}
-				if (this.paytype == 'jifen') {
-					let params = {
-						"orderId": this.orderNo,
-						"password": this.PaymentPassword
-					}
-					orderToGoldPay(params).then(res => {
-						uni.hideLoading();
-						if (res.return_code == '000000') {
-							uni.showToast({
-								title: '支付成功'
-							})
-							uni.reLaunch({
-								url: '/pages/goods/refuel-succes/refuel-succes?id=' + this.orderNo
-							});
-							return;
 						}
 						if (res.return_code == '102130') {
 							uni.navigateTo({
@@ -570,102 +559,72 @@
 							})
 							return;
 						}
-						uni.showToast({
-							title: res.return_msg,
-							icon: 'none'
-						})
-					})
-					return;
-				}
 
-				if (this.paytype == 'gonghuika') {
-					let params = {
-						"orderId": this.orderNo,
-						"cardNo": this.user.hltCardNo.cardNo,
-						"password": this.PaymentPassword
-					}
-					hltUnionCardPay(params).then(res => {
-						uni.hideLoading();
-						if (res.return_code == '000000') {
-							uni.showToast({
-								title: '支付成功'
-							})
-							uni.reLaunch({
-								url: '/pages/goods/refuel-succes/refuel-succes?id=' + this.orderNo
-							});
-							return;
-						}
-						if (res.return_code == '102130') {
-							this.cancelOrder();
-							uni.navigateTo({
-								url: '../../login/updatePas/updatePas'
-							})
-							return;
-						}
-						if (res.return_code == '102132') {
-							this.cancelOrder();
-							uni.showToast({
-								title: res.return_msg,
-								icon: 'none'
-							})
-							return;
-						}
-						uni.navigateBack({})
 						uni.showToast({
 							title: res.return_msg,
-							icon: 'none'
-						})
+							icon: 'none',
+							duration: 2000
+						});
+
 					})
 					return;
 				}
-				if (this.paytype == 'oilcard') {
+				if (this.paytype == '3' || this.paytype == '6') {
+					let cardNo;
+					if (this.paytype == 3) {
+						cardNo = this.user.hltCardNo.cardNo;
+					}
+					if (this.paytype == 6) {
+						cardNo = this.user.oilCard.cardNo;
+					}
 					let params = {
-						"orderId": this.orderNo,
-						"cardNo": this.user.oilCard.cardNo,
+						"orderNo": this.orderNo,
+						"cardNo": cardNo,
 						"password": this.PaymentPassword
 					}
-					oilCardPay(params).then(res => {
+					cardPay(params).then(res => {
 						uni.hideLoading();
 						if (res.return_code == '000000') {
 							uni.showToast({
 								title: '支付成功'
 							})
 							uni.reLaunch({
-								url: '/pages/goods/refuel-succes/refuel-succes?id=' + this.orderNo
+								url: '/pages/user/order_details/order_details?id=' +
+									this.orderNo
 							});
 							return;
 						}
 						if (res.return_code == '102130') {
-							this.cancelOrder();
+							this.cancel();
 							uni.navigateTo({
 								url: '../../login/updatePas/updatePas'
 							})
 							return;
 						}
 						if (res.return_code == '102132') {
-							this.cancelOrder();
+							this.cancel();
 							uni.showToast({
 								title: res.return_msg,
 								icon: 'none'
 							})
 							return;
 						}
+						uni.navigateBack({})
 						uni.showToast({
 							title: res.return_msg,
 							icon: 'none'
 						})
-						uni.navigateBack({})
 					})
 					return;
 				}
 
 			},
 			//取消订单
-			cancelOrder() {
+			cancel() {
 				let params = {
-					orderId: this.orderNo
+					orderNo: this.orderNo
 				}
-				cancelOrder(params).then(res => {
+				cancel(params).then(res => {
 					if (res.return_code == '000000') {
 						this.orderNo = '';
 					}
@@ -674,23 +633,7 @@
 			},
 			//获取选择支付方式
 			changeRiado() {
-				// if (!this.user.isSetHltCard && this.paytype == 'gonghuika') {
-				// 	uni.showToast({
-				// 		icon: 'none',
-				// 		title: '当前账号还未绑定,前往绑定',
-				// 		duration: 2000,
-				// 		success() {
-				// 			setTimeout(() => {
-				// 				uni.navigateTo({
-				// 					url: '../../user/bindingCard/bindingCard'
-				// 				})
-				// 			}, 1000)
-				// 		}
-				// 	});
-				// 	return;
-				// }
-
-				if (!this.user.isSetOilCard) {
+				if (!this.user.setHltCard) {
 					uni.showToast({
 						icon: 'none',
 						title: '当前账号还未绑定,前往绑定',
@@ -719,7 +662,7 @@
 				});
 			},
 			//下单
-			addOrder() {
+			create() {
 				if (this.payPrice == 0) {
 					this.$refs.paymentPassword.modalFun('show');
 					return;
@@ -741,26 +684,23 @@
 					title: '提交订单中...'
 				})
 				let goods = {
-					"identificationCode": this.gasOrderList.identificationCode,
-					"promoteCode":this.identificationCode,
-					"payGold": this.priceValue[1],
-					"memDiscountId": this.memDiscountId,
-					"highChildOrderList": [{
-						"goodsType": this.gasOrderList.highChildOrderList[0].goodsType,
-						"goodsId": this.gasOrderList.highChildOrderList[0].goodsId,
-						"saleCount": 1,
-						"goodsPrice": this.gasOrderList.highChildOrderList[0].goodsPrice,
+					"childOrderList": [{
 						"gasGunNo": this.gasOrderList.highChildOrderList[0].gasGunNo,
 						"gasOilNo": this.gasOrderList.highChildOrderList[0].gasOilNo,
-						"gasOilType": this.gasOrderList.highChildOrderList[0].gasOilType,
-						"gasPriceGun": this.gasOrderList.highChildOrderList[0].gasPriceGun,
-						"gasPriceVip": this.gasOrderList.highChildOrderList[0].gasPriceVip,
-					}]
+						"goodsId": this.gasOrderList.highChildOrderList[0].goodsId,
+						"goodsPrice": this.gasOrderList.highChildOrderList[0].goodsPrice,
+						"goodsType": 3,
+						"saleCount": 1,
+					}],
+					"payGold": this.priceValue[1],
+					"promoteCode": this.identificationCode,
+					"payPwd": this.PaymentPassword,
+					"memDiscountId": this.memDiscountId
 				}
-				addOrder(goods).then(res => {
+				create(goods).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
-						this.orderNo = res.return_data.id;
+						this.orderNo = res.return_data.orderNo;
 						this.orderToPay();
 					} else {
 						uni.showToast({
@@ -782,11 +722,11 @@
 					})
 					return;
 				}
-				if (that.paytype == 'weixin') {
+				if (that.paytype == '4') {
 					that.unionPay();
 					return;
 				}
-				if (that.paytype == 'gonghuika') {
+				if (that.paytype == '6') {
 					if (!that.user.isSetPayPwd) {
 						uni.navigateTo({
 							url: '../../login/updatePas/updatePas'
@@ -811,7 +751,7 @@
 					that.$refs.paymentPassword.modalFun('show');
 				}
 
-				if (that.paytype == 'oilcard') {
+				if (that.paytype == '3') {
 					if (!that.user.isSetPayPwd) {
 						uni.navigateTo({
 							url: '../../login/updatePas/updatePas'
@@ -836,21 +776,11 @@
 					that.$refs.paymentPassword.modalFun('show');
 				}
 
-				if (that.paytype == 'jifen') {
-					if (!that.user.isSetPayPwd) {
-						uni.navigateTo({
-							url: '../../login/updatePas/updatePas'
-						})
-						return;
-					}
-					that.$refs.paymentPassword.modalFun('show');
-				}
-
 			},
 			//银联获取信息
 			unionPay() {
 				let goods = {
-					"orderId": this.orderNo
+					"orderNo": this.orderNo
 				}
 				unionPay(goods).then(res => {
 					if (res.return_code == '000000') {
@@ -875,8 +805,8 @@
 								title: '支付成功'
 							})
 							uni.reLaunch({
-								url: '/pages/goods/refuel-succes/refuel-succes?id=' + that
-									.orderNo
+								url: '/pages/user/order_details/order_details?id=' +
+									that.orderNo
 							});
 						},
 						fail: function(err) {
@@ -898,6 +828,8 @@
 <style lang="less">
 	page {
 		background-color: #f7f7f7;
+		overflow: hidden;
+		overflow-y: auto;
 	}
 
 	.conImg {
diff --git a/high-unionPay/pages/order/confirmation.vue b/high-unionPay/pages/order/confirmation.vue
index 6b6cf0d..f6988ad 100644
--- a/high-unionPay/pages/order/confirmation.vue
+++ b/high-unionPay/pages/order/confirmation.vue
@@ -150,7 +150,7 @@
 				<view class="width94 line1 mart5 marb5" v-if="item == 3"></view>
 				<view class="height50 width100 backcorfff" @tap="paytype='3'" v-if="item == 3">
 					<view class="width70 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
-						工会卡支付<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
+						汇联通工会卡<text class="font14 fcor666 margle">可用余额: {{tongCardPrice}}元</text>
 					</view>
 					<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
 						style="align-items: center;" v-if="isUse">
@@ -245,7 +245,6 @@
 				rechargeDes: '', // 支付详情
 				rebateIntegral: '', //返回积分
 				Integrastu: 1, //返积分状态
-				typeId: '',
 				contactPepole: '', //联系人
 				contactPhone: '', //联系电话
 				contactAddress: '' //联系地址
@@ -258,7 +257,6 @@
 		},
 		onShow() {
 			let that = this;
-			that.paytype = '';
 			that.user = app.globalData.userInfo;
 			that.findUser();
 		},
@@ -294,8 +292,8 @@
 			getThirdPartyByDetail() {
 				let datas = {
 					platformId: 3,
-					regionId: app.globalData.cityId,
-					productType: 4,
+					"companyId": app.globalData.companyId,
+					productType: 5,
 					productId: this.couponList.couponSource
 				}
 				getThirdPartyByDetail(datas).then(res => {
@@ -579,7 +577,13 @@
 					uni.redirectTo({
 						url: '../tabBar/order/stagesUrl/stagesUrl?orderid=' + that.orderId
 					})
-				} else if (that.paytype == '3') {
+				} else if (that.paytype == '3') {
+					if (!that.user.isSetPayPwd) {
+						uni.navigateTo({
+							url: '../login/updatePas/updatePas'
+						})
+						return;
+					}
 					if (that.tongCardPrice < that.paytheprice) {
 						uni.showToast({
 							icon: 'none',
@@ -588,12 +592,7 @@
 						});
 						return;
 					}
-					if (!that.user.isSetPayPwd) {
-						uni.navigateTo({
-							url: '../login/updatePas/updatePas'
-						})
-						return;
-					}
+					
 					if (!that.user.isSetHltCard) {
 						uni.showToast({
 							icon: 'none',
diff --git a/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue b/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue
index 247796a..a4988e8 100644
--- a/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue
+++ b/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue
@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<view class="width94 comorder">
+
+		<view class="width94 comorder mart10">
 			<view class="height100p width94 goodsimg">
 				<image class="flleft" mode="widthFix" v-if="rechargeModel == 3" src="../../../static/img/cz1.jpg">
 				</image>
@@ -132,7 +133,7 @@
 			</view>
 		</view>
 		<image :src="imagewxUrl+imgadres1" class="width100 mart20 marb30" mode="widthFix"></image>
-		<view class="width100 height60"></view>
+		<view class="width100 height110"></view>
 		<view class="footer">
 			<view class="settlement">
 				<!-- v-if="paytype == '2' || paytype == '3' " -->
@@ -286,7 +287,9 @@
 						app.globalData.userInfo = res.return_data;
 						this.user = res.return_data;
 						this.findById();
-						this.getHuiLianTongCardBalance();
+						if (this.user.hltCardNo) {
+							this.getHuiLianTongCardBalance();
+						}
 						this.getRebateIntegral();
 						uni.setStorage({
 							key: "user",
@@ -331,9 +334,6 @@
 			//查询工会卡余额
 			//查询详情
 			getHuiLianTongCardBalance() {
-				if (!this.user.hltCardNo) {
-					return;
-				}
 				let params = {
 					cardNo: this.user.hltCardNo.cardNo
 				}
@@ -512,11 +512,18 @@
 			orderToPayByWx(item) {
 				let that = this;
 				if (that.paytype == '3') {
-					if (that.tongCardPrice < that.payPrice) {
+					if (!that.user.isSetHltCard) {
 						uni.showToast({
 							icon: 'none',
-							title: '工会卡余额不足',
+							title: '当前账号还未绑定,前往绑定',
 							duration: 2000,
+							success() {
+								setTimeout(() => {
+									uni.navigateTo({
+										url: '../../pages/user/bindingCard/bindingCard'
+									})
+								}, 1000)
+							}
 						});
 						return;
 					}
@@ -526,21 +533,16 @@
 						})
 						return;
 					}
-					if (!that.user.isSetHltCard) {
+					if (that.tongCardPrice < that.payPrice) {
 						uni.showToast({
 							icon: 'none',
-							title: '当前账号还未绑定,前往绑定',
+							title: '工会卡余额不足',
 							duration: 2000,
-							success() {
-								setTimeout(() => {
-									uni.navigateTo({
-										url: '../../pages/user/bindingCard/bindingCard'
-									})
-								}, 1000)
-							}
 						});
 						return;
 					}
+
+
 					that.$refs.paymentPassword.modalFun('show');
 					return;
 				}
@@ -564,7 +566,7 @@
 								title: '支付成功'
 							})
 							uni.reLaunch({
-								url: '../Phone-recharge-details/Phone-recharge-details?id=' +
+								url: '/pages/user/order_details/order_details?id=' +
 									item1
 							})
 						},
@@ -611,7 +613,7 @@
 						if (res.return_code == '000000') {
 							this.orderId = res.return_data.orderNo;
 							uni.reLaunch({
-								url: '../Phone-recharge-details/Phone-recharge-details?id=' +
+								url: '/pages/user/order_details/order_details?id=' +
 									this.orderId
 							})
 							return;
@@ -642,8 +644,7 @@
 							title: '支付成功'
 						})
 						uni.reLaunch({
-							url: '../Phone-recharge-details/Phone-recharge-details?id=' +
-								this.orderId
+							url: '/pages/user/order_details/order_details?id=' + this.orderId
 						})
 						return;
 					}
diff --git a/high-unionPay/pages/user/news/news.vue b/high-unionPay/pages/user/news/news.vue
index 59b2a13..9bc054b 100644
--- a/high-unionPay/pages/user/news/news.vue
+++ b/high-unionPay/pages/user/news/news.vue
@@ -3,17 +3,17 @@
 		<!-- 顶部类型 -->
 		<scroll-view scroll-x='true' class="srollview width100" :style="{top:headerTop}" scroll-with-animation>
 			<view class="conent" :class="[newstypeid == item.codeValue ? 'activeconent' : 'frontconent']"
-				v-for="(item,index) in newsTyplist" :key="index" @click="queryMsgByList(item.codeValue)">
-				{{item.codeName}}</view>
+				v-for="(item,index) in newsTyplist" :key="index" @click="changeValue(item.codeValue)">
+				{{item.codeName}}
+			</view>
 		</scroll-view>
 		<view class="mart10 height70"></view>
 		<!-- 内容 -->
-		
-		<view v-if="newsList == ''"
-			class="mart60 fotct font14 fcor666">
+
+		<view v-if="newsList == ''" class="mart60 fotct font14 fcor666">
 			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
 		</view>
-		<view class="newscont width90 border-8r backcorfff mart20" v-for="(item,index) in newsList" :key="index">
+		<view class="newscont width90 border-8r backcorfff mart20" v-for="(item,index) in newsList" :key="index" @click="jumporther(item)">
 			<view class="alijusstart mart10 margle10" v-if="item.type == 1">
 				<image src="../../../static/img/user/notive.png" mode="widthFix" class="icon30"></image>
 				<text class="font18 margle" style="color: #0B1D83;">服务通知</text>
@@ -35,8 +35,8 @@
 
 			<!-- 交易信息 -->
 			<view class="width90 mart20" v-if="item.type == 2">
-				<view class="font18 fcor333" >{{item.title}}</view>
-				<view class="mart10 border-r backcor9">
+				<view class="font18 fcor333">{{item.title}}</view>
+				<view class="mart15 border-r backcor9">
 					<view class="font20 colore95 fontwig6 paddtop10 fotct">¥{{item.content | msgFormat('price')}}</view>
 					<view class="width94 mart10 alijusstart font14">
 						<view class="fontwig6 fcor333 width30">交易对象</view>
@@ -47,8 +47,8 @@
 						<view class="fontwig6 fcor333 width30">交易时间</view>
 						<view class="width70 fcor666 fotrt">{{item.content | msgFormat('time') }}</view>
 					</view>
-					<view class="font16 fcor666 alijus mart10 fotct paddbotm20">查看详情<image
-							src="../../../static/img/jt.png" mode="widthFix" class="icon15 margle"></image>
+					<view class="font16 fcor666 alijus mart15 fotct paddbotm20" @click="jumpDetails(item.content)">查看详情
+						<image src="../../../static/img/jt.png" mode="widthFix" class="icon15 margle"></image>
 					</view>
 				</view>
 			</view>
@@ -73,7 +73,7 @@
 
 <script>
 	import {
-		queryMsgByList,
+		getMsgByList,
 		getDictionaryByCodeType
 	} from '../../../Utils/Api.js';
 	let app = getApp();
@@ -91,14 +91,17 @@
 		},
 		filters: {
 			//过滤器 用于格式化时间
-			msgFormat: function(value,value1) {
-				let a  = JSON.parse(value);
+			msgFormat: function(value, value1) {
+				let a = JSON.parse(value);
 				return a[value1];
 			}
 		},
-		onLoad() {
+		onLoad() {
 			this.getDictionaryByCodeType();
 		},
+		// onShow() {
+		// 	this.getDictionaryByCodeType();
+		// },
 		methods: {
 			//查询类型
 			getDictionaryByCodeType() {
@@ -109,24 +112,55 @@
 					if (res.return_code == '000000') {
 						this.newsTyplist = res.return_data;
 						this.newstypeid = res.return_data[0].codeValue;
-						this.queryMsgByList(res.return_data[0].codeValue);
+						this.getMsgByList(res.return_data[0].codeValue);
 					}
 				})
 			},
+			//切换
+			changeValue(item) {
+				this.newsList = [];
+				this.getMsgByList(item);
+			},
 			//查询列表
-			queryMsgByList(item) {
+			getMsgByList(item) {
 				this.newstypeid = item;
 				let datas = {
 					companyId: app.globalData.companyId,
 					type: item
 				}
-				queryMsgByList(datas).then(res => {
-					if (res.return_code == '000000' && res.return_data) {
+				getMsgByList(datas).then(res => {
+					if (res.return_code == '000000' && res.return_data != '') {
 						this.newsList = res.return_data;
-					}else{
+					} else {
 						this.newsList = [];
 					}
 				})
+			},
+			//根据类型跳转详情
+			jumpDetails(item1) {
+				let lists = JSON.parse(item1);
+				if (lists.productType == 1 || lists.productType == 2 || lists.productType == 3) {
+					uni.navigateTo({
+						url: '/qianzhu-KFC/order-details/order-details?id=' + lists.orderNo
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/user/order_details/order_details?id=' + lists.orderNo
+					})
+				}
+			},
+			//客服信息
+			jumporther(item){
+				if(item.jumpType == 2){
+					uni.navigateTo({
+						url: '/pages/tabBar/order/webUrl/webUrl?url=' + item.content
+					})
+				}
+				if(item.jumpType == 3){
+					uni.navigateTo({
+						url:item.content
+					})
+				}
 			}
 		}
 	}
diff --git a/high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue b/high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue
index f9a9719..f47a932 100644
--- a/high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue
+++ b/high-unionPay/qianzhu-KFC/confirmOrder/confirmOrder.vue
@@ -70,6 +70,14 @@
 				</view>
 			</view>
 		</view>
+
+		<view class="width94 backcorfff mart10">
+			<view class="width94 alijusstart height50 font14 fcor666">
+				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">邀请码</view>
+				<input class="width60 fotrt font15" v-model="identificationCode" placeholder="请输入邀请码" />
+			</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%;">
@@ -115,6 +123,7 @@
 				</view>
 			</view>
 			<view class="width94 line1 marb5"></view>
+
 			<view class="height40 width100 backcorfff">
 				<view class="width40 flleft fcor666 font15 text1 alijusstart" style="padding-left: 2%;">
 					<image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
@@ -427,10 +436,11 @@
 					result = result1.toFixed(2);
 				})
 
-				// let resul2 = 0;
+				let resul2 = 0;
 				let result3 = 0;
 				this.orderList.forEach((good) => {
-					result3 += this.accMul(good.num, good.oldprice)
+					resul2 += this.accMul(good.num, good.oldprice);
+					result3 = resul2.toFixed(2);
 					this.disconutprice = (result3 - result).toFixed(2);
 				})
 
@@ -741,11 +751,18 @@
 						}
 					})
 				} else if (that.paytype == '3') {
-					if (that.tongCardPrice < that.payPrice) {
+					if (!that.user.isSetHltCard) {
 						uni.showToast({
 							icon: 'none',
-							title: '工会卡余额不足',
+							title: '当前账号还未绑定,前往绑定',
 							duration: 2000,
+							success() {
+								setTimeout(() => {
+									uni.navigateTo({
+										url: '../../pages/user/bindingCard/bindingCard'
+									})
+								}, 1000)
+							}
 						});
 						return;
 					}
@@ -755,21 +772,16 @@
 						})
 						return;
 					}
-					if (!that.user.isSetHltCard) {
+					if (that.tongCardPrice < that.payPrice) {
 						uni.showToast({
 							icon: 'none',
-							title: '当前账号还未绑定,前往绑定',
+							title: '工会卡余额不足',
 							duration: 2000,
-							success() {
-								setTimeout(() => {
-									uni.navigateTo({
-										url: '../../pages/user/bindingCard/bindingCard'
-									})
-								}, 1000)
-							}
 						});
 						return;
 					}
+
+
 					that.$refs.paymentPassword.modalFun('show');
 				} else {
 					uni.showToast({
diff --git a/high-unionPay/qianzhu-KFC/kfc-details/kfc-details.vue b/high-unionPay/qianzhu-KFC/kfc-details/kfc-details.vue
deleted file mode 100644
index 8183fd0..0000000
--- a/high-unionPay/qianzhu-KFC/kfc-details/kfc-details.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style>
-
-</style>
diff --git a/high-unionPay/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue b/high-unionPay/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
index 163fa3f..c62edd3 100644
--- a/high-unionPay/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
+++ b/high-unionPay/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
@@ -499,12 +499,6 @@
 
 				return true;
 
-			},
-			//跳转详情
-			navToList() {
-				uni.navigateTo({
-					url: '../kfc-details/kfc-details'
-				})
 			}
 		}
 	}
diff --git a/high-unionPay/qianzhu-KFC/order-details/order-details.vue b/high-unionPay/qianzhu-KFC/order-details/order-details.vue
index 3accc1e..8f86477 100644
--- a/high-unionPay/qianzhu-KFC/order-details/order-details.vue
+++ b/high-unionPay/qianzhu-KFC/order-details/order-details.vue
@@ -11,10 +11,10 @@
 		</view>
 
 		<view class=" paddtop10 paddbotm10 headsbg backcorfff fotct" v-if="orderList.orderStatus != 1  && typeid != 10">
-			<view class="headotherstu alijus font18 fontwig6"
+			<!-- <view class="headotherstu alijus font18 fontwig6"
 				v-if="orderList.orderStatus != 2 && orderList.orderStatus != 3">
 				<image mode="widthFix" class="width50" src="../static/imgs/otherstu.png"></image>
-			</view>
+			</view> -->
 			<view class="width100  font18 fcorfff mart15"
 				v-if=" orderList.orderStatus != 2  && orderList.orderStatus != 3">
 				{{typeText[orderList.orderStatus]}}
@@ -38,9 +38,9 @@
 					</view>
 				</view>
 
-				<view class="font12 width90 fcor666 mart10 marb10 fotlt">订单已准备完毕，喜欢您再来</view>
+				<view class="font12 width90 fcor666 mart10 marb10 fotlt" v-if="recinfo.list">订单已准备完毕，喜欢您再来</view>
 
-				<view class="width90 height70 backcorfff border-r alijusstart paddbotm10">
+				<view class="width90 height70 backcorfff border-r alijusstart paddbotm10" v-if="recinfo.list">
 					<view class="width70 fotlt">
 						<view class="width94 fcor333 font14">请至柜台凭取餐码取餐</view>
 						<view class="width94 fcor666 font12 mart5">如有询问手机尾号请点击右侧按钮查看</view>
@@ -64,19 +64,21 @@
 						v-for="(item,index) in recinfo.object.orderItems" :key='index'>{{item.code}}</view>
 				</view>
 				<view class="fotct font20 width100 mart10 colorc3" v-if="typeid == 4 && !recinfo.list">
-					{{recinfo.statusDesc}}
+					<!-- {{recinfo.statusDesc}} -->
+					{{typeText[orderList.orderStatus]}}
 				</view>
 				<view class="fotct font20 width100 mart10 color2f6f43"
 					v-if="typeid == 9 && !recinfo.object.orderItems[0].code">{{recinfo.statusDesc}}</view>
 			</view>
 
 		</view>
-		<view class="concont width94 mart10 backcorfff">
+		<view class="width94 mart10 backcorfff">
 			<view class="width94 paddtop15 font16 fontwig6" v-if="typeid == 10">
 				充值明细
 			</view>
 			<view class="width94 paddtop15 font16 fontwig6 alijusstart" v-else>
-				<image src="../static/imgs/desloca.png" mode="widthFix" class="icon20 marglerig"></image> {{orderList.highChildOrderList[0].storeName}}
+				<image src="../static/imgs/desloca.png" mode="widthFix" class="icon20 marglerig"></image>
+				{{orderList.highChildOrderList[0].storeName}}
 			</view>
 			<view class="width100 mart5">
 				<view class="width90 alijusstart mart15" v-for="(item,index) in orderList.highChildOrderList"
@@ -99,15 +101,20 @@
 					</view>
 				</view>
 			</view>
-			<view class="width95 height20 borderleft alijusnostart">
-				<view style="width: 5%;"></view>
-				<view class="width95" style="border-bottom: 1px dashed #bebcbc;"></view>
+
+			<view class="width100" style="height: 10px;">
+				<view class="cro_left_bottom flleft"></view>
+				<view class="cro_right_bottom flright"></view>
 			</view>
-			<!-- <view class="width96" style="border:1px dashed #f4f4f4;"></view> -->
 		</view>
-		<view class="gooddes width94 backcorfff marb20">
-			<view class="width90w height20 bordertopleft alijusnostart">
-				<view class="width10"></view>
+		<view class="width95  alijusnostart">
+			<view style="width: 6%;"></view>
+			<view style="border-bottom: 1px dashed #bebcbc;width: 93%;"></view>
+		</view>
+		<view class="width94 backcorfff marb20">
+			<view class="width100" style="height: 10px;">
+				<view class="cro_left_top flleft"></view>
+				<view class="cro_right_top flright"></view>
 			</view>
 			<view class="width94 alijusstart paddtop10 ">
 				<view class="font15 fcor333 fontwig6 width50">商品小计</view>
@@ -118,9 +125,9 @@
 
 			<view class="width92 fotrt mart5 font14 fcor999">
 				优惠券优惠 <text class="margle fcoreb5 font16 fontwig6">¥ {{orderList.deductionCouponPrice}}</text>
-			</view>
-			<view class="width92 fotrt mart5 font14 fcor999">
-				商品优惠 <text class="margle fcoreb5 font16 fontwig6">¥ {{orderList.deductionProductPrice}}</text>
+			</view>
+			<view class="width92 fotrt mart5 font14 fcor999">
+				商品优惠 <text class="margle fcoreb5 font16 fontwig6">¥ {{orderList.deductionProductPrice}}</text>
 			</view>
 			<view class="width92 fotrt mart5 font14 fcor999">
 				积分抵扣 <text class="margle fcoreb5 font16 fontwig6">¥ {{(orderList.payGold / 100).toFixed(2)}}</text>
@@ -149,11 +156,11 @@
 			<view class="width94 alijusstart mart20 font14 fcor666">
 				<view class="width30">下单时间</view>
 				<view class="width70 fcor333 fotrt">{{orderList.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
-			</view>
-			<view class="width94 alijusstart mart20 font14 fcor666">
-				<view class="width30">支付时间</view>
-				<view class="width70 fcor333 fotrt">{{orderList.payTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
-			</view>
+			</view>
+			<view class="width94 alijusstart mart20 font14 fcor666">
+				<view class="width30">支付时间</view>
+				<view class="width70 fcor333 fotrt">{{orderList.payTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}</view>
+			</view>
 			<view class="width94 alijusstart mart20 font14 fcor666" v-if="typeid == 4">
 				<view class="width30">就餐方式</view>
 				<view class="width70 fotrt" v-if="recinfo.eatType == 1">店内就餐</view>
@@ -161,9 +168,9 @@
 			</view>
 			<view class="width94 alijusstart mart20 font14 fcor666" v-if="orderList.payType">
 				<view class="width30">支付方式</view>
-				<view class="width70 fcor333 fotrt" v-if="orderList.payType == 2">微信</view>
-				<view class="width70 fcor333 fotrt" v-if="orderList.payType == 3">积分</view>
-				<view class="width70 fcor333 fotrt" v-if="orderList.payType == 4">工会卡</view>
+				<view class="width70 fcor333 fotrt" v-if="orderList.payType == 2">微信支付</view>
+				<view class="width70 fcor333 fotrt" v-if="orderList.payType == 3">积分兑换</view>
+				<view class="width70 fcor333 fotrt" v-if="orderList.payType == 4">汇联通工会卡</view>
 				<view class="width70 fcor333 fotrt" v-if="orderList.payType == 5">银联支付</view>
 			</view>
 			<view class="width94 alijusstart mart20 font14 fcor666" v-if="typeid == 10">
@@ -182,7 +189,7 @@
 		<view class="height50 width100"></view>
 		<view class="bottomstu backcorfff width100 height50 alijusend" v-if="orderList.orderStatus == 3">
 			<button open-type="contact" class="cusservice font12 fcor666">联系客服</button>
-			<view class="buybtn font12 fcorfff">再来一单</view>
+			<!-- <view class="buybtn font12 fcorfff">再来一单</view> -->
 		</view>
 
 	</view>
@@ -191,7 +198,7 @@
 <script>
 	import {
 		getThirdOrderByOrderNo,
-		cancel,
+		cancel,
 		getDetailByOrderNo
 	} from '../../Utils/Api.js';
 	export default {
@@ -217,7 +224,7 @@
 					6: '退款中',
 					7: '退款失败'
 				},
-				phonestu: 1 ,// 手机号查看状态
+				phonestu: 1, // 手机号查看状态
 				recinfo: [], // 订单详情
 			}
 		},
@@ -241,43 +248,43 @@
 				this.orderList.highChildOrderList.forEach((food) => {
 					this.coutnums += food.saleCount
 				})
-			},
-			//查询订单详情
-			getDetailByOrderNo() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				let params = {
-					orderNo: this.orderId,
-				}
-				getDetailByOrderNo(params).then(res => {
-					uni.hideLoading();
-					// if (res.return_code == '000000') {
-					// 	this.recinfo = res.return_data;
-					// }
-					
-					if (res.return_code == '000000') {
-						this.typeid = res.return_data.highChildOrderList[0].goodsType;
-						this.orderList = res.return_data;
-						if (this.orderList.orderStatus == 1) {
-							this.timer = setInterval(() => {
-								this.showtime()
-							})
-						}
-						if (this.orderList.orderStatus == 2) {
-							this.setTimer();
-						}
-						this.coutnums = 0;
-						this.getAllCount();
-						this.getThirdOrderByOrderNo();
-					} else {
-						uni.showToast({
-							title: res.return_msg,
-							icon: 'none',
-							duration: 2000
-						})
-					}
-				})
+			},
+			//查询订单详情
+			getDetailByOrderNo() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let params = {
+					orderNo: this.orderId,
+				}
+				getDetailByOrderNo(params).then(res => {
+					uni.hideLoading();
+					// if (res.return_code == '000000') {
+					// 	this.recinfo = res.return_data;
+					// }
+
+					if (res.return_code == '000000') {
+						this.typeid = res.return_data.highChildOrderList[0].goodsType;
+						this.orderList = res.return_data;
+						if (this.orderList.orderStatus == 1) {
+							this.timer = setInterval(() => {
+								this.showtime()
+							})
+						}
+						if (this.orderList.orderStatus == 2) {
+							this.setTimer();
+						}
+						this.coutnums = 0;
+						this.getAllCount();
+						this.getThirdOrderByOrderNo();
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
 			},
 			//查询商品详情
 			getThirdOrderByOrderNo() {
@@ -342,7 +349,8 @@
 			//跳转支付
 			jumppay() {
 				uni.redirectTo({
-					url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.orderList.id + '&amount=' +
+					url: '/qianzhu-KFC/payment-method/payment-method?orderId=' + this.orderList.orderNo +
+						'&amount=' +
 						this.orderList.payPrice + '&productType=' + this.orderList.productType
 				})
 			},
@@ -447,24 +455,32 @@
 		background: linear-gradient(to bottom, #3da7e7, #e8eff4);
 	}
 
-	.borderleft {
-		background-image: radial-gradient(10px at bottom left, #f0f0f0 10px, #ffffff);
+	.cro_left_top,
+	.cro_right_top,
+	.cro_left_bottom,
+	.cro_right_bottom {
+		width: 20rpx;
+		height: 20rpx;
+		background: #f0f0f0;
 	}
 
-	.bordertopleft {
-		background-image: radial-gradient(10px at top left, #f0f0f0 10px, #ffffff);
+	.cro_left_top {
+		border-radius: 0px 0px 20rpx 0px;
 	}
 
-	.concont {
-		border-radius: 12px 12px 0 0;
-		background-image: radial-gradient(10px at bottom right, #f0f0f0 10px, #ffffff);
+	.cro_right_top {
+		border-radius: 0px 0px 0px 20rpx;
 	}
 
-	.gooddes {
-		border-radius: 0 0 12px 12px;
-		background-image: radial-gradient(10px at top right, #f0f0f0 10px, #ffffff);
+	.cro_left_bottom {
+		border-radius: 0px 20rpx 0px 0px;
 	}
 
+	.cro_right_bottom {
+		border-radius: 20rpx 0px 0px 0px;
+	}
+
+
 	.footbtn {
 		bottom: 0px;
 		position: fixed;
diff --git a/high-unionPay/qianzhu-KFC/static/imgs/desloca.png b/high-unionPay/qianzhu-KFC/static/imgs/desloca.png
index 9cc9add..a7c4fe1 100644
Binary files a/high-unionPay/qianzhu-KFC/static/imgs/desloca.png and b/high-unionPay/qianzhu-KFC/static/imgs/desloca.png differ