From e82b20e2c61f564ef12b10875cc0ae45b895521a Mon Sep 17 00:00:00 2001
From: "PC-20210316OUOY\\Administrator" <812952667@qq.com>
Date: Mon, 8 Nov 2021 17:55:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E7=A7=AF=E5=88=86=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=20=E4=B8=8D=E8=83=BD=E4=BD=BF=E7=94=A8=E5=B7=A5?=
 =?UTF-8?q?=E4=BC=9A=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pay/payment/payment.vue              |  6 +++--
 pages/user/order_details/order_details.vue |  2 +-
 pages/user/order_list/order_list.vue       | 27 ++++++++++++++--------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/pages/pay/payment/payment.vue b/pages/pay/payment/payment.vue
index 246c651..4ec5de9 100644
--- a/pages/pay/payment/payment.vue
+++ b/pages/pay/payment/payment.vue
@@ -29,7 +29,7 @@
 							<radio :checked="paytype=='jinbi'" color="#0083f5" />
 						</view>
 					</view>
-					<view class="row" @tap="paytype='gonghuika'">
+					<view class="row" @tap="paytype='gonghuika'" v-if="goodsType != 2">
 						<view class="left">
 							<image style="border-radius: 50%;" src="../../../static/img/ghkpay.png"></image>
 						</view>
@@ -95,7 +95,8 @@
 				couponId: '',
 				jumpType: '',
 				PaymentPassword: '',
-				tongCardPrice: 0
+				tongCardPrice: 0,
+				goodsType:''
 			};
 		},
 		onLoad(e) {
@@ -103,6 +104,7 @@
 			this.orderNo = e.orderId;
 			this.couponId = e.couponId;
 			this.jumpType = e.typeaout;
+			this.goodsType = e.goodsType;
 			if (this.pryType == 1) {
 				this.paytype = 'wxpay';
 			} else if (this.pryType == 2) {
diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue
index d5e4784..93d0bdf 100644
--- a/pages/user/order_details/order_details.vue
+++ b/pages/user/order_details/order_details.vue
@@ -350,7 +350,7 @@
 				uni.redirectTo({
 					url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice +
 						'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
-						.highChildOrderList[0].goodsId + '&typeaout='+ this.recinfo.highChildOrderList[0].ext1
+						.highChildOrderList[0].goodsId + '&typeaout='+ this.recinfo.highChildOrderList[0].ext1+'&goodsType='+ this.recinfo.highChildOrderList[0].goodsType
 				})
 			},
 		}
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index 2990973..2b292fd 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -14,23 +14,28 @@
 				</view>
 				<view class="row" v-for="(row,index) in orderList" :key="index">
 					<view class="width96 height40" @click="jumpDetails(row.id)">
-						<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 1 || row.highChildOrderList[0].goodsType == 2">
+						<view class="width50 flleft aliitem fotlt font16"
+							v-if="row.highChildOrderList[0].goodsType == 1 || row.highChildOrderList[0].goodsType == 2">
 							<image src="../../../static/img/order2.png" style="width: 50rpx;height: 50rpx;"></image>
 							卡券订单
 						</view>
-						<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 3">
+						<view class="width50 flleft aliitem fotlt font16"
+							v-if="row.highChildOrderList[0].goodsType == 3">
 							<image src="../../../static/img/order4.png" style="width: 50rpx;height: 50rpx;"></image>
 							团油订单
 						</view>
-						<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 5">
+						<view class="width50 flleft aliitem fotlt font16"
+							v-if="row.highChildOrderList[0].goodsType == 5">
 							<image src="../../../static/img/order5.png" style="width: 50rpx;height: 50rpx;"></image>
 							电影票
 						</view>
-						<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 4">
+						<view class="width50 flleft aliitem fotlt font16"
+							v-if="row.highChildOrderList[0].goodsType == 4">
 							<image src="../../../static/img/order3.png" style="width: 50rpx;height: 50rpx;"></image>
 							KFC
 						</view>
-						<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 6">
+						<view class="width50 flleft aliitem fotlt font16"
+							v-if="row.highChildOrderList[0].goodsType == 6">
 							<image src="../../../static/img/order1.png" style="width: 50rpx;height: 50rpx;"></image>
 							话费充值
 						</view>
@@ -53,15 +58,17 @@
 							<view class="font16 fontwig6 text1 fcor333" v-if="row.payType != 3">
 								￥{{row.payPrice}}
 							</view>
-							<view class="font16 fontwig6 text1 fcor333 aliitem" style="justify-content: flex-end;" v-else>
-								<image style="width: 15px;height: 15px;"
-									src="../../../static/img/jfx.png">
+							<view class="font16 fontwig6 text1 fcor333 aliitem" style="justify-content: flex-end;"
+								v-else>
+								<image style="width: 15px;height: 15px;" src="../../../static/img/jfx.png">
 								</image>{{row.payPrice*100}}
 							</view>
 							<view class="fotrt font15 text1 fcor999 mart5">{{typeText[row.orderStatus]}}</view>
 						</view>
 					</view>
-					<view class="width96 line1 mart10 marb5" v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)"></view>
+					<view class="width96 line1 mart10 marb5"
+						v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)">
+					</view>
 					<view class="btns"
 						v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)">
 						<block>
@@ -299,7 +306,7 @@
 					url: "/pages/pay/payment/payment?amount=" + row.payPrice +
 						'&paytype=' + payTypes + '&orderId=' + row.id + '&couponId=' + this.orderList[0]
 						.highChildOrderList[0].goodsId + '&typeaout=' + this.orderList[0].highChildOrderList[0]
-						.ext1
+						.ext1+ '&goodsType='+ row.highChildOrderList[0].goodsType
 				})
 			}
 		}