From cb816cbb341b0176766d7458dad74fa95a1a5eca Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 10 Oct 2022 22:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=EF=BC=8C=E9=80=80=E5=8D=95?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order-manage/modal/agree-after-sale.vue | 22 +++++++++++++------
 pages/order-manage/order-manage.vue           | 16 +++++++++-----
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/pages/order-manage/modal/agree-after-sale.vue b/pages/order-manage/modal/agree-after-sale.vue
index 40702cf..4ab2717 100644
--- a/pages/order-manage/modal/agree-after-sale.vue
+++ b/pages/order-manage/modal/agree-after-sale.vue
@@ -12,7 +12,7 @@
 					<text>退款金额：</text>
 					<text class="text-price text-red">{{data.afterServiceRecordList[0].refund ? data.afterServiceRecordList[0].refund : data.payMoney}}</text>
 				</view>
-				<view v-if="data.payMoney < data.afterServiceRecordList[0].refund" class="padding-top text-red">警报：该单关联其它订单，客户申请的退款金额有效，具体操作请沟通派单处。</view>
+				<view v-if="data.afterServiceRecordList[0].refund && data.payMoney < data.afterServiceRecordList[0].refund" class="padding-top text-red">警报：该单关联其它订单，客户申请的退款金额有效，具体操作请沟通派单处。</view>
 				<view class="text-lg padding-top flex justify-start align-center">
 					<text>更改退款金额：</text>
 					<input class="radius-input inline-input" v-model="agreedRefund"></input>
@@ -87,26 +87,34 @@
 				this.reasonType = e.detail.value;
 			},
 			async submit(e) {
+				let agreedRefund = this.agreedRefund;
+				if (!agreedRefund && this.data.afterServiceRecordList[0].refund != null) {
+					agreedRefund = this.data.afterServiceRecordList[0].refund;
+				} else {
+					agreedRefund = this.data.payMoney;
+				}
 				let res = await this.$request.editAfterServiceRecord({
 					id: this.data.afterServiceRecordList[0].id,
 					workerFeedbackReasonType: this.reasonType,
-					agreedRefund: this.agreedRefund,
+					agreedRefund: agreedRefund,
 					workerFeedbackReason: this.remark,
 					workerFeedbackResult: 1,
 					updateBy: 2
 				});
 				if (res && res.code === 0) {
-					uni.showToast({
-						icon: 'success',
-						duration: 1000
-					})
 					this.hideModal(e);
 					this.$emit('confirmFeedback');
+					uni.showToast({
+						icon: 'success',
+						title: '提交成功',
+						duration: 1000
+					})
 					return;
 				}
 				uni.showToast({
 					icon: 'error',
-					duration: 1000
+					duration: 1000,
+					title: '提交失败',
 				})
 			}
 		},
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 86e468b..cbf5bea 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -213,7 +213,7 @@
 							<view>
 								<text>退款金额：</text>
 								<text v-if="afterServiceRecord.refund">{{afterServiceRecord.refund}}</text>
-								<text v-if="order.payMoney">{{order.payMoney}}</text>
+								<text v-else-if="order.payMoney">{{order.payMoney}}</text>
 							</view>
 							<view>
 								<text>退款原因：</text>
@@ -270,8 +270,11 @@
 								<text>师傅反馈：</text>
 								<text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text>
 								<text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text>
-								<text v-else>其他</text>
-								<text v-if="afterServiceRecord.workerFeedbackReason">{{"，" + afterServiceRecord.workerFeedbackReason}}</text>
+								<text v-else-if="afterServiceRecord.workerFeedbackReasonType === 3">其他</text>
+								<text v-if="afterServiceRecord.workerFeedbackReason">
+									<text v-if="afterServiceRecord.workerFeedbackReasonType">，</text>
+									{{afterServiceRecord.workerFeedbackReason}}
+								</text>
 							</view>
 							<view class="grid col-3 grid-square flex-sub margin-top-sm">
 								<view class="bg-img" v-for="(imgObj, imgIndex) in afterServiceRecord.imgsList" :key="imgIndex" v-if="imgObj.imgUploadBy === 2">
@@ -288,8 +291,11 @@
 								<text>师傅反馈：</text>
 								<text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text>
 								<text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text>
-								<text v-else>其他</text>
-								<text v-if="afterServiceRecord.workerFeedbackReason">{{"，" + afterServiceRecord.workerFeedbackReason}}</text>
+								<text v-else-if="afterServiceRecord.workerFeedbackReasonType === 3">其他</text>
+								<text v-if="afterServiceRecord.workerFeedbackReason">
+									<text v-if="afterServiceRecord.workerFeedbackReasonType">，</text>
+									{{afterServiceRecord.workerFeedbackReason}}
+								</text>
 							</view>
 							<view class="grid col-3 grid-square flex-sub margin-top-sm">
 								<view class="bg-img" v-for="(imgObj, imgIndex) in afterServiceRecord.imgsList" :key="imgIndex" v-if="imgObj.imgUploadBy === 2">