From 766cf84c5f6a061725c2582e8a495dc757c6d8cb Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 13 Jan 2023 16:10:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=962.0=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 high-unionPay/Utils/Api.js                    |   4 +-
 high-unionPay/pages.json                      |  12 +-
 .../goods/refuel-confirm/refuel-confirm.vue   | 328 +++++++-----------
 high-unionPay/pages/order/confirmation.vue    |  23 +-
 .../unionComfirmation/unionComfirmation.vue   |  43 +--
 high-unionPay/pages/user/news/news.vue        |  72 +++-
 .../qianzhu-KFC/confirmOrder/confirmOrder.vue |  38 +-
 .../qianzhu-KFC/kfc-details/kfc-details.vue   |  22 --
 .../kfc-menu-list/kfc-menu-list.vue           |   6 -
 .../order-details/order-details.vue           | 168 +++++----
 .../qianzhu-KFC/static/imgs/desloca.png       | Bin 904 -> 6447 bytes
 11 files changed, 336 insertions(+), 380 deletions(-)
 delete mode 100644 high-unionPay/qianzhu-KFC/kfc-details/kfc-details.vue

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 9cc9addac0434eec3417aef292a48f7b17d7e47c..a7c4fe1f1a3087ce591cc5e2781cbc76f5f854f4 100644
GIT binary patch
literal 6447
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
JPDHLkV1janH-Z2F

literal 904
zcmV;319$w1P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px&LP<nHR5(wq)PGFWWgG|a_xm~Tj!Qv2N-5hiafO&p?@Ed@rCD1<T;LA<2Zyc3
zoNfIuYt{O((cJpWuv)84shBO13EnxnA#Sqb6teG;4#*ZYwzd$NXQFTici-pJzEmue
zj(>RmdwzUg&*%9(&mLlq8|T==|AOn+SLB!uy$wJ$AZq|>5jjuAgNan4x$jI{Y^G#p
z1icS$xgBCQ15yCsOPF#(D{4ixNgz)X_}NTx+YepG2LFrR1p0jb%s6p`RC(^r%WLm?
z-uIZENIe0Pw5yZDhkK3>HTJ#<Ex*l6CIj8w;n9DiH-X+Fe<>6j7H!I_S+=|A?eSk?
zYkqHt0s<`E;X%f7_ux>yQ9B&$-!CFNqLEN@dT_&2O#(PQ!K$+WYk%6^3fgU;BFu>t
z^7oYjln;CShwg-6+=v9L(t;je`FDVMY+bPWQ4){zK64cAjdxoK;!4M_xbL$702)2z
zUmS$+MWZu#?`#>K5=wYo%XS}0|48cv3^(^p#pG75#;uRvW8vYRvW9LdR2ZG1wX=cm
z3HYEVRCNGAy`;oGIdXj}#&O$x(56y4Y3@1~_-ZF0T}Ef{x!J%%0PW7)%)Ki=_HU$3
zl~`w-4l;FH@2*f+^5W<o5wj#3Y5g`WSWr;uaJeVy02OfME!>m;zJIfbY^QY<BB6oT
z+74g8Fj6OimeH)q7Y4%NiL{_K>Gjsw=^Fl2fGy6Y*)Og9p!7*9<P5yk{>inzOCO2g
zYsU3X!#F;k_F=DBQQ};<*jWRLN2|$KsU7c<sC49JzF}Xo;L6y!p*jIhLhH|=)a!(9
ziN`Vy^!GPS{sT|frm(Oi%e31Yg?vCXPUqd>sAyWXN<8h+{UoccHz&l2M9lH5%bmy-
zsCoh(5$SdTTO*OsH4B{vy$_Y;!=_FNq>*vwJBHD8^{?ZX-6Af&0;old+o#9Z7MEwM
zl<Wl%fKtWLZ(4r50bEvGoRO2t+6UoQP{u@fhQRlt<f3S~JhfOchk_;6J^+g#SOB8&
z^1Q1r4|a4UZUC*0b;I+slLaRA1_JkkSPgJ70QcWDiUD#7!t<a$tF-O(*dO-(8EZIK
eAMKp~*na|I7g{8IMScAM0000<MNUMnLSTaKez+O{