From 460a9b50912920b5894c6f6af17082a756b3d125 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Thu, 6 Oct 2022 23:42:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=8F=91=E8=B5=B7=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=20=E5=94=AE=E5=90=8E=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/serv-detail.vue | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue
index 504dc33..ed70457 100644
--- a/pages/my/serv-detail.vue
+++ b/pages/my/serv-detail.vue
@@ -149,7 +149,7 @@
 				</view>
 				<view v-for="(afterServiceRecord, afterServiceRecordIndex) in item.afterServiceRecordList">
 					<view v-if="afterServiceRecord.createBy == 1" class="padding-tb-sm solid-top">
-						<view class='cu-tag bg-main-color radius light'>客户发起</view>
+						<view class='cu-tag bg-main-color radius light'>售后发起中</view>
 						<view v-if="afterServiceRecord.operType === 1">
 							<view class="text-gray text-sm margin-bottom-xs">退单退款已提交至商家，其最大时限24小时内需完成操作！</view>
 							<view class="flex justify-start align-end">
@@ -217,7 +217,7 @@
 							</view>
 							<view v-if="afterServiceRecord.workerFeedbackResult === 1">
 								<text>同意退款金额：</text>
-								<text>{{afterServiceRecord.agreedRefund}}</text>
+								<text>{{afterServiceRecord.agreedRefund ? afterServiceRecord.agreedRefund : afterServiceRecord.refund}}</text>
 							</view>
 							<view>
 								<text>师傅反馈：</text>
@@ -259,17 +259,16 @@
 						<view class="flex justify-end align-end margin-tb-sm">
 							<button class="cu-btn sm bg-yellow margin-right-sm"
 								@click="afterServiceFinalCheck(afterServiceRecord.id, 1)">同意</button>
-							<button class="cu-btn sm bg-yellow margin-right-sm" v-if="afterServiceRecord.customerFinalCheck != 0"
+							<button class="cu-btn sm bg-yellow margin-right-sm" v-if="afterServiceRecord.customerFinalCheck == null"
 								@click="afterServiceFinalCheck(afterServiceRecord.id, 0)">不同意</button>
-							<button class="cu-btn sm bg-yellow margin-right-sm" v-else disabled type=""
-								@click="afterServiceFinalCheck(afterServiceRecord.id, 0)">不同意</button>
+							<button class="cu-btn sm bg-yellow margin-right-sm" v-else-if="afterServiceRecord.customerFinalCheck == 0" disabled type="">已申请平台介入</button>
 						</view>
 					</view>
 					<view v-if="afterServiceRecord.customerFinalCheck != null" class="padding-tb-sm solid-top">
 						<view class='cu-tag bg-main-color radius light'>客户最终确认</view>
 						<view class="margin-top-xs">{{afterServiceRecord.customerFinalCheck === 1 ? '同意' : '不同意'}}
 						</view>
-						<view class="text-red" v-if="afterServiceRecord.customerFinalCheck === 0">订单交由平台协商处理</view>
+						<view class="text-red" v-if="afterServiceRecord.customerFinalCheck === 0">订单已申请平台介入</view>
 					</view>
 				</view>
 			</view>
@@ -423,10 +422,18 @@
 				});
 				if (res && res.code === 0) {
 					this.loadData(this.servDetail.orderMasterId);
-					uni.showToast({
-						icon: 'success',
-						duration: 1000
-					})
+					if (agreeStatus == 1) {
+						uni.showToast({
+							icon: 'none',
+							duration: 2500,
+							title: '涉及退款部分将按付款原路退回，请留意'
+						})
+					} else {
+						uni.showToast({
+							icon: 'success',
+							duration: 1000
+						})
+					}
 					return;
 				}
 				uni.showToast({