From 556eb9292ad397d5d564b4ea9211fe82cefebe96 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 13:59:01 +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/Applforrefund/Applforrefund.vue   |  5 +++--
 pages/CommodityOrder/CommodityOrder.vue | 27 +++++++++++++++++--------
 pages/orderDetails/orderDetails.vue     | 19 +++++++++++------
 pages/refundType/refundType.vue         |  7 ++++---
 4 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/pages/Applforrefund/Applforrefund.vue b/pages/Applforrefund/Applforrefund.vue
index 7a70e9c..fdb7c02 100644
--- a/pages/Applforrefund/Applforrefund.vue
+++ b/pages/Applforrefund/Applforrefund.vue
@@ -10,9 +10,10 @@
 				<image src="../../static/huijiantou.png" mode=""></image>
 			</view>
 			<view class="priceinfo">
-				<span v-if="order.orderType=='DIRECT_BUY'">退款金额</span>
+				<span v-if="order.orderType=='DIRECT_BUY'||order.orderType =='HEALTH_CONSULTATION'">退款金额</span>
 				<span v-if="order.orderType=='INTEGRAL_EXCHANGE'">退款积分</span>
-				<view class="priceback" v-if="order.orderType=='DIRECT_BUY'">￥{{order.totalPrice}}
+				<view class="priceback" v-if="order.orderType=='DIRECT_BUY'||order.orderType =='HEALTH_CONSULTATION'">
+					￥{{order.totalPrice}}
 				</view>
 				<view class="priceback" v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}积分
 				</view>
diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue
index ab3df69..126217d 100644
--- a/pages/CommodityOrder/CommodityOrder.vue
+++ b/pages/CommodityOrder/CommodityOrder.vue
@@ -24,10 +24,13 @@
 						<image :src="baseurl+item.attributePitureUrl" mode=""></image>
 						<view class="model">
 							<view class="top">
-								<span>{{item.goodsName}}</span>
-								<span v-if="item.goodsPrice">￥{{item.goodsPrice}}</span>
+								<span v-if="item.orderType =='HEALTH_CONSULTATION'">健康咨询</span>
+								<span v-else>{{item.goodsName}}</span>
+								<!-- <span v-if="item.orderType =='HEALTH_CONSULTATION'">￥{{item.totalPrice}}</span> -->
+								<span
+									v-if="item.goodsPrice&&item.orderType !='HEALTH_CONSULTATION'">￥{{item.goodsPrice}}</span>
 							</view>
-							<view class="bottom">
+							<view class="bottom" v-if="item.orderType !='HEALTH_CONSULTATION'">
 								<span class="box">型号：{{item.goodsAttributeName}}</span>
 								<span class="box">×{{item.goodsCount}}</span>
 							</view>
@@ -35,12 +38,14 @@
 								<span>
 									实付款：
 								</span>
-								<text class="price" v-if="item.orderType=='DIRECT_BUY'">￥{{item.totalPrice}}</text>
+								<text class="price"
+									v-if="item.orderType=='DIRECT_BUY'||item.orderType =='HEALTH_CONSULTATION'">￥{{item.totalPrice}}</text>
 								<text class="price"
 									v-if="item.orderType=='INTEGRAL_EXCHANGE'">{{item.integralExchangeSill}}</text>
-								<span v-if="item.orderType=='INTEGRAL_EXCHANGE'" style='padding-left: 10rpx;'>
+								<text class="price" v-if="item.orderType=='INTEGRAL_EXCHANGE'"
+									style='padding-left: 10rpx;'>
 									积分
-								</span>
+								</text>
 							</view>
 						</view>
 					</view>
@@ -49,12 +54,18 @@
 					<view class="logistics" v-if="item.orderStatus=='WAIT_REFUND'" style="background-color: coral;"
 						@tap='goorderdetails(item)'>退款中
 					</view>
-					<view class="logistics" v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'" @tap='gologistics(item)'>查看物流
+					<view class="logistics"
+						v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType !='HEALTH_CONSULTATION'"
+						@tap='gologistics(item)'>查看物流
 					</view>
 					<view class="logistics harvest" @tap='buy(item)' v-if="item.orderStatus=='WAIT_PAY'">
 						去支付</view>
-					<view class="logistics harvest" @tap='Receipt(item)' v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'">
+					<view class="logistics harvest" @tap='Receipt(item)'
+						v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType !='HEALTH_CONSULTATION'">
 						确认收货</view>
+					<view class="logistics harvest" @tap='Receipt(item)'
+						v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType =='HEALTH_CONSULTATION'">
+						咨询完成</view>
 					<view class="logistics harvest" style="background-color: #60c5f1;" @tap='rate(item)'
 						v-if="item.orderStatus=='RECEIVED_GOODS'">
 						去评价</view>
