From 65845e88df45889d6b7e10e58e5cc6d58593e2fd Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Tue, 9 May 2023 23:28:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=A0=86=E6=96=87=E6=A1=88=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/demand-center/accept-demand-center.vue  |  10 +-
 pages/demand-center/demand-detail.vue         |  10 +-
 .../modal/on-door-immediately.vue             | 103 ++++++++++++++++++
 .../order-manage/modal/time-arrange-fail.vue  |  38 +++----
 pages/order-manage/order-manage.vue           |   8 +-
 5 files changed, 142 insertions(+), 27 deletions(-)
 create mode 100644 pages/order-manage/modal/on-door-immediately.vue

diff --git a/pages/demand-center/accept-demand-center.vue b/pages/demand-center/accept-demand-center.vue
index 066f002..5afab52 100644
--- a/pages/demand-center/accept-demand-center.vue
+++ b/pages/demand-center/accept-demand-center.vue
@@ -175,7 +175,8 @@
 				<view class="padding-xl">
 					<view class="cuIcon-roundcheck big-icon padding-tb text-main-color"></view>
 					<view class="text-bold text-lg margin-bottom-sm">接单成功</view>
-					<view>请在30分钟内联系客户，预约好上门时间，并在订单中操作排单时间，超时6倍将受平台处罚管理；该订单佣金在完成任务24小时内计入您的账户</view>
+					<view v-if="curTask.payType == 0">请在30分钟内联系客户，预约好上门时间，并在订单中操作排单时间，超时6倍将受平台处罚管理；该订单款项在任务流程结束后由银联自动结算至您帐户! </view>
+					<view v-else-if="curTask.payType == 1">该单需上门收款。请在30分钟内联系客户，并告知客户属上门收款单（金额以客户端弹出的金额为准或上门后师傅端弹出的二维码内金额支付）预约好上门时间，并在订单中操作排单时间，超时6倍将受平台处罚管理；该订单款项在任务流程结束后由银联自动结算至您帐户! </view>
 				</view>
 				<view class="cu-bar bg-white solid-top">
 					<view class="action margin-0 flex-sub text-black" data-modal="showTakeSuccessModal"
