From 95d649f32ad372258fc72d472a7b6339b868ebec Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sat, 3 Dec 2022 23:16:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E6=94=AF=E4=BB=98=E7=9A=84?=
 =?UTF-8?q?=E5=8A=A0=E4=BB=B7=E8=AE=B0=E5=BD=95=E6=88=96=E8=80=85=E5=B7=B2?=
 =?UTF-8?q?=E6=89=A3=E6=AC=BE=E7=9A=84=E8=B6=85=E6=97=B6=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9C=A8=E5=AD=90=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=87=91=E9=A2=9D=E4=B8=8B=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order-manage/serv-detail.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue
index e99b81e..d7c20b1 100644
--- a/pages/order-manage/serv-detail.vue
+++ b/pages/order-manage/serv-detail.vue
@@ -86,9 +86,21 @@
 				<text class="text-price" v-if="servDetail.orderDetailId != null">{{servDetail.payMoney}}</text>
 				<text class="text-price" v-else>{{servDetail.serverMoney}}</text>
 			</view>
-			<view class="text-sm text-gray margin-left-lg"
+			<view class="text-sm text-gray margin-left-lg" 
+				v-if="servDetail.orderDetailId != null && servDetail.orderTimeoutRecords != null"
 				v-for="(item, index) in servDetail.orderTimeoutRecords">
-				超时扣款：<text class="text-price margin-top-xs">-{{item.payMoney}}</text>[{{item.fineStatus == 1 ? '已扣款' : '未扣款'}}]
+				<text v-if="item.fineStatus === 1">加减费用：<text class="text-price margin-top-xs">-{{item.payMoney}}</text>
+				[
+				<text v-if="item.orderStatus === 0">接单</text>
+				<text v-else-if="item.orderStatus === 1">预约</text>
+				<text v-else-if="item.orderStatus === 2">上门</text>
+				<text v-else-if="item.orderStatus === 3">完单</text>
+				超时]
+				</text>
+			</view>
+			<view class="text-sm text-gray margin-left-lg" v-if="servDetail.orderDetailId != null && servDetail.financialChangeRecords != null"
+				v-for="(item, index) in servDetail.financialChangeRecords">
+				<text v-if="item.payStatus === 1">加减费用：<text class="text-price margin-top-xs">+{{item.changeMoney}}</text>[订单加价]</text>
 			</view>
 		</view>
 		<!-- 待服务列 -->