From eb49ba401405e65e97a3bd9e907bf605faeef1a5 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Mon, 26 Sep 2022 23:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order-manage/modal/agree-after-sale.vue |  5 +-
 .../order-manage/modal/reject-after-sale.vue  |  1 +
 pages/order-manage/order-manage.vue           | 88 ++++++++++---------
 3 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/pages/order-manage/modal/agree-after-sale.vue b/pages/order-manage/modal/agree-after-sale.vue
index e2969c2..ab68a82 100644
--- a/pages/order-manage/modal/agree-after-sale.vue
+++ b/pages/order-manage/modal/agree-after-sale.vue
@@ -10,9 +10,9 @@
 			<view class="padding text-left">
 				<view class="text-lg">
 					<text>本单售后到帐额：</text>
-					<text class="text-price text-red">{{data.explainRefund}}</text>
+					<text class="text-price text-red">{{data.afterServiceRecordList[0].refund}}</text>
 				</view>
-				<view class="text-lg padding-top">
+				<view class="text-lg padding-top flex justify-start align-center">
 					<text>更改到帐额：</text>
 					<input class="radius-input inline-input" v-model="agreedRefund"></input>
 					<text class="margin-left-xs">元</text>
@@ -91,6 +91,7 @@
 					workerFeedbackReasonType: this.reasonType,
 					agreedRefund: this.agreedRefund,
 					workerFeedbackReason: this.remark,
+					workerFeedbackResult: 1,
 					updateBy: 2
 				});
 				if (res && res.code === 0) {
diff --git a/pages/order-manage/modal/reject-after-sale.vue b/pages/order-manage/modal/reject-after-sale.vue
index d3dd70e..c860326 100644
--- a/pages/order-manage/modal/reject-after-sale.vue
+++ b/pages/order-manage/modal/reject-after-sale.vue
@@ -143,6 +143,7 @@
 					id: this.data.afterServiceRecordList[0].id,
 					workerFeedbackReasonType: this.reasonType,
 					workerFeedbackReason: this.remark,
+					workerFeedbackResult: 0,
 					imgsList: imgObjList,
 					updateBy: 2
 				});
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index b01bcfb..4b0cd06 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -190,11 +190,11 @@
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm">立即上门</button>
 			</view> -->
 			<view v-if="order.afterServiceRecordList && order.afterServiceRecordList.length" class="bg-white margin-top-sm">
-				<view v-for="(afterServiceRecord, afterServiceRecordIndex) in order.afterServiceRecordList" class="solid-top padding-tb">
-					<view v-if="afterServiceRecord.createBy == 1">
+				<view v-for="(afterServiceRecord, afterServiceRecordIndex) in order.afterServiceRecordList">
+					<view v-if="afterServiceRecord.createBy == 1" class="padding-tb solid-top">
 						<view class='cu-tag bg-main-color radius light'>客户发起</view>
 						<view v-if="afterServiceRecord.operType === 1">
-							<view class="margin-top-sm">
+							<view class="flex justify-start align-end">
 								<text>退款申请：</text>
 								<uni-countdown :show-colon="false" :backgroundColor="'#eee'"
 									:day="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).day" 
@@ -203,16 +203,16 @@
 									:second="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).seconds">
 								</uni-countdown>
 							</view>
-							<view class="margin-top-sm">
+							<view>
 								<text>退款金额：</text>
 								<text>{{afterServiceRecord.refund}}</text>
 							</view>
-							<view class="margin-top-sm">
+							<view>
 								<text>退款原因：</text>
 								<text>{{afterServiceRecord.customerReason}}</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">
+								<view class="bg-img" v-for="(imgObj, imgIndex) in afterServiceRecord.imgsList" :key="imgIndex" v-if="imgObj.imgUploadBy === 1">
 									<image :src="imgObj.imgUrl" @tap="viewImage($event, [imgObj.imgUrl])" :data-url="imgObj.imgUrl" mode="aspectFill"></image>
 								</view>
 							</view>
@@ -231,69 +231,67 @@
 								<text>售后原因：</text>
 								<text>{{afterServiceRecord.customerReason}}</text>
 							</view>