@@ -542,8 +543,11 @@
 				this.showModal(e, task);
 			},
 			contactCustomer(e) {
-				uni.makePhoneCall({
-					phoneNumber: this.curTask.customerPhone
+				// uni.makePhoneCall({
+				// 	phoneNumber: this.curTask.customerPhone
+				// })
+				uni.navigateTo({
+					url: '/pages/order-manage/order-manage'
 				})
 			},
 			goToCertify() {
diff --git a/pages/demand-center/demand-detail.vue b/pages/demand-center/demand-detail.vue
index 2a10be2..b22ce94 100644
--- a/pages/demand-center/demand-detail.vue
+++ b/pages/demand-center/demand-detail.vue
@@ -74,7 +74,8 @@
 				<view class="padding-xl">
 					<view class="cuIcon-roundcheck big-icon padding-tb text-main-color"></view>
 					<view class="text-bold text-lg margin-bottom-sm">接单成功</view>
-					<view>请在30分钟内联系客户，预约好上门时间，并在订单中操作排单时间，超时6倍将受平台处罚管理；该订单佣金在完成任务24小时内计入您的账户</view>
+					<view v-if="order.payType == 0">请在30分钟内联系客户，预约好上门时间，并在订单中操作排单时间，超时6倍将受平台处罚管理；该订单款项在任务流程结束后由银联自动结算至您帐户! </view>
+					<view v-else-if="order.payType == 1">该单需上门收款。请在30分钟内联系客户，并告知客户属上门收款单（金额以客户端弹出的金额为准或上门后师傅端弹出的二维码内金额支付）预约好上门时间，并在订单中操作排单时间，超时6倍将受平台处罚管理；该订单款项在任务流程结束后由银联自动结算至您帐户! </view>
 				</view>
 				<view class="cu-bar bg-white solid-top">
 					<view class="action margin-0 flex-sub text-black" data-modal="showTakeSuccessModal" @click="contactCustomer">联系客户</view>
@@ -184,8 +185,11 @@
 				})
 			},
 			contactCustomer(e) {
-				uni.makePhoneCall({
-					phoneNumber: this.order.customerPhone
+				// uni.makePhoneCall({
+				// 	phoneNumber: this.order.customerPhone
+				// })
+				uni.navigateTo({
+					url: '/pages/order-manage/order-manage'
 				})
 			},
 		}
diff --git a/pages/order-manage/modal/on-door-immediately.vue b/pages/order-manage/modal/on-door-immediately.vue
new file mode 100644
index 0000000..8d63f30
--- /dev/null
+++ b/pages/order-manage/modal/on-door-immediately.vue
@@ -0,0 +1,103 @@
+<template>
+	<view>
+		<!-- 模态框 -->
+		<view class="cu-modal" :class="show?'show':''">
+			<view class="cu-dialog">
+				<view class="cu-bar bg-white justify-end solid-bottom">
+					<view class="content">上门/服务规则</view>
+					<view class="action" data-modal="showOnDoorNoticeModal" @tap="hideModal">
+						<text class="cuIcon-close text-red"></text>
+					</view>
+				</view>
+				<view class="padding-xl text-left bg-white">
+					<view>1、上门/服务不得使用客户家的工具/用品(别说客户不介意)；不得谈论产品价格、服务费及师傅报酬等超服务内容的言论，否则引起不必要的纠纷或退货你全责。</view>
+					<view>2 、推销商是你的免费业务员与订单来源，也是你的代理商、经销商，其对本单动态监管；不得无故退单、撬单，不踩双方利益红线。</view>
+					<view class="text-main-color flex align-center justify-center">
+						<text>您可预告客户您约</text>
+						<picker class="relative-view" mode="selector" :range="minList" @change="minChange">
+							<input class="custom-input radius-input" v-model="waitMin" disabled>
+								<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
+							</input>
+						</picker>
+						<text>分钟左右到达</text>
+					</view>
+					<view class="text-center">确认后系统同步通知客户你正在上门...</view>
+				</view>
+				<view class="cu-bar bg-white solid-top">
+					<view class="action margin-0 flex-sub text-black" data-modal="showOnDoorNoticeModal"
+						@tap="hideModal">取消</view>
+					<view class="modal-bottom-oper margin-0 flex-sub text-main-color solid-left" data-modal="showOnDoorNoticeModal" @tap="workBegin">确认</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import myUniCombox from '@/components/uni-combox/my-uni-combox.vue';
+	
+	export default {
+		name: 'onDoorImmediately',
+		emits: ['confirmFeedback'],
+		props: {
+			show: {
+				type: Boolean,
+				default: false
+			},
+			data: {
+				type: Object,
+				default: {}
+			}
+		},
+		components: {
+			myUniCombox
+		},
+		data() {
+			return {
+				minList: [0, 15, 30, 45, 60, 80, 100],
+				waitMin: 0
+			}
+		},
+		methods: {
+			hideModal(e) {
+				uni.$emit(this.$globalFun.HIDE_MODAL, e);
+			},
+			minChange(e) {
+				this.waitMin = this.minList[e.detail.value];
+			},
+			async workBegin(e) {
+				let order = this.data;
+				let curDate = new Date();
+				let formatCurDate = curDate.getFullYear() + '-' + (curDate.getMonth() + 1) + '-' + curDate.getDate()
+					+ ' ' + curDate.getHours() + ':' + curDate.getMinutes() + ':' + curDate.getSeconds();
+				let params = {
+					id: order.orderDetailId,
+					orderStatus: 3,
+					workBeginTime: formatCurDate
+				}
+				let res = await this.$request.updateDetailOrder(params);
+				if (res && res.code === 0) {
+					// this.reloadMasterOrderPage();
+					uni.showToast({
+						icon: 'success',
+						duration: 1000
+					})
+					this.hideModal(e);
+					this.$emit('confirmFeedback');
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.relative-view {
+		position: relative;
+		width: 20%;
+	}
+	.input-arrow {
+		position: absolute;
+		right: 10rpx;
+		top: 25%;
+	}
+</style>
diff --git a/pages/order-manage/modal/time-arrange-fail.vue b/pages/order-manage/modal/time-arrange-fail.vue
index 09c7386..358a3bd 100644
--- a/pages/order-manage/modal/time-arrange-fail.vue
+++ b/pages/order-manage/modal/time-arrange-fail.vue
@@ -2,29 +2,14 @@
 	<view class="cu-modal" :class="show?'show':''">
 		<view class="cu-dialog">
 			<view class="cu-bar bg-white justify-end solid-bottom">
-				<view class="content">上传拨打电话记录截图</view>
+				<view class="content">未能排单</view>
 				<view class="action" data-modal="showArrangeFailTimeModal" @click="hideModal">
 					<text class="cuIcon-close text-red"></text>
 				</view>
 			</view>
 			<view class="bg-white padding text-left">
-				<view>
-					<view class="grid col-3 grid-square flex-sub">
-						<view class="bg-img" v-for="(item,index) in imgList" :key="index"
-							@tap="viewImage($event, imgList)" :data-url="item">
-							<image :src="item" mode="aspectFill"></image>
-							<view class="cu-tag bg-red" @tap.stop="delImg($event, imgList)" :data-index="index">
-								<text class='cuIcon-close'></text>
-							</view>
-						</view>
-						<view class="solids" @tap="chooseImage" v-if="imgList.length < 1">
-							<text class='cuIcon-cameraadd'></text>
-						</view>
-					</view>
-					<view class="text-center">（选填）</view>
-				</view>
-				<view class="padding-tb-sm solid-bottom">多次联系客户未接通时，可上传拨打截图确认无法排单，客诉时你无责，确认无法排单后将不计时效</view>
-				<view class="padding-top-sm">
+				<view class="padding-tb-sm">2次以上未接通，上传拨打或短信截图备案，一是避免客户投诉无人联系，二是销售或平台方见图无需陆续找来</view>
+				<!-- <view class="padding-top-sm">
 					<view class="flex justify-start">
 						<view class="margin-right">原因选择：</view>
 						<radio-group @change="changeReasonRadio">
@@ -43,6 +28,22 @@
 						<textarea style="width: 100%; height: 300rpx;" class="solid padding-sm" maxlength="-1" @input="inputSpecificReason"
 							placeholder="具体情况(选填)"></textarea>
 					</view>
+				</view> -->
+				<view>
+					<view class="padding-tb-sm">上传拨打或短信截图</view>
+					<view class="grid col-3 grid-square">
+						<view class="bg-img" v-for="(item,index) in imgList" :key="index"
+							@tap="viewImage($event, imgList)" :data-url="item">
+							<image :src="item" mode="aspectFill"></image>
+							<view class="cu-tag bg-red" @tap.stop="delImg($event, imgList)" :data-index="index">
+								<text class='cuIcon-close'></text>
+							</view>
+						</view>
+						<view class="solids" @tap="chooseImage" v-if="imgList.length < 1">
+							<text class='cuIcon-cameraadd'></text>
+						</view>
+					</view>
+					<!-- <view class="text-center">（选填）</view> -->
 				</view>
 			</view>
 			<view class="cu-bar bg-white solid-top">
@@ -133,6 +134,5 @@
 		padding-bottom: calc((100% - 40rpx)/3);
 		height: 0;
 		width: calc((100% - 40rpx)/3);
-		margin-left: calc(100%/2 - (100% - 40rpx)/3/2);
 	}
 </style>
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 2f2b072..f7075f6 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -223,7 +223,7 @@
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="showServOrderDetail(order)">查看</button>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="makePhoneCall(order.customerPhone)">联系客户</button>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showEditTimeArrangeModal" @tap="showModal($event, order)" v-show="order.orderDetailId != null">修改时间</button>
-				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="workBegin(order)" v-show="order.orderDetailId != null">立即上门</button>
+				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showOnDoorNoticeModal" @tap="showModal($event, order)" v-show="order.orderDetailId != null">立即上门</button>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" v-if="order.orderDetailId != null" @click="rejectDetailOrder(order)">退单</button>
 			</view>
 			<view v-if="order.orderStatus === 3">
@@ -423,6 +423,7 @@
 		<edit-time-arrange v-if="showEditTimeArrangeModal" :show="showEditTimeArrangeModal" :data="curOrder" :curDate="curDate" @showArrangeFailTime="showArrangeFailTime" @editServTime="editServTime" :ifRollback2WS="true"></edit-time-arrange>
 		<urgent-msg v-if="sendUrgentMsgModal" :show="sendUrgentMsgModal" @hideModal="hideModal"></urgent-msg>
 		<pic-modal ref="showPicModal" :imgList="picModalImgList"></pic-modal>
+		<on-door-immediately v-if="showOnDoorNoticeModal" :show="showOnDoorNoticeModal" :data="curOrder" @confirmFeedback="reloadMasterOrderPage"></on-door-immediately>
 		<confirm-modal ref="ledgerAccountRemark" :showCancel="false" :showConfirm="true">
 			<block slot="contentView">
 				<view class="text-left">
@@ -464,6 +465,7 @@
 	import loadStatusBar from '@/components/custom-bar/load-status-bar.vue';
 	import agreeAfterSale from '@/pages/order-manage/modal/agree-after-sale.vue';
 	import rejectAfterSale from '@/pages/order-manage/modal/reject-after-sale.vue';
+	import onDoorImmediately from '@/pages/order-manage/modal/on-door-immediately.vue';
 	
 	export default {
 		components: {
@@ -479,7 +481,8 @@
 			picModal,
 			loadStatusBar,
 			agreeAfterSale,
-			rejectAfterSale
+			rejectAfterSale,
+			onDoorImmediately
 		},
 		data() {
 			return {
@@ -560,6 +563,7 @@
 				showNewServPriceOfflineModal: false,
 				showPayQrcodeModal: false,
 				showEditTimeArrangeModal: false,
+				showOnDoorNoticeModal: false,
 				sendUrgentMsgModal: false,
 				agreeAfterSale: false,
 				rejectAfterSale: false,