From 542a098c28fb38e6d23b4656efb37c7d3f13c425 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 22 Jun 2022 22:37:32 +0800
Subject: [PATCH] =?UTF-8?q?=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/index/my-home.vue    | 25 ++++++++++++++++++-------
 pages/my/my-order.vue      |  9 ++++++---
 pages/my/serv-detail.vue   |  4 ++--
 pages/order/pay-result.vue |  7 +++++++
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/pages/index/my-home.vue b/pages/index/my-home.vue
index 52b9d72..e768fc9 100644
--- a/pages/index/my-home.vue
+++ b/pages/index/my-home.vue
@@ -88,9 +88,17 @@
 								<block>{{myInfo.serOrderNum.wait2Serv}}</block>
 							</view>
 						</view>
-						<text>待排期</text>
+						<text>待接单</text>
 					</view>
 					<view class="cu-item" @click="showMyOrders(servOrderTabList, 2, servOrderType)">
+						<view class="cuIcon-calendar">
+							<view class="cu-tag badge" v-if="myInfo.serOrderNum.wait2Serv > 0">
+								<block>{{myInfo.serOrderNum.wait2Serv}}</block>
+							</view>
+						</view>
+						<text>待排期</text>
+					</view>
+					<view class="cu-item" @click="showMyOrders(servOrderTabList, 3, servOrderType)">
 						<view class="cuIcon-repair">
 							<view class="cu-tag badge" v-if="myInfo.serOrderNum.processing > 0">
 								<block>{{myInfo.serOrderNum.processing}}</block>
@@ -98,7 +106,7 @@
 						</view>
 						<text>待上门</text>
 					</view>
-					<view class="cu-item" @click="showMyOrders(servOrderTabList, 3, servOrderType)">
+					<view class="cu-item" @click="showMyOrders(servOrderTabList, 4, servOrderType)">
 						<view class="cuIcon-comment">
 							<view class="cu-tag badge" v-if="myInfo.serOrderNum.afterServ > 0">
 								<block>{{myInfo.serOrderNum.afterServ}}</block>
@@ -106,7 +114,7 @@
 						</view>
 						<text>服务中</text>
 					</view>
-					<view class="cu-item" @click="showMyOrders(servOrderTabList, 4, servOrderType)">
+					<view class="cu-item" @click="showMyOrders(servOrderTabList, 5, servOrderType)">
 						<view class="cuIcon-notice">
 							<view class="cu-tag badge" v-if="myInfo.serOrderNum.afterServ > 0">
 								<block>{{myInfo.serOrderNum.afterServ}}</block>
@@ -114,7 +122,7 @@
 						</view>
 						<text>完成待确认</text>
 					</view>
-					<view class="cu-item" @click="showMyOrders(servOrderTabList, 5, servOrderType)">
+					<view class="cu-item" @click="showMyOrders(servOrderTabList, 6, servOrderType)">
 						<view class="cuIcon-forward">
 							<view class="cu-tag badge" v-if="myInfo.serOrderNum.wait2Forward > 0">
 								<block>{{myInfo.serOrderNum.wait2Forward}}</block>
@@ -256,8 +264,11 @@
 				curUserInfo: {},
 				myInfo: {},
 				servOrderTabList: [{
-					type: 1,
+					// type: -1,
 					name: '待付款'
+				}, {
+					type: 0,
+					name: '待接单'
 				}, {
 					type: 1,
 					name: '待排期'
@@ -268,10 +279,10 @@
 					type: 3,
 					name: '服务中'
 				}, {
-					type: 6,
+					type: 4,
 					name: '完成待确认'
 				}, {
-					type: 4,
+					type: 5,
 					name: '已完成'
 				}],
 				servOrderType: 0,
diff --git a/pages/my/my-order.vue b/pages/my/my-order.vue
index bfb2ca8..6740bc5 100644
--- a/pages/my/my-order.vue
+++ b/pages/my/my-order.vue
@@ -64,7 +64,7 @@
 							<button class="cu-btn bg-main-color margin-right-sm shadow-blur">评价</button>
 						</view> -->
 					</view>
