From 1c611fe3c3b16853b81133c5ab80b44587d69a6e Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 10 Jul 2022 19:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8E=A5=E5=8F=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E9=9A=90=E8=97=8F=E6=88=96=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=B8=AD=E5=86=85=E5=AE=B9=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/data.js                     |  2 +-
 common/js/globalData.js               |  2 +-
 components/default-toast/bg-toast.vue | 35 +++++++++++++++++
 pages/area-proxy/my-team.vue          | 31 +++++++++------
 pages/index/index-home.vue            | 49 +++++++++++++++++-------
 pages/index/msg-home.vue              | 20 ++++++----
 pages/index/my-home.vue               | 24 +++++++-----
 pages/my/my-money-bag.vue             | 10 ++---
 pages/my/personal-info.vue            |  4 +-
 pages/my/withdraw.vue                 | 28 +++++++++++---
 pages/order-manage/order-manage.vue   | 12 ++++--
 pages/order-manage/serv-detail.vue    | 55 ++++++++++++++++-----------
 12 files changed, 190 insertions(+), 82 deletions(-)
 create mode 100644 components/default-toast/bg-toast.vue

diff --git a/common/js/data.js b/common/js/data.js
index e851ddd..bb00a78 100644
--- a/common/js/data.js
+++ b/common/js/data.js
@@ -16,7 +16,7 @@ const moduleBarInfos = [{
 	cuIcon: 'message',
 	pageCode: 'msgPage',
 	name: '消息',
-	countTag: 100
+	countTag: 0
 }, {
 	id: 4,
 	cuIcon: 'my',
diff --git a/common/js/globalData.js b/common/js/globalData.js
index 16aaf13..744f71f 100644
--- a/common/js/globalData.js
+++ b/common/js/globalData.js
@@ -2,7 +2,7 @@ export default {
 	deptId: 101,
 	from: 'server',
 	initPageNum: 1,
-	initPageSize: 1,
+	initPageSize: 10,
 	timeRangeList: [
 		'08:00-08:30',
 		'08:30-09:00',
diff --git a/components/default-toast/bg-toast.vue b/components/default-toast/bg-toast.vue
new file mode 100644
index 0000000..10b3546
--- /dev/null
+++ b/components/default-toast/bg-toast.vue
@@ -0,0 +1,35 @@
+<template>
+	<view>
+		<view class="padding-xl text-gray text-center">
+			<view class="big-icon padding-tb" :class="'cuIcon-' + icon"></view>
+			<view class="text-lg">功能开发中，暂无法使用</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'bg-toast',
+		props: {
+			icon: {
+				type: String,
+				default: ''
+			},
+			msg: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/area-proxy/my-team.vue b/pages/area-proxy/my-team.vue
index e6f5548..662a270 100644
--- a/pages/area-proxy/my-team.vue
+++ b/pages/area-proxy/my-team.vue
@@ -1,7 +1,11 @@
 <template>
 	<view>
-		<!-- 顶部操作条 -->
-		<cu-custom :bgColor="'bg-main-color'" :isBack="true">
+		<!-- 顶部操作条 -->
+		<cu-custom :bgColor="'bg-main-color'" :isBack="false" :isBackHome="true" :homePageUrl="'/pages/index/index'" v-if="backIndex">
+			<block slot="backHomeText">首页</block>
+			<block slot="content">我的团队</block>
+		</cu-custom>
+		<cu-custom :bgColor="'bg-main-color'" :isBack="true" v-else>
 			<block slot="backText">返回</block>
 			<block slot="content">我的团队</block>
 		</cu-custom>
@@ -58,7 +62,8 @@
 		<set-take-rate ref="setTakeRateModal" :leaderTeamRate="Number(curUserInfo.leaderTeamRate)*100"
 			:leaderTeamMoney="curUserInfo.leaderTeamMoney" @confirm="applySetTakeRate"></set-take-rate>
 		<invite-master ref="inviteMasterModal" :inviteMasterObj="inviteMasterObj" @confirm="inviteMaster"></invite-master>
-		<confirm-modal ref="confirmModal" :content="'当前无法加入师傅团队，请先登录并完成师傅入驻申请。'" @confirm="goToIndex"></confirm-modal>
+		<confirm-modal ref="loginTipModal" :content="'当前无法加入师傅团队，请先登录。'" @confirm="goToPage('/pages/index/index')"></confirm-modal>
+		<confirm-modal ref="certifyTipModal" :content="'当前无法加入师傅团队，请先完成师傅实名及银行账户绑定。'" @confirm="goToPage('/pages/index/index?menuCode=myPage')"></confirm-modal>
 	</view>
 </template>
 
@@ -74,7 +79,8 @@
 			loadStatusBar
 		},
 		data() {
-			return {
+			return {
+				backIndex: false,
 				members: [],
 				pageNum: 0,
 				pageSize: 0,
@@ -86,6 +92,7 @@
 			if (options && options.inviteMasterObj) {
 				// 点击邀请链接进入的页面
 				this.beInvited2Team(JSON.parse(decodeURIComponent(options.inviteMasterObj)));
+				this.backIndex = true;
 			} else {
 				this.loadData();
 			}
@@ -94,7 +101,7 @@
 			return {
 				title: '邀请你成为我的团队成员',
 				path: '/pages/area-proxy/my-team?inviteMasterObj=' + encodeURIComponent(JSON.stringify(this.curUserInfo)),
-				// imageUrl: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big5000.jpg'
+				imageUrl: 'http://gqz.opsoul.com/sys/group-selfie.png'
 			}
 		},
 		methods: {
@@ -102,9 +109,12 @@
 				this.loadBasicData();
 				this.inviteMasterObj = inviteMasterObj;
 				let curUserInfo = await this.login();
-				if (curUserInfo == null || curUserInfo.status !== 0) {
-					// 提示登录和入驻成为师傅，返回首页
-					this.showModalByRef('confirmModal');
+				if (!curUserInfo) {
+					// 提示登录，返回首页
+					this.showModalByRef('loginTipModal');
+				} else if (curUserInfo.status !== 0) {
+					// 提示绑卡和实名，返回首页
+					this.showModalByRef('certifyTipModal');
 				} else {
 					this.showModalByRef('inviteMasterModal');
 				}
@@ -115,9 +125,9 @@
 				// 返回缓存中的userInfo
 				return this.$request.getCurUserInfo();
 			},
-			goToIndex() {
+			goToPage(pageUrl) {
 				uni.reLaunch({
-					url: '/pages/index/index'
+					url: pageUrl
 				})
 			},
 			loadBasicData() {
@@ -132,7 +142,6 @@
 				this.loadTeamPage();
 			},
 			async reloadData() {
-				this.loadBasicData();
 				this.members = [];
 				this.loadData();
 			},
diff --git a/pages/index/index-home.vue b/pages/index/index-home.vue
index e5856cf..1135733 100644
--- a/pages/index/index-home.vue
+++ b/pages/index/index-home.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
-		<view class="padding bg-gradual-color"
-			:style="'padding-top: ' + pageContentTop + 'px; padding-bottom: 100rpx;'">
+		<!-- <view class="padding bg-gradual-color" :style="'padding-top: ' + pageContentTop + 'px; padding-bottom: 100rpx;'"> -->
+		<view class="padding bg-gradual-color" :style="'padding-top: ' + pageContentTop + 'px;'">
 			<!-- 个人信息栏 -->
 			<view class="flex justify-between padding-bottom align-center solid-bottom">
 				<view class="flex justify-start align-center">
@@ -16,7 +16,7 @@
 						</view> -->
 					</view>
 				</view>
-				<view class="right-tag padding-lr padding-tb-xs" @click="showMasterRule">师傅规则</view>
+				<!-- <view class="right-tag padding-lr padding-tb-xs" @click="showMasterRule">师傅规则</view> -->
 			</view>
 			<!-- 未预约，未派单，上门超时 -->
 			<view class="cu-list grid no-border col-3 margin-top-sm" style="background-color: inherit;">
@@ -34,26 +34,31 @@
 				</view>
 			</view>
 		</view>
-		<view class="margin-lr-sm paper-drawer-bar margin-bottom-with-bar">
+		<view class="margin-lr-sm margin-bottom-with-bar">
 			<!-- 今日待上门 -->
 			<view class="bg-white padding-lr shadow-warp">
 				<view class="cu-bar margin-top-sm solid-bottom">
 					<view class="action bar-first-action">
 						<view class="cuIcon-title text-main-color"></view>
-						<text>今日待上门({{myInfo.order.onsiteToday.length}})</text>
+						<text>今日待上门({{waitServOrderToday.length}})</text>
 					</view>
-					<view class="flex justify-end text-sm align-center">
+					<view class="flex justify-end text-sm align-center"
+						@click="clickServModule({
+							pageUrl: '/pages/order-manage/order-manage'
+						})">
 						<text>即将上门订单</text>
 						<text class="cuIcon-right"></text>
 					</view>
 				</view>
 				<!-- 轮播 -->
 				<swiper v-if="curUserInfo && curUserInfo.workerId" class="screen-swiper" :autoplay="true" :circular="true">
-					<swiper-item v-for="(item,index) in myInfo.order.onsiteToday" :key="index">
+					<swiper-item v-for="(item,index) in waitServOrderToday" :key="index">
 						<view class="padding-sm">
 							<view class="flex justify-between align-center margin-bottom-xs">
-								<view class="text-lg">{{item.work}}</view>
-								<view class="text-red">{{item.datetime}}</view>
+								<view class="text-lg">{{item.goodsName}}</view>
+							</view>
+							<view>
+								时间：<text class="text-red">{{item.expectTimeStart + ' - ' + item.expectTimeEnd}}</text>
 							</view>
 							<view>地址：{{item.address}}</view>
 						</view>
@@ -64,7 +69,7 @@
 				</view>
 			</view>
 			<!-- 每周公告 -->
-			<view class="padding bg-white shadow-warp margin-top-sm" v-if="curUserInfo && curUserInfo.workerId">
+			<!-- <view class="padding bg-white shadow-warp margin-top-sm" v-if="curUserInfo && curUserInfo.workerId">
 				<view class="flex justify-between align-center">
 					<view class="">
 						<text class="text-main-color">[每周公告]</text>
@@ -75,7 +80,7 @@
 						<view class="cuIcon-right"></view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<!-- 功能模块 -->
 			<view class="margin-lr-sm margin-top">
 				<view class="text-lg">服务中心</view>
@@ -146,7 +151,8 @@
 					checkLogin: true
 				}],
 				curUserInfo: {},
-				myInfo: {},
+				myInfo: {},
+				waitServOrderToday: [],
 				isShowSteer: false,
 				isAuthWxLoginModal: false,
 				isAuthWxPhoneModal: false,
@@ -199,7 +205,18 @@
 					newServModules[0].pageUrl = '/pages/demand-center/rule?paramObj=' + encodeURIComponent(JSON
 						.stringify(paramObj));
 				}
-				this.servModules = newServModules;
+				this.servModules = newServModules;
+				// 获取今日待上门单
+				this.loadTodayWaitServOrder();
+			},
+			async loadTodayWaitServOrder() {
+				let date = new Date();
+				let waitServRes = await this.$request.qryDetailOrderPage({
+					orderStatus: 2,
+					expectTimeStart: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 00:00:00",
+					expectTimeEnd: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 23:59:59"
+				});
+				this.waitServOrderToday = waitServRes.rows;
 			},
 			async chooseEntryType(typeCode) {
 				let status = 1;
@@ -238,6 +255,10 @@
 							url: pageObj.pageUrl
 						})
 					}
