From e5e9f6c32573ef76d3228a7c6a6e0b7e7fd45e75 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 9 Oct 2022 23:17:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=EF=BC=8C=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=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/finish-order.vue           | 55 +++++++++++--------
 pages/order-manage/modal/agree-after-sale.vue |  2 +-
 pages/order-manage/order-manage.vue           |  9 ++-
 3 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/pages/order-manage/finish-order.vue b/pages/order-manage/finish-order.vue
index 4060059..f66162d 100644
--- a/pages/order-manage/finish-order.vue
+++ b/pages/order-manage/finish-order.vue
@@ -20,17 +20,17 @@
 		</view>
 		<view class="margin-top-sm bg-white padding">
 			<!-- 服务指标 -->
-			<!-- <checkbox-group class="block" @change="checkServIndex">
+			<checkbox-group class="block" @change="changeServIndexChecked">
 				<view style="min-width: 50%;" class="flex justify-start align-center margin-top-sm float-left" v-for="(item, index) in servIndex">
-					<checkbox style="transform:scale(1)" class="main-color margin-right-xs" :checked="checkIndexArr[index] === '1'" value='1'>
+					<checkbox style="transform:scale(1)" class="main-color margin-right-xs" :value="item.code">
 					</checkbox>
-					<text @click="checkedCurBox(index)">{{item}}</text>
+					<text class="text-sm">{{item.desc}}</text>
 				</view>
-			</checkbox-group> -->
+			</checkbox-group>
 			<!-- 完工图片上传 -->
 			<view class="padding-top-lg float-clear">
 				<view>
-					<text class="text-bold text-black">上传完工照片 {{finishImgList.length}}/3</text>
+					<text class="text-bold text-black">上传完工照片 {{finishImgList.length}}/12</text>
 					<text>（按订单要求上传）</text>
 				</view>
 				<view class="grid col-3 grid-square flex-sub margin-top-sm">
@@ -41,7 +41,7 @@
 							<text class='cuIcon-close'></text>
 						</view>
 					</view>
-					<view class="solids" @tap="chooseImgList(e, finishImgList)" v-if="finishImgList.length < 3">
+					<view class="solids" @tap="chooseImgList(e, finishImgList)" v-if="finishImgList.length < 12">
 						<text class='cuIcon-cameraadd'></text>
 					</view>
 				</view>
@@ -50,7 +50,11 @@
 			<view class="padding-top text-bold text-black">备注</view>
 			<view class="margin-top-sm">
 				<textarea style="width: 100%; height: 300rpx;" class="solid radius text-left padding-sm" v-model="remark"
-					maxlength="-1" placeholder="温馨提示: 服务过程中有分歧存在客诉隐患或未能及时处理彻底的,请急报说明情况,将由平台客服一起协调沟通,否则造成你有责任的客诉将不利于服务评价;上述勾选需真实,被反映虚假或回访不实属恶意反馈,可能会被商家投诉"></textarea>
+					maxlength="-1" placeholder="温馨提示：服务过程中有分歧存在客诉隐患或未能及时处理彻底的，请急报说明情况，将由平台客服一起协调沟通，否则造成你有责任的客诉将不利于服务评价；上述勾选需真实，被反映虚假或回访不实属恶意反馈，可能会被商家投诉。"></textarea>
+			</view>
+			<view class="margin-top-sm text-sm">
+				<text class="text-red">注：</text>
+				<text class="text-main-color">完工验收满意后必须让客户在下单处评价，标示为“商城订单”的，务必确保让客户进行评价</text>
 			</view>
 			<!-- 确认按钮 -->
 			<view class="margin-lr margin-bottom padding-top-xl">