-					<view v-if="orderType === 0 && shopOrder.orderStatus === 6"
+					<view v-if="orderType === 0 && shopOrder.orderStatus === 4"
 						class="padding-tb-sm solid-top">
 						<view>师傅已提交完成，请验收。</view>
 						<!-- <view>服务保障权益期：</view> -->
@@ -72,7 +72,7 @@
 							<!-- <view>{{shopOrder.finishOrder.finishWaitUntil}}</view> -->
 							<view>
 								<button class="cu-btn sm bg-yellow margin-right-sm"
-									@click="updateFinisheStatus(shopOrder, 4, false)">确认完单</button>
+									@click="updateFinisheStatus(shopOrder, 5, false)">确认完单</button>
 								<button class="cu-btn sm bg-yellow margin-right-sm"
 									@click="updateFinisheStatus(shopOrder, 3, true)">拒绝完单</button>
 								<!-- <button v-if="shopOrder.finishOrder.finishStatus === 2"
@@ -124,7 +124,8 @@
 			loadStatusBar
 		},
 		data() {
-			return {
+			return {
+				curUserInfo: {},
 				scrollLeft: 0,
 				tabCur: 0,
 				tabHeaderList: [],
@@ -152,6 +153,7 @@
 		},
 		methods: {
 			loadData() {
+				this.curUserInfo = this.$request.getCurUserInfo();
 				for(let i = 0; i < this.tabHeaderList.length; i++) {
 					this.pageParams.push({
 						pageNum: 0
@@ -178,6 +180,7 @@
 				params.pageSize = this.$globalData.initPageSize;
 				this.$refs.loadStatusBar.showLoading();
 				try {
+					params.customerId = this.curUserInfo.customerId;
 					params.orderType = this.orderType;
 					params.orderStatus = this.tabHeaderList[this.tabCur].type;
 					if (this.tabCur === 0) {
diff --git a/pages/my/serv-detail.vue b/pages/my/serv-detail.vue
index 9545a41..9ff83b3 100644
--- a/pages/my/serv-detail.vue
+++ b/pages/my/serv-detail.vue
@@ -93,8 +93,8 @@
 				<view>师傅：{{item.workerName}}</view>
 				<view class="margin-top-sm">联系方式：{{item.workerPhone}}</view>
 				<view class="margin-top-sm">预约时间：{{item.expectTimeStart + '~' + item.expectTimeEnd}}</view>
-				<view class="margin-top-sm" v-if="servDetail.orderStatus === 3 || servDetail.orderStatus === 6 || servDetail.orderStatus === 4">上门时间：{{item.workBeginTime}}</view>
-				<view class="margin-top-sm" v-if="item.workFinishTime">完成时间：{{item.workFinishTime}}</view>
+				<view class="margin-top-sm" v-if="servDetail.orderStatus >= 3">上门时间：{{item.workBeginTime}}</view>
+				<view class="margin-top-sm" v-if="servDetail.orderStatus >= 4">完成时间：{{item.workFinishTime}}</view>
 				<simple-product-picked :pickedList="item.orderStandardList" :columnTitleArr="servedColumnHeaders" :valFieldArr="servedValFields"></simple-product-picked>
 			</view>
 		</view>
diff --git a/pages/order/pay-result.vue b/pages/order/pay-result.vue
index 0613346..e831394 100644
--- a/pages/order/pay-result.vue
+++ b/pages/order/pay-result.vue
@@ -22,7 +22,11 @@
 				payResult: false,
 				customTip: null,
 				servOrderTabList: [{
+					// type: -1,
 					name: '待付款'
+				}, {
+					type: 0,
+					name: '待接单'
 				}, {
 					type: 1,
 					name: '待排期'
@@ -34,6 +38,9 @@
 					name: '服务中'
 				}, {
 					type: 4,
+					name: '完成待确认'
+				}, {
+					type: 5,
 					name: '已完成'
 				}],
 				servOrderType: 0