+				} else {
+					uni.navigateTo({
+						url: pageObj.pageUrl
+					})
 				}
 			}
 		},
@@ -263,7 +284,7 @@
 	}
 
 	.screen-swiper {
-		height: 180rpx;
+		height: 210rpx;
 		min-height: unset;
 	}
 
diff --git a/pages/index/msg-home.vue b/pages/index/msg-home.vue
index 13088a6..3e97993 100644
--- a/pages/index/msg-home.vue
+++ b/pages/index/msg-home.vue
@@ -3,9 +3,10 @@
 		<!-- 顶部操作条 -->
 		<cu-custom :bgColor="'bg-main-color'">
 			<block slot="content">消息大厅</block>
-		</cu-custom>
+		</cu-custom>
+		<bg-toast :icon="'repair'" :msg="'开发中'"></bg-toast>
 		<!-- 消息分类 -->
-		<view class="solid-bottom">
+		<!-- <view class="solid-bottom">
 			<view class='bg-white grid grid-square col-4 padding-sm'>
 				<view class="text-center shadow-warp" :class="curMsgType === 0 ? 'bg-main-color light' : 'bg-gray'"
 					@click="changeCurMsgType(0)">
@@ -36,9 +37,9 @@
 					<view>系统通知</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- 消息列表 -->
