From 508fc27c5f2b8afe1d793255bd91884bcb2821c0 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Thu, 30 Jun 2022 17:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=A4=87=E6=B3=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order-manage/order-manage.vue | 4 ++--
 pages/order-manage/serv-detail.vue  | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 366ad8d..3323cc0 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -204,9 +204,9 @@
 					<button class="cu-btn sm bg-yellow margin-right-sm" v-else disabled type="">已同意</button>
 				</view>
 			</view>
-			<view class="margin-top-sm solid-top padding-top-sm" v-if="Boolean(order.remark)">
+			<view class="margin-top-sm solid-top padding-top-sm" v-if="Boolean(order.customerRemark)">
 				<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-comment"></text></text>
-				<text>备注：{{order.remark}}</text>
+				<text>备注：{{order.customerRemark}}</text>
 			</view>
 		</view>
 		<load-status-bar ref="loadStatusBar" @loadMore="loadMasterOrderPage"></load-status-bar>
diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue
index b5e9b68..e1f873f 100644
--- a/pages/order-manage/serv-detail.vue
+++ b/pages/order-manage/serv-detail.vue
@@ -64,6 +64,10 @@
 				<text class="cuIcon-moneybag text-main-color margin-right-xs"></text>
 				<text>任务金额：</text>
 				<text class="text-price">{{servDetail.payMoney}}</text>
+			</view>
+			<view class="margin-top-sm" v-if="servDetail.customerRemark">
+				<text class="cuIcon-message text-main-color margin-right-xs"></text>
+				<text>备注：{{servDetail.customerRemark}}</text>
 			</view>
 			<!-- <view class="margin-top-xs text-sm text-gray"
 				v-for="(item, index) in servDetail.mainServOrder.gratuityRecord">