From ed76bd08bd8daf7031195a5eba119960b70abc21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 10 Mar 2023 16:27:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/confirmation/confirmation.vue       |  2 ++
 pages/orderDetails/orderDetails.vue       |  5 -----
 pages/payorderDetails/payorderDetails.vue | 17 +++++++++++------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pages/confirmation/confirmation.vue b/pages/confirmation/confirmation.vue
index 428baf0..1e25ec2 100644
--- a/pages/confirmation/confirmation.vue
+++ b/pages/confirmation/confirmation.vue
@@ -88,6 +88,7 @@
 					res.data.payType = "WECHAT_PAY"
 					res.data.paymentPrice = res.data.totalPrice
 					res.data.openid = this.openid
+					let id = res.data.id
 					appletGoodsOrderPay(res.data).then(response => {
 						if (response.code == 200) {
 							uni.requestPayment({
@@ -109,6 +110,7 @@
 										title: '取消支付',
 										type: 'error',
 										duration: 1500,
+										url: `/pages/payorderDetails/payorderDetails?goodsOrderId=${id}`
 									})
 								}
 							});
diff --git a/pages/orderDetails/orderDetails.vue b/pages/orderDetails/orderDetails.vue
index ddae06c..f990774 100644
--- a/pages/orderDetails/orderDetails.vue
+++ b/pages/orderDetails/orderDetails.vue
@@ -45,9 +45,6 @@
 						<view class="refund" style="border: 1rpx solid #969394;" v-if="order.orderStatus=='REFUNDED'">
 							退款成功
 						</view>
-						<!-- <view class="refund" v-if="order.orderStatus=='RETURNED_GOODS'">
-							退货中
-						</view> -->
 						<view class="refund" style="border: 1rpx solid #969394;"
 							v-if="order.orderStatus=='WAIT_RETURNED_GOODS'">
 							待退货
@@ -77,13 +74,11 @@
 			<span v-if="order.orderType =='HEALTH_CONSULTATION'">咨询时间：<text>{{order.healthAppointDate}}</text></span>
 			<span v-if="order.orderType !='HEALTH_CONSULTATION'">收货地址：<text>{{order.receiveAddress}}</text></span>
 			<span>订单编号：<text>{{order.goOrderNo}}</text></span>
-			<!-- <span>获得积分：<text>30点积分</text></span> -->
 			<span>下单时间：<text>{{order.orderTime}}</text></span>
 			<span
 				v-if="order.orderStatus=='REFUNDED'&&order.orderType=='DIRECT_BUY'">退款时间：<text>{{order.updateTime}}</text></span>
 			<span
 				v-if="order.orderStatus=='REFUNDED'&&order.orderType=='INTEGRAL_EXCHANGE'">退款时间：<text>{{order.appleTime}}</text></span>
-			<!-- <span>成交时间：<text>2022-10-28 11：31：26</text></span> -->
 		</view>
 		<view class="buy" v-if="order.orderStatus == 'WAIT_PAY'" @tap='pay'>
 			<view class="pay">
diff --git a/pages/payorderDetails/payorderDetails.vue b/pages/payorderDetails/payorderDetails.vue
index c15e06a..82bb028 100644
--- a/pages/payorderDetails/payorderDetails.vue
+++ b/pages/payorderDetails/payorderDetails.vue
@@ -19,10 +19,12 @@
 					<image :src="baseurl+order.attributePitureUrl" mode=""></image>
 					<view class="model">
 						<view class="top">
-							<span>{{order.goodsName}}</span>
-							<span>￥{{order.goodsPrice}}</span>
+							<span v-if="order.orderType =='HEALTH_CONSULTATION'">健康咨询</span>
+							<span v-else>{{order.goodsName}}</span>
+							<span
+								v-if="order.goodsPrice&&order.orderType !='HEALTH_CONSULTATION'">￥{{order.goodsPrice}}</span>
 						</view>
-						<view class="bottom">
+						<view class="bottom" v-if="order.orderType !='HEALTH_CONSULTATION'">
 							<span class="box">型号：{{order.goodsAttributeName}}</span>
 							<span class="box">X{{order.goodsCount}}</span>
 						</view>
@@ -30,9 +32,10 @@
 							<span class="box" style='width:40%'>优惠金额：</span>
 							<span class="box">-￥{{order.discountPrice}}</span>
 						</view>
-						<view class="refund" @tap='gorefundType'
+						<view class="refund"
 							v-if="order.orderStatus != 'WAIT_PAY'&& order.orderStatus!='CANCEL'&&order.orderStatus!='WAIT_REFUND'&&order.orderStatus!='REFUNDED'&&order.orderStatus!='RETURNED_GOODS'&&order.orderStatus!='WAIT_RETURNED_GOODS'">
-							申请退款
+							<text @tap='gorefundType'
+								v-if="order.orderType=='DIRECT_BUY'||order.orderType=='HEALTH_CONSULTATION'">申请退款</text>
 						</view>
 						<view class="refund" v-if="order.orderStatus=='WAIT_REFUND'" @tap='goAftersalesdetails(order)'>
 							退款中
@@ -60,7 +63,9 @@
 		<view class="info" v-if="order.orderStatus != ' WAIT_PAY'&& order.orderStatus!='CANCEL'">
 			<span>收货人：<text>{{order.receiver}}</text></span>
 			<span>联系电话：<text>{{order.phone}}</text></span>
-			<span>收货地址：<text>{{order.receiveAddress}}</text></span>
+			<span v-if="order.orderType =='HEALTH_CONSULTATION'">咨询医生：<text>{{order.hospitalPersonName}}</text></span>
+			<span v-if="order.orderType =='HEALTH_CONSULTATION'">咨询时间：<text>{{order.healthAppointDate}}</text></span>
+			<span v-if="order.orderType !='HEALTH_CONSULTATION'">收货地址：<text>{{order.receiveAddress}}</text></span>
 			<span>订单编号：<text>{{order.goOrderNo}}</text></span>
 			<!-- <span>获得积分：<text>30点积分</text></span> -->
 			<span>下单时间：<text>{{order.orderTime}}</text></span>