diff --git a/pages/orderDetails/orderDetails.vue b/pages/orderDetails/orderDetails.vue
index ad6ef13..1dece9a 100644
--- a/pages/orderDetails/orderDetails.vue
+++ b/pages/orderDetails/orderDetails.vue
@@ -19,14 +19,15 @@
 					<image :src="baseurl+order.attributePitureUrl" mode=""></image>
 					<view class="model">
 						<view class="top">
-							<span>{{order.goodsName}}</span>
+							<span v-if="order.orderType =='HEALTH_CONSULTATION'">健康咨询</span>
+							<span v-else>{{order.goodsName}}</span>
 							<span v-if="order.orderType=='DIRECT_BUY'">￥{{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>
-						<view class="bottom" v-if="order.discountPrice>0">
+						<view class="bottom" v-if="order.orderType !='HEALTH_CONSULTATION'&&order.discountPrice>0">
 							<span class="box" style='width:40%'>优惠金额：</span>
 							<span class="box">-￥{{order.discountPrice}}</span>
 						</view>
@@ -34,6 +35,7 @@
 							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 v-if="order.orderType=='INTEGRAL_EXCHANGE'">取消兑换</text>
 							<text v-if="order.orderType=='DIRECT_BUY'">申请退款</text>
+							<text v-if="order.orderType=='HEALTH_CONSULTATION'">取消咨询</text>
 						</view>
 						<view class="refund" v-if="order.orderStatus=='WAIT_REFUND'" @tap='goAftersalesdetails(order)'>
 							退款中
@@ -58,7 +60,7 @@
 				</view> -->
 				<view class="payinfo">
 					<text class="pay">实付款</text>
-					<text class="price" v-if="order.orderType=='DIRECT_BUY'">￥{{order.totalPrice}}</text>
+					<text class="price" v-if="order.orderType=='DIRECT_BUY'||order.orderType =='HEALTH_CONSULTATION'">￥{{order.totalPrice}}</text>
 					<text class="price"
 						v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}积分</text>
 				</view>
@@ -67,7 +69,7 @@
 		<view class="info">
 			<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.receiveAddress}}</text></span>
 			<span>订单编号：<text>{{order.goOrderNo}}</text></span>
 			<!-- <span>获得积分：<text>30点积分</text></span> -->
 			<span>下单时间：<text>{{order.orderTime}}</text></span>
@@ -92,13 +94,18 @@
 				去评价
 			</view>
 		</view>
-		<view class="buy" v-if="order.orderStatus == 'WAIT_RECEIVED_GOODS'">
+		<view class="buy" v-if="order.orderStatus == 'WAIT_RECEIVED_GOODS'&&order.orderType !='HEALTH_CONSULTATION'">
 			<view class="logistics" style="" @tap='gologistics'>查看物流
 			</view>
 			<view class="pay" style="background-color: #4C7BC9;" @tap='Receipt'>
 				确认收货
 			</view>
 		</view>
+		<view class="buy" v-if="order.orderType =='HEALTH_CONSULTATION'">
+			<view class="pay" style="background-color: #4C7BC9;" @tap='Receipt'>
+				咨询完成
+			</view>
+		</view>
 		<u-toast ref="uToast" />
 		<!-- //收货 -->
 		<view class="frame">
diff --git a/pages/refundType/refundType.vue b/pages/refundType/refundType.vue
index 557b917..4ebbab1 100644
--- a/pages/refundType/refundType.vue
+++ b/pages/refundType/refundType.vue
@@ -9,17 +9,18 @@
 					<image :src="baseurl+order.attributePitureUrl" mode=""></image>
 					<view class="model">
 						<view class="top">
-							<span>{{order.goodsName}}</span>
+							<span v-if="order.orderType =='HEALTH_CONSULTATION'">健康咨询</span>
+							<span v-else>{{order.goodsName}}</span>
 							<span v-if="order.orderType=='DIRECT_BUY'">￥{{order.goodsPrice}}</span>
 						</view>
-						<view class="bottom">
+						<view class="bottom" v-if="order.orderType !='HEALTH_CONSULTATION'">
 							<span>型号：{{order.goodsAttributeName}}</span>
 							<span>X{{order.goodsCount}}</span>
 						</view>
 					</view>
 					<view class="payinfo">
 						<text class="pay">实付款</text>
-						<text class="price" v-if="order.orderType=='DIRECT_BUY'">￥{{order.totalPrice}}</text>
+						<text class="price" v-if="order.orderType=='DIRECT_BUY'||order.orderType =='HEALTH_CONSULTATION'">￥{{order.totalPrice}}</text>
 						<text class="price"
 							v-if="order.orderType=='INTEGRAL_EXCHANGE'">{{order.integralExchangeSill}}积分</text>
 					</view>