-		<view class="cu-list menu-avatar">
+		<!-- <view class="cu-list menu-avatar">
 			<view class="cu-item bottom-border" v-for="(item,index) in msgList" @click="showMsgDetail(item)">
 				<view class="cu-avatar radius lg"
 					style="background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Morgana.png);"></view>
@@ -55,13 +56,18 @@
 					<view class="cu-tag round bg-red sm">{{item.amount}}</view>
 				</view>
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 
-<script>
+<script>
+	import bgToast from '@/components/default-toast/bg-toast.vue';
+	
 	export default {
-		name: 'msg-home',
+		name: 'msg-home',
+		components: {
+			bgToast
+		},
 		data() {
 			return {
 				curMsgType: 0,
diff --git a/pages/index/my-home.vue b/pages/index/my-home.vue
index 986b381..9074373 100644
--- a/pages/index/my-home.vue
+++ b/pages/index/my-home.vue
@@ -8,11 +8,11 @@
 			<view class="text-xl margin-sm">{{curUserInfo.name}}</view>
 			<view class="cu-list grid no-border col-2" style="background-color: inherit;">
 				<view class="cu-item" @click="clickMenuItem({pageUrl: '/pages/my/my-money-bag'})">
-					<view class="margin-bottom-xs text-xxl">{{myInfo.balance}}</view>
+					<view class="margin-bottom-xs text-xxl">0</view>
 					<view>我的钱包</view>
 				</view>
 				<view class="cu-item solid-left">
-					<view class="margin-bottom-xs text-xxl">{{myInfo.rate}}</view>
+					<view class="margin-bottom-xs text-xxl">5.0</view>
 					<view>服务评分</view>
 				</view>
 			</view>
@@ -41,8 +41,10 @@
 				</view>
 			</view>
 			<view class="bg-white">
-				<view class="margin-top">
-					<view class="flex justify-between align-center solid-bottom padding padding-lr-lg text-lg" v-for="(item, index) in menuList" @click="clickMenuItem(item)">
+				<view class="margin-top margin-lr-sm">
+					<view class="flex justify-between align-center solid-bottom padding padding-lr-lg text-lg" 
+						v-for="(item, index) in menuList" @click="clickMenuItem(item)"
+						v-if="item.show">
 						<view class="flex justify-start align-center">
 							<view class="margin-right-sm text-main-color text-xl"><view :class="'cuIcon-' + item.icon"></view></view>
 							<view>{{item.name}}</view>
@@ -65,24 +67,28 @@
 				curCertifyInfo: null,
 				myInfo: {},
 				menuList: [{
-					name: '提现',
+					name: '提现账户',
 					icon: 'moneybag',
-					pageUrl: '/pages/my/withdraw'
+					pageUrl: '/pages/my/withdraw',
+					show: true
 				}, {
 					name: '交易明细',
 					icon: 'form',
-					pageUrl: '/pages/my/my-money-bag'
+					pageUrl: '/pages/my/my-money-bag',
+					show: true
 				}, {
 					name: '服务明细',
 					icon: 'calendar'
 				}, {
 					name: '师傅入驻',
 					icon: 'profile',
-					pageUrl: '/pages/my/master-settled-info'
+					pageUrl: '/pages/my/master-settled-info',
+					show: true
 				}, {
 					name: '个人信息',
 					icon: 'lock',
-					pageUrl: '/pages/my/personal-info'
+					pageUrl: '/pages/my/personal-info',
+					show: true
 				}, {
 					name: '法律声明',
 					icon: 'read'
diff --git a/pages/my/my-money-bag.vue b/pages/my/my-money-bag.vue
index ba194c3..3728fae 100644
--- a/pages/my/my-money-bag.vue
+++ b/pages/my/my-money-bag.vue
@@ -5,24 +5,22 @@
 			<block slot="backText">返回</block>
 			<block slot="content">我的钱包</block>
 		</cu-custom>
-		<view class="margin-sm shadow-warp">
+		<!-- <view class="margin-sm shadow-warp">
 			<view class="padding-tb-lg padding-lr bg-gradual-color light">
 				<view>账户余额（元）</view>
-				<view class="flex justify-between margin-top-sm">
-					<!-- <view class="text-xxl">{{myMoneyBag.balance}}</view> -->
+				<view class="flex justify-between margin-top-sm">
 					<view class="text-xxl">--</view>
 					<view class="cu-btn bg-white radius">充值</view>
 				</view>
 			</view>
-			<view class="padding bg-white flex justify-between">
-				<!-- <view>可提现金额：<text class="text-price text-black">{{myMoneyBag.balanceToExtract}}</text></view> -->
+			<view class="padding bg-white flex justify-between">
 				<view>可提现金额：<text class="text-price text-black">--</text></view>
 				<view>
 					<text>提现</text>
 					<text class="cuIcon-right"></text>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<uni-collapse v-model="openStatusArr[index]" ref="collapse" v-for="(billItem, index) in bill">
 			<uni-collapse-item>
 				<template v-slot:title>
diff --git a/pages/my/personal-info.vue b/pages/my/personal-info.vue
index 09cf935..3d76d50 100644
--- a/pages/my/personal-info.vue
+++ b/pages/my/personal-info.vue
@@ -31,9 +31,9 @@
 				</view>
 			</view>
 			<!-- 底部操作栏 -->
-			<view class="cu-bar tabbar border shop fixed-bottom-bar">
+			<!-- <view class="cu-bar tabbar border shop fixed-bottom-bar">
 				<button class="cu-btn bg-main-color long-btn margin-lr-sm shadow-blur" form-type="submit">保存</button>
-			</view>
+			</view> -->
 		</form>
 	</view>
 </template>
diff --git a/pages/my/withdraw.vue b/pages/my/withdraw.vue
index 22f8349..a2628b1 100644
--- a/pages/my/withdraw.vue
+++ b/pages/my/withdraw.vue
@@ -3,9 +3,9 @@
 		<!-- 顶部操作条 -->
 		<cu-custom :bgColor="'bg-main-color'" :isBack="true">
 			<block slot="backText">返回</block>
-			<block slot="content">提现</block>
+			<block slot="content">提现账户</block>
 		</cu-custom>
-		<view class="margin-lr-sm margin-tb-lg shadow-warp">
+		<!-- <view class="margin-lr-sm margin-tb-lg shadow-warp">
 			<view @click="bindAccount">
 				<view v-if="bindBankCard && bindBankCard.bankNum" class="bg-gray flex justify-between align-center text-xl padding">
 					<view>
@@ -45,11 +45,27 @@
 					</view>
 				</view>
 			</view>
+		</view> -->
+		<view class="margin-sm shadow-warp">
+			<view class="padding-tb-lg padding-lr bg-gradual-color light" v-if="bindBankCard && bindBankCard.bankNum">
+				<view>提现账户</view>
+				<view class="flex justify-between margin-top-sm">
+					<!-- <text class="cu-tag bg-white radius margin-right-sm">已绑定</text> -->
+					<text class="text-xxl">{{bindBankCard.encodeBankNum}}</text>
+					<view class="cu-btn bg-white radius" @click="bindAccount">帐号另绑</view>
+				</view>
+			</view>
+			<view class="padding-tb-lg padding-lr bg-gradual-color light" v-else>
+				<view class="padding-bottom">提现帐号未绑定</view>
+				<view class="cu-btn bg-white radius" @click="bindAccount">前往绑定</view>
+			</view>
+			<view class="padding bg-white flex justify-between">
+			</view>
 		</view>
 		<!-- 操作按钮 -->
-		<view class="margin-lr">
+		<!-- <view class="margin-lr">
 			<button class="cu-btn lg bg-main-color long-btn shadow-blur" @click="withdraw">提现</button>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -82,7 +98,9 @@
 					workerId: this.curUserInfo.workerId
 				});
 				this.bindBankCard = res.data;
-				this.bindBankCard.encodeBankNum = '****' + this.bindBankCard.bankNum.substring(this.bindBankCard.bankNum.length - 4);
+				if (this.bindBankCard && this.bindBankCard.bankNum) {
+					this.bindBankCard.encodeBankNum = '****' + this.bindBankCard.bankNum.substring(this.bindBankCard.bankNum.length - 4);
+				}
 			},
 			bindAccount() {
 				uni.navigateTo({
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index dc3ec54..85ccd34 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -113,6 +113,10 @@
 					:second="$dateUtil.countDownDiff(order.expectTimeEnd).seconds">
 				</uni-countdown>
 			</view>
+			<view class="margin-top-sm" v-if="order.orderStatus > 3">
+				<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
+				<text>完成时间：{{order.workFinishTime}}</text>
+			</view>
 			<view class="margin-top-sm flex justify-start align-center" v-if="order.subState === 4 && order.chargeReachDate">
 				<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
 				<text>距到帐：</text>
@@ -128,9 +132,11 @@
 				<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-popup="dispatchOrder" @click="getCanAssignList(order)" @tap="togglePopup($event, order)">派单</button>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm">改价</button>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm">转发</button> -->
+				<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" @click="updateMasterOrder(order, 1)">确认接单</button>
 			</view>
 			<view v-if="order.orderStatus === 1">
+				<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" data-popup="dispatchOrder" @click="getCanAssignList(order)" @tap="togglePopup($event, order)">派单</button>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="assignWork2MySelf(order)">自己承接</button>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showTimeArrangeModal" @tap="showModal($event, order)">预约时间</button>
@@ -149,9 +155,9 @@
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="finishOrder(order)" v-if="order.payStatus === 1">发起完单</button>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showPayQrcodeModal" v-if="order.payStatus === 0" @tap="makePayQrcode($event, order)">生成收款码</button>
 			</view>
-			<!-- <view v-if="order.orderStatus === 4">
-				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="sendUrgentMsgModal" @tap="showModal($event, order)">师傅急报</button>
-			</view> -->
+			<view v-if="order.orderStatus === 4 || order.orderStatus === 5">
+				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="showServOrderDetail(order)">查看</button>
+			</view>
 			<!-- <view v-if="order.orderStatus === 'afterSaleService'">
 				<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)">修改时间</button>
diff --git a/pages/order-manage/serv-detail.vue b/pages/order-manage/serv-detail.vue
index e1f873f..4e8bb36 100644
--- a/pages/order-manage/serv-detail.vue
+++ b/pages/order-manage/serv-detail.vue
@@ -31,9 +31,12 @@
 		<!-- 服务单概况 -->
 		<view class="bg-white margin-lr-sm margin-top-sm padding">
 			<view class="flex align-center">
-				<text class="text-xl margin-right">{{servDetail.goodsName}}</text>
+				<text class="text-xl margin-right">{{servDetail.goodsName}}</text>
+				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 5">已完成</view>
+				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 4">待确认</view>
 				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 3">服务中</view>
-				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 2">待上门</view>
+				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 2">待上门</view>
+				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 1">未约/未排</view>
 			</view>
 			<!-- <view class="margin-top-sm">
 				<view v-for="(item, index) in servDetail.mainServOrder.orderTag" class='cu-tag radius margin-right-sm'>
@@ -56,7 +59,7 @@
 				<text class="cuIcon-time text-main-color margin-right-xs"></text>
 				<text>排单时间：{{servDetail.mainServOrder.boodTime}}</text>
 			</view> -->
-			<view class="margin-top-sm" v-if="servDetail.orderStatus === 3">
+			<view class="margin-top-sm" v-if="servDetail.orderStatus >= 3">
 				<text class="cuIcon-time text-main-color margin-right-xs"></text>
 				<text>上门时间：{{servDetail.workBeginTime}}</text>
 			</view>
@@ -86,12 +89,12 @@
 			</view>
 		</view>
 		<!-- 完成记录 -->
-		<view class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm" v-for="(item, index) in servDetail.standardList">
+		<view v-if="[0, 1].indexOf(servDetail.orderStatus) === -1" class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm" v-for="(item, index) in servDetail.standardList">
 			<view class="cu-bar solid-bottom">
 				<view class="action bar-first-action">
 					<text class="cuIcon-titles text-main-color"></text> 完成记录
 				</view>
-				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="item.finishTime">{{item.finishTime}}</view>
+				<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus > 3">{{servDetail.workFinishTime}}</view>
 			</view>
 			<view class="margin-top-sm">
 				<product-picked :pickedList="[item]" :columnTitleArr="servedColumnHeaders" :valFieldArr="servedValFields"></product-picked>
@@ -99,12 +102,13 @@
 		</view>
 		<!-- 订单编码和时间 -->
 		<view class="bg-white margin-top-sm padding margin-lr-sm margin-bottom-with-bar">
-			<view>订单编码：{{servDetail.orderDetailCode}}</view>
+			<view v-if="[0, 1].indexOf(servDetail.orderStatus) !== -1">订单编码：{{servDetail.orderMasterCode}}</view>
+			<view v-else>订单编码：{{servDetail.orderDetailCode}}</view>
 			<view class="margin-top-xs">订单时间：{{servDetail.createTime}}</view>
 		</view>
 		<!-- 底部操作栏 -->
-		<view class="cu-bar bg-white tabbar border fixed-bottom-bar">
-			<view class="action" data-popup="orderManage" @click="togglePopup">
+		<view class="cu-bar bg-white tabbar border fixed-bottom-bar" v-if="servDetail.orderStatus === 2">
+			<!-- <view class="action" data-popup="orderManage" @click="togglePopup">
 				<view class="cuIcon-list"></view> 订单管理
 			</view>
 			<view class="action" data-modal="sendUrgentMsgModal" @click="showModal">
@@ -112,6 +116,10 @@
 					<view class="cu-tag badge" v-if="servDetail.talkMsgNum > 0">{{servDetail.talkMsgNum}}</view>
 				</view>
 				发送急报
+			</view> -->
+			<view class="action" data-popup="orderManage">
+			</view>
+			<view class="action" data-modal="sendUrgentMsgModal">
 			</view>
 			<view v-if="servDetail.orderStatus === 2" class="bg-main-color submit" @click="workBegin">立即上门</view>
 		</view>
@@ -172,23 +180,25 @@
 			if (options && options.order) {
 				this.order = JSON.parse(decodeURIComponent(options.order));
 			}
-			this.loadData(this.order.orderDetailId);
+			this.loadData();
 		},
 		methods: {
-			async loadData(orderDetailId) {
-				// this.servDetail = await this.$api.data('servDetail');
-				let servDetailRes = await this.$request.getOrderDetail({
-					id: orderDetailId
+			async loadData() {
+				let orderId = null;
+				let funName = null;
+				if ([0, 1].indexOf(this.order.orderStatus) !== -1) {
+					// 展示主单信息
+					orderId = this.order.orderMasterId;
+					funName = "getOrderMasterDetail";
+				} else {
+					// 展示子单信息
+					orderId = this.order.orderDetailId;
+					funName = "getOrderDetail";
+				}
+				let servDetailRes = await this.$request[funName]({
+					id: orderId
 				});
-				this.servDetail = servDetailRes.data;
-				// this.finishList4Show = this.servDetail.finishRecord;
-				// for (let i = 0; i < this.finishList4Show.length; i++) {
-				// 	let finishList = this.finishList4Show[i].finishList;
-				// 	for (let j = 0; j < finishList.length; j++) {
-				// 		finishList[j].secondColumnNum = finishList[j].servedNum;
-				// 	}
-				// 	this.finishList4Show[i].finishList = finishList;
-				// }
+				this.servDetail = servDetailRes.data;
 			},
 			changePopupState(e) {
 				this.ifShowPageMeta = e.show;
@@ -224,7 +234,6 @@
 					orderStatus: 3,
 					workBeginTime: formatCurDate
 				}
-				console.log(params)
 				let res = await this.$request.updateDetailOrder(params);
 				if (res && res.code === 0) {
 					this.loadData(this.servDetail.orderDetailId);