-							<view class="margin-top-sm">
+							<view>
 								<text>完成操作：点击“处理完成”提交由客服回访！</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">
+								<view class="bg-img" v-for="(imgObj, imgIndex) in afterServiceRecord.imgsList" :key="imgIndex" v-if="imgObj.imgUploadBy === 1">
 									<image :src="imgObj.imgUrl" @tap="viewImage($event, [imgObj.imgUrl])" :data-url="imgObj.imgUrl" mode="aspectFill"></image>
 								</view>
 							</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" 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>
 					</view>
-					<view v-if="afterServiceRecord.updateBy == 2">
+					<view v-if="afterServiceRecord.updateBy == 2" class="padding-tb solid-top">
 						<view class='cu-tag bg-main-color radius light'>师傅反馈</view>
 						<view v-if="afterServiceRecord.operType === 1">
-							<view class="margin-top-sm">
-								<text>退款申请：</text>
-								<uni-countdown :show-colon="false" :backgroundColor="'#eee'"
-									:day="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).day" 
-									:hour="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).hour" 
-									:minute="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).min" 
-									:second="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).seconds">
-								</uni-countdown>
+							<view class="margin-top-xs">
+								<text>师傅反馈结果：</text>
+								<text>{{afterServiceRecord.workerFeedbackResult === 1 ? '同意' : '拒绝'}}</text>
 							</view>
-							<view class="margin-top-sm">
-								<text>退款金额：</text>
-								<text>{{afterServiceRecord.agreedRefund ? afterServiceRecord.agreedRefund : afterServiceRecord.refund}}</text>
+							<view v-if="afterServiceRecord.workerFeedbackResult === 1">
+								<text>同意退款金额：</text>
+								<text>{{afterServiceRecord.agreedRefund}}</text>
 							</view>
-							<view class="margin-top-sm">
-								<text>退款原因：</text>
-								<text>{{afterServiceRecord.workerFeedbackReason}}</text>
+							<view>
+								<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>
 							</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">
+								<view class="bg-img" v-for="(imgObj, imgIndex) in afterServiceRecord.imgsList" :key="imgIndex" v-if="imgObj.imgUploadBy === 2">
 									<image :src="imgObj.imgUrl" @tap="viewImage($event, [imgObj.imgUrl])" :data-url="imgObj.imgUrl" mode="aspectFill"></image>
 								</view>
 							</view>
 						</view>
 						<view v-else-if="afterServiceRecord.operType === 2">
-							<view class="flex justify-start align-end">
-								<text>待处理售后：</text>
-								<uni-countdown :show-colon="false" :backgroundColor="'#eee'"
-									:day="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).day" 
-									:hour="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).hour" 
-									:minute="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).min" 
-									:second="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).seconds">
-								</uni-countdown>
+							<view class="margin-top-xs">
+								<text>师傅反馈结果：</text>
+								<text>{{afterServiceRecord.workerFeedbackResult === 1 ? '同意' : '拒绝'}}</text>
 							</view>
 							<view>
-								<text>售后原因：</text>
-								<text>{{afterServiceRecord.workerFeedbackReason}}</text>
-							</view>
-							<view class="margin-top-sm">
-								<text>完成操作：点击“处理完成”提交由客服回访！</text>
+								<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>
 							</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">
+								<view class="bg-img" v-for="(imgObj, imgIndex) in afterServiceRecord.imgsList" :key="imgIndex" v-if="imgObj.imgUploadBy === 2">
 									<image :src="imgObj.imgUrl" @tap="viewImage($event, [imgObj.imgUrl])" :data-url="imgObj.imgUrl" mode="aspectFill"></image>
 								</view>
 							</view>
 						</view>
 					</view>
-					<view class="flex justify-end align-end">
-						<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 v-if="afterServiceRecord.customerFinalCheck != null" class="padding-tb 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>
 				</view>
 			</view>
@@ -1007,7 +1005,13 @@
 				let refName = e.currentTarget.dataset.ref;
 				this.$refs[refName].init(priceObj);
 				this.showModal(e, order);
-			}
+			},
+			viewImage(e, imgList) {
+				uni.previewImage({
+					urls: imgList,
+					current: e.currentTarget.dataset.url
+				});
+			},
 		}
 	}
 </script>