From 6785144775e84f469c906e7b18299f4d8c9fd5ec Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 23 Apr 2023 22:39:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9B?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E5=8A=A8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/master-occupancy.vue       | 8 ++++++--
 pages/order-manage/order-manage.vue | 8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pages/my/master-occupancy.vue b/pages/my/master-occupancy.vue
index 4a861ec..057d572 100644
--- a/pages/my/master-occupancy.vue
+++ b/pages/my/master-occupancy.vue
@@ -288,7 +288,9 @@
 						streetIds: item.streetIds
 					})
 				}
-				this.servArea = servArea;
+				if (servArea.length > 0) {
+					this.servArea = servArea;
+				}
 			},
 			async loadServSkills() {
 				let res = await this.$request.getWorkerGoodsCategoryEdit({
@@ -309,7 +311,9 @@
 						subSubTypeIds: item.categoryIds
 					})
 				}
-				this.servSkill = servSkill;
+				if (servSkill.length > 0) {
+					this.servSkill = servSkill;
+				}
 			},
 			/* 服务区域 start */
 			async loadProvinceList() {
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 3b613a2..3cc4cec 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -301,7 +301,7 @@
 							</view>
 						</view>
 						<view class="flex justify-end align-end margin-tb-sm" v-if="!afterServiceRecord.updateBy">
-							<button class="cu-btn sm bg-yellow margin-right-sm" @tap="showModalByRef('sure2Revisit', order, null)">重新上门</button>
+							<button class="cu-btn sm bg-yellow margin-right-sm" @tap="showModalByRef('sure2Revisit', order, null)">上门重做</button>
 							<button class="cu-btn sm bg-yellow margin-right-sm" data-modal="rejectAfterSale" @tap="showModal($event, order)">拒绝处理</button>
 							<button class="cu-btn sm bg-yellow margin-right-sm" data-modal="agreeAfterSale" @tap="showModal($event, order)">操作处理</button>
 						</view>
@@ -313,7 +313,7 @@
 								<text>师傅反馈结果：</text>
 								<text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text>
 								<text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text>
-								<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">重新上门</text>
+								<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">上门重做/补做</text>
 							</view>
 							<view v-if="afterServiceRecord.workerFeedbackResult === 1">
 								<text>同意退款金额：</text>
@@ -342,7 +342,7 @@
 								<text>师傅反馈结果：</text>
 								<text v-if="afterServiceRecord.workerFeedbackResult === 0">拒绝</text>
 								<text v-else-if="afterServiceRecord.workerFeedbackResult === 1">同意</text>
-								<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">重新上门</text>
+								<text v-else-if="afterServiceRecord.workerFeedbackResult === 2">上门重做/补做</text>
 							</view>
 							<view v-if="afterServiceRecord.workerFeedbackResult !== 2">
 								<text>师傅反馈：</text>
@@ -407,7 +407,7 @@
 				</view>
 			</block>
 		</confirm-modal>
-		<confirm-modal ref="sure2Revisit" :content="'确定重新上门吗？'" @confirm="revisit" @cancel="hideModal"></confirm-modal>
+		<confirm-modal ref="sure2Revisit" :content="'您选择上门重做/补做，请先与客户协商一致，并重新排单！选择上门重做则客户发起退款的默认退额为0元。'" :cancelMsg="'退出'" @confirm="revisit" @cancel="hideModal"></confirm-modal>
 		
 		<!-- popup -->
 		<uni-popup ref="dispatchOrderPopup" type="bottom" @change="changePopupState">