@@ -66,15 +70,15 @@
 			return {
 				checkIndexArr: [],
 				servIndex: [
-					'本单准时上门',
-					'鞋套工装设备完善',
-					'订单备注处理完成',
-					'水电隐患已核查',
-					'服务前后都已试机',
-					'卫生已清理',
-					'服务中出现过问题，已和客户沟通并同意',
-					'产生的费用是服务前说明并报给予客户，客户同意',
-					'已让客户验收，并提示客户验收内容，已完成此项'
+					{ code: '1', desc: '本单准时上门'},
+					{ code: '2', desc: '鞋套口罩/工装设备齐全'},
+					{ code: '3', desc: '服务前后已试机/查验'},
+					{ code: '4', desc: '水电隐患/服务内容已核查'},
+					{ code: '5', desc: '订单备注处理完成'},
+					{ code: '6', desc: '卫生已清理(略超范围清理)'},
+					{ code: '7', desc: '服务中客户有提出异议的意见，已充分理解并妥善处理完毕'},
+					{ code: '8', desc: '产生的额外费用/加单费用，是服务前报予客户的，客户同意'},
+					{ code: '9', desc: '已让客户验收，并提示客户验收内容，请客户评价！'},
 				],
 				finishImgList: [],
 				remark: '',
@@ -93,7 +97,7 @@
 			},
 			chooseImgList(e, imgList) {
 				uni.chooseImage({
-					count: 3 - imgList.length, //默认9
+					count: 12 - imgList.length, //默认9
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					sourceType: ['album'], //从相册选择
 					success: (res) => {
@@ -155,12 +159,17 @@
 				let res = await this.$request.applyFinishOrder({
 					orderDetailId: this.order.orderDetailId,
 					finishImgList: this.finishImgList,
-					remark: this.remark
+					remark: this.remark,
+					assessLabels: this.checkIndexArr
 				});
 				if (res && res.code === 0) {
+					uni.navigateBack({
+						delta: -1
+					})
 					uni.showToast({
-						icon: 'success',
-						title: '提交成功'
+						icon: 'none',
+						title: '提交成功，请在我的订单-确认中查看',
+						duration: 2500
 					})
 				} else if (res && res.msg) {
 					uni.showToast({
@@ -174,10 +183,10 @@
 						title: '提交失败'
 					})
 				}
+			},
+			changeServIndexChecked(e) {
+				this.checkIndexArr = e.detail.value;
 			}
-			// checkedCurBox(index) {
-			// 	this.checkIndexArr[index] = 1;
-			// }
 		},
 	}
 </script>
diff --git a/pages/order-manage/modal/agree-after-sale.vue b/pages/order-manage/modal/agree-after-sale.vue
index d1e97dc..40702cf 100644
--- a/pages/order-manage/modal/agree-after-sale.vue
+++ b/pages/order-manage/modal/agree-after-sale.vue
@@ -10,7 +10,7 @@
 			<view class="padding text-left">
 				<view class="text-lg">
 					<text>退款金额：</text>
-					<text class="text-price text-red">{{data.afterServiceRecordList[0].refund}}</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 class="text-lg padding-top flex justify-start align-center">
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index d9a3d00..86e468b 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -212,7 +212,8 @@
 							</view>
 							<view>
 								<text>退款金额：</text>
-								<text>{{afterServiceRecord.refund}}</text>
+								<text v-if="afterServiceRecord.refund">{{afterServiceRecord.refund}}</text>
+								<text v-if="order.payMoney">{{order.payMoney}}</text>
 							</view>
 							<view>
 								<text>退款原因：</text>
@@ -261,7 +262,9 @@
 							</view>
 							<view v-if="afterServiceRecord.workerFeedbackResult === 1">
 								<text>同意退款金额：</text>
-								<text>{{afterServiceRecord.agreedRefund}}</text>
+								<text v-if="afterServiceRecord.agreedRefund">{{afterServiceRecord.agreedRefund}}</text>
+								<text v-else-if="afterServiceRecord.refund">{{afterServiceRecord.refund}}</text>
+								<text v-else-if="order.payMoney">{{order.payMoney}}</text>
 							</view>
 							<view>
 								<text>师傅反馈：</text>
@@ -406,7 +409,7 @@
 					name: '服务中'
 				}, {
 					code: 4,
-					name: '待确认'
+					name: '确认中'
 				}, 
 				// {
 				// 	code: '-',