From 222a0fabb09bd25f98e0753b66b0f407751240a3 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 22 Jun 2022 17:40:50 +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

---
 components/ay-qrcode/ay-qrcode.vue            |    4 +-
 pages/index/index-home.vue                    |    4 +-
 pages/index/index.vue                         |   13 +-
 pages/my/new-serv.vue                         | 1023 +++++++++--------
 .../order-manage/modal/edit-time-arrange.vue  |    4 +-
 pages/order-manage/modal/pay-qrcode.vue       |   16 +-
 pages/order-manage/order-manage.vue           |   56 +-
 7 files changed, 603 insertions(+), 517 deletions(-)

diff --git a/components/ay-qrcode/ay-qrcode.vue b/components/ay-qrcode/ay-qrcode.vue
index 76e7bfa..b827f6e 100644
--- a/components/ay-qrcode/ay-qrcode.vue
+++ b/components/ay-qrcode/ay-qrcode.vue
@@ -366,8 +366,8 @@
 	.canvas-qrcode {
 		
 		margin: auto;
-		display: inline-block;
-		float: left;
+		// display: inline-block;
+		// float: left;
 	}
 	
 	
diff --git a/pages/index/index-home.vue b/pages/index/index-home.vue
index 159bb68..4df7932 100644
--- a/pages/index/index-home.vue
+++ b/pages/index/index-home.vue
@@ -6,10 +6,10 @@
 			<view class="flex justify-between padding-bottom align-center solid-bottom">
 				<view class="flex justify-start align-center">
 					<view class="cu-avatar round"
-						:style="'width: 120rpx; height: 120rpx; background-image:url(' + curUserInfo.workerLogoUrl + ');'">
+						:style="'width: 120rpx; height: 120rpx; background-image:url(' + curUserInfo.deptLogoUrl + ');'">
 					</view>
 					<view class="margin-lr-sm">
-						<view class="text-xl margin-bottom-xs">{{curUserInfo.name}}</view>
+						<view class="text-xl margin-bottom-xs">{{curUserInfo.deptName}}</view>
 						<!-- <view class="padding-xs text-sm">
 							<view class='cu-tag bg-white radius'>编辑</view>
 						</view> -->
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f5bf32f..0aff32d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -29,9 +29,12 @@
 				curPageCode: 'indexPage'
 			}
 		},
-		onLoad() {
+		onLoad(options) {
 			this.loadData();
-			this.bindEvent();
+			this.bindEvent();
+			if (options && options.menuCode) {
+				this.changeCurPageCode(options.menuCode)
+			}
 		},
 		onUnload() {
 			this.offEvent();
@@ -62,7 +65,11 @@
 				uni.$off('getCurPageInfo')
 			},
 			changeCurPageCode(targetPageCode) {
-				this.$refs.moduleBar.navChangeByCode(targetPageCode, true);
+				// #ifdef MP
+				this.$nextTick(() => {
+					this.$refs.moduleBar.navChangeByCode(targetPageCode, true);
+				})
+				// #endif
 			}
 		}
 	}
diff --git a/pages/my/new-serv.vue b/pages/my/new-serv.vue
index 506f5eb..dc4bd38 100644
--- a/pages/my/new-serv.vue
+++ b/pages/my/new-serv.vue
@@ -1,483 +1,556 @@
-<template>
-	<view>
-		<!-- 顶部操作条 -->
-		<cu-custom :bgColor="'bg-main-color'" :isBack="true">
-			<block slot="backText">返回</block>
-			<block slot="content">服务上架</block>
-		</cu-custom>
-		<!-- 表单内容 -->
-		<form @submit="submit">
-			<view class="cu-form-group">
-				<view class="title">服务名称</view>
-				<input name="servName" v-model="formData.servName" placeholder="请编辑上架标题(供客户搜索)"></input>
-			</view>
-			<view class="cu-form-group">
-				<view class="title">服务描述</view>
-				<input name="servDesc" v-model="formData.servDesc" placeholder="让客户更清晰的上架内容描述"></input>
-			</view>
-			<view class="solid-top">
-				<view class="cu-form-group">
-					<view class="title">选择类目</view>
-					<picker :mode="'multiSelector'" @change="categoryChange" @columnchange="categoryColChange" :value="categoryMultiIndex" :range-key="'goodsCategoryName'" :range="categoryList">
-						<input disabled class="line-input radius-input" :value="formData.category && formData.category.length ? formData.category[0].goodsCategoryName + '-' + formData.category[1].goodsCategoryName + '-' + formData.category[2].goodsCategoryName : ''"
-							placeholder="请选择类目"></input>
-					</picker>
+<template>
+	<view>
+		<!-- 顶部操作条 -->
+		<cu-custom :bgColor="'bg-main-color'" :isBack="true">
+			<block slot="backText">返回</block>
+			<block slot="content">服务上架</block>
+		</cu-custom>
+		<!-- 表单内容 -->
+		<form @submit="submit">
+			<view class="cu-form-group">
+				<view class="title">服务名称</view>
+				<input name="servName" v-model="formData.servName" placeholder="请编辑上架标题(供客户搜索)"></input>
+			</view>
+			<view class="cu-form-group">
+				<view class="title">服务描述</view>
+				<input name="servDesc" v-model="formData.servDesc" placeholder="让客户更清晰的上架内容描述"></input>
+			</view>
+			<view class="solid-top">
+				<view class="cu-form-group">
+					<view class="title">选择类目</view>
+					<picker :mode="'multiSelector'" @change="categoryChange" @columnchange="categoryColChange"
+						:value="categoryMultiIndex" :range-key="'goodsCategoryName'" :range="categoryList">
+						<input disabled class="line-input radius-input"
+							:value="formData.category && formData.category.length ? formData.category[0].goodsCategoryName + '-' + formData.category[1].goodsCategoryName + '-' + formData.category[2].goodsCategoryName : ''"
+							placeholder="请选择类目"></input>
+					</picker>
+				</view>
+				<view v-if="formData.specsList && formData.specsList.length > 0">
+					<checkbox-group class="padding-lr bg-white" @change="checkSpecs"
+						:class="isShowAllSpecs ? '' : 'certern-height'">
+						<view v-for="(item, index) in formData.specsList" class="padding-tb-sm">
+							<view class="flex">
+								<view class="flex-sub">
+									<checkbox style="transform:scale(1)" class="main-color margin-right-xs"
+										:value="index" :checked="item.checked"></checkbox>
+									<text>{{item.goodsCategoryName}}</text>
+								</view>
+								<view class="flex-sub">
+									<input class="radius-input" @input="inputSpecs($event, index, 'goodsStandardName')"
+										:value="item.goodsStandardName" placeholder="自编辑购买标题"></input>
+								</view>
+							</view>
+							<view class="flex margin-top-xs">
+								<view class="flex-sub">
+									<input class="radius-input" @input="inputSpecs($event, index, 'goodsPrice')"
+										:value="item.goodsPrice" placeholder="价格(平6%+￥5销10%+￥18)"></input>
+								</view>
+							</view>
+							<view class="flex margin-top-xs">
+								<view class="flex-sub">
+									<input class="radius-input" @input="inputSpecs($event, index, 'deduct')"
+										:value="item.deduct" placeholder="追加提成额"></input>
+								</view>
+								<view class="flex-sub flex margin-left-xs">
+									<view class="flex-sub">
+										<input class="radius-input" @input="inputSpecs($event, index, 'groupPrice')"
+											:value="item.groupPrice" placeholder="团购价"></input>
+									</view>
+									<view class="flex-sub margin-left-xs">
+										<input class="radius-input" @input="inputSpecs($event, index, 'unit')"
+											:value="item.unit" placeholder="单位"></input>
+									</view>
+								</view>
+							</view>
+						</view>
+					</checkbox-group>
+					<view class="text-bold text-gray text-lg text-center bg-white padding-tb-sm"
+						@click="showAllSpecs()"><text :class="'cuIcon-' + (isShowAllSpecs ? 'fold' : 'unfold')"></text>
+					</view>
+				</view>
+				<view class="bg-white">
+					<view class="padding-lr flex align-center">
+						<view class="flex-twice flex justify-start align-center">
+							<view style="width: 20%;">单位</view>
+							<my-uni-combox :candidates="productUnits" placeholder="请选择" v-model="formData.productUnit">
+							</my-uni-combox>
+						</view>
+						<view class="flex-sub margin-left">
+							优惠券+
+						</view>
+					</view>
+					<view class="padding-lr flex align-center padding-tb-xs">
+						<view class="flex-sub">
+							<checkbox style="transform:scale(1)" class="main-color margin-right-xs" :value="true"
+								:v-model="formData.isGoldenServ" :checked="formData.isGoldenServ"></checkbox>
+							<text>金牌服务</text>
+						</view>
+						<view class="flex-twice flex justify-start align-center">
+							<view style="width: 25%;">质保期</view>
+							<my-uni-combox :candidates="productProtectTimes" placeholder="请选择"
+								v-model="formData.productProtectTime"></my-uni-combox>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="solid-top">
+				<view class="cu-form-group">
+					<view class="title">上架区域</view>
+					<picker :mode="'multiSelector'" @change="regionChange" @columnchange="regionColChange"
+						:value="regionMultiIndex" :range-key="'areaName'" :range="regionList">
+						<input disabled class="line-input radius-input"
+							:value="formData.region && formData.region.length ? formData.region[0].areaName + '-' + formData.region[1].areaName : ''"
+							placeholder="请选择区域"></input>
+					</picker>
+				</view>
+				<view class="padding-lr bg-white">
+					<checkbox-group @change="checkDistirct" class="grid col-3">
+						<view v-for="(item, index) in formData.districtList" class="margin-tb-xs">
+							<checkbox style="transform:scale(1)" class="main-color margin-right-xs" :value="index"
+								:checked="item.checked"></checkbox>
+							<text>{{item.areaName}}</text>
+						</view>
+					</checkbox-group>
+				</view>
+			</view>
+			<view class="cu-form-group">
+				<view class="title">区域描述</view>
+				<input name="areaDesc" :value="formData.areaDesc" :v-model="formData.areaDesc"
+					placeholder="请输入区域描述"></input>
+			</view>
+			<view class="cu-form-group">
+				<view class="title">上门费</view>
+				<input type="digit" name="doorPrice" :value="formData.doorPrice" :v-model="formData.doorPrice"
+					placeholder="单位:元/次"></input>
+			</view>
+			<view class="cu-bar bg-white solid-top">
+				<view class="action text-black">
+					商品封面图上传
+				</view>
+			</view>
+			<view class="cu-form-group">
+				<view class="grid col-4 grid-square flex-sub">
+					<view class="bg-img" v-for="(item,index) in formData.coverImgList" :key="index"
+						@tap="viewImage($event, formData.coverImgList)" :data-url="item">
+						<image :src="item" mode="aspectFill"></image>
+						<view class="cu-tag bg-red" @tap.stop="delImg($event, formData.coverImgList)"
+							:data-index="index">
+							<text class='cuIcon-close'></text>
+						</view>
+					</view>
+					<view class="solids" @tap="chooseImgList($event, 'coverImgList')"
+						v-if="formData.coverImgList.length === 0">
+						<text class='cuIcon-cameraadd'></text>
+					</view>
+				</view>
+			</view>
+			<view class="cu-bar bg-white solid-top">
+				<view class="action text-black">
+					详情图上传
+				</view>
+			</view>
+			<view class="cu-form-group">
+				<view class="grid col-4 grid-square flex-sub">
+					<view class="bg-img" v-for="(item,index) in formData.descImgList" :key="index"
+						@tap="viewImage($event, formData.descImgList)" :data-url="item">
+						<image :src="item" mode="aspectFill"></image>
+						<view class="cu-tag bg-red" @tap.stop="delImg($event, formData.descImgList)"
+							:data-index="index">
+							<text class='cuIcon-close'></text>
+						</view>
+					</view>
+					<view class="solids" @tap="chooseImgList($event, 'descImgList')"
+						v-if="formData.descImgList.length<9">
+						<text class='cuIcon-cameraadd'></text>
+					</view>
+				</view>
+			</view>
+			<view class="cu-bar bg-white solid-top">
+				<view class="action text-black">
+					轮播图上传
+				</view>
+			</view>
+			<view class="cu-form-group">
+				<view class="grid col-4 grid-square flex-sub">
+					<view class="bg-img" v-for="(item,index) in formData.imgList" :key="index"
+						@tap="viewImage($event, formData.imgList)" :data-url="item">
+						<image :src="item" mode="aspectFill"></image>
+						<view class="cu-tag bg-red" @tap.stop="delImg($event, formData.imgList)" :data-index="index">
+							<text class='cuIcon-close'></text>
+						</view>
+					</view>
+					<view class="solids" @tap="chooseImgList($event, 'imgList')" v-if="formData.imgList.length<9">
+						<text class='cuIcon-cameraadd'></text>
+					</view>
+				</view>
+			</view>
+			<view class="cu-bar bg-white solid-top">
+				<view class="action text-black">
+					视频上传
+				</view>
+			</view>
+			<!-- <view class="bg-white padding-lr padding-bottom-sm">
+				<uni-file-picker limit="1" file-mediatype="video" return-type="object" @select="selectVideo">
+					<button class="cu-btn bg-main-color shadow-blur">选择文件</button>
+				</uni-file-picker>
+			</view> -->
+			<view class="cu-form-group">
+				<view class="grid col-4 grid-square flex-sub" v-if="formData.videoList.length === 0">
+					<view class="solids" @tap="chooseVideo()">
+						<text class='cuIcon-cameraadd'></text>
+					</view>
 				</view>
-				<view v-if="formData.specsList && formData.specsList.length > 0">
-					<checkbox-group class="padding-lr bg-white" @change="checkSpecs" :class="isShowAllSpecs ? '' : 'certern-height'">
-						<view v-for="(item, index) in formData.specsList" class="padding-tb-sm">
-							<view class="flex">
-								<view class="flex-sub">
-									<checkbox style="transform:scale(1)" class="main-color margin-right-xs" :value="index" :checked="item.checked"></checkbox>
-									<text>{{item.goodsCategoryName}}</text>
-								</view>
-								<view class="flex-sub">
-									<input class="radius-input" @input="inputSpecs($event, index, 'goodsStandardName')" :value="item.goodsStandardName" placeholder="自编辑购买标题"></input>
-								</view>
-							</view>
-							<view class="flex margin-top-xs">
-								<view class="flex-sub">
-									<input class="radius-input" @input="inputSpecs($event, index, 'goodsPrice')" :value="item.goodsPrice" placeholder="价格(平6%+￥5销10%+￥18)"></input>
-								</view>
-							</view>
-							<view class="flex margin-top-xs">
-								<view class="flex-sub">
-									<input class="radius-input" @input="inputSpecs($event, index, 'deduct')" :value="item.deduct" placeholder="追加提成额"></input>
-								</view>
-								<view class="flex-sub flex margin-left-xs">
-									<view class="flex-sub">
-										<input class="radius-input" @input="inputSpecs($event, index, 'groupPrice')" :value="item.groupPrice" placeholder="团购价"></input>
-									</view>
-									<view class="flex-sub margin-left-xs">
-										<input class="radius-input" @input="inputSpecs($event, index, 'unit')" :value="item.unit" placeholder="单位"></input>
-									</view>
-								</view>
-							</view>
-						</view>
-					</checkbox-group>
-					<view class="text-bold text-gray text-lg text-center bg-white padding-tb-sm" @click="showAllSpecs()"><text
-							:class="'cuIcon-' + (isShowAllSpecs ? 'fold' : 'unfold')"></text></view>
-				</view>
-				<view class="bg-white">
-					<view class="padding-lr flex align-center">
-						<view class="flex-twice flex justify-start align-center">
-							<view style="width: 20%;">单位</view>
-							<my-uni-combox :candidates="productUnits" placeholder="请选择" v-model="formData.productUnit"></my-uni-combox>
-						</view>
-						<view class="flex-sub margin-left">
-							优惠券+
-						</view>
-					</view>
-					<view class="padding-lr flex align-center padding-tb-xs">
-						<view class="flex-sub">
-							<checkbox style="transform:scale(1)" class="main-color margin-right-xs" :value="true" :v-model="formData.isGoldenServ" :checked="formData.isGoldenServ"></checkbox>
-							<text>金牌服务</text>
-						</view>
-						<view class="flex-twice flex justify-start align-center">
-							<view style="width: 25%;">质保期</view>
-							<my-uni-combox :candidates="productProtectTimes" placeholder="请选择" v-model="formData.productProtectTime"></my-uni-combox>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="solid-top">
-				<view class="cu-form-group">
-					<view class="title">上架区域</view>
-					<picker :mode="'multiSelector'" @change="regionChange" @columnchange="regionColChange" :value="regionMultiIndex" :range-key="'areaName'" :range="regionList">
-						<input disabled class="line-input radius-input" :value="formData.region && formData.region.length ? formData.region[0].areaName + '-' + formData.region[1].areaName : ''"
-							placeholder="请选择区域"></input>
-					</picker>
-				</view>
-				<view class="padding-lr bg-white">
-					<checkbox-group @change="checkDistirct" class="grid col-3">
-						<view v-for="(item, index) in formData.districtList" class="margin-tb-xs">
-							<checkbox style="transform:scale(1)" class="main-color margin-right-xs" :value="index" :checked="item.checked"></checkbox>
-							<text>{{item.areaName}}</text>
-						</view>
-					</checkbox-group>
-				</view>
-			</view>
-			<view class="cu-form-group">
-				<view class="title">区域描述</view>
-				<input name="areaDesc" :value="formData.areaDesc" :v-model="formData.areaDesc" placeholder="请输入区域描述"></input>
-			</view>
-			<view class="cu-form-group">
-				<view class="title">上门费</view>
-				<input type="digit" name="doorPrice" :value="formData.doorPrice" :v-model="formData.doorPrice" placeholder="单位:元/次"></input>
-			</view>
-			<view class="cu-bar bg-white solid-top">
-				<view class="action text-black">
-					商品封面图上传
-				</view>
-			</view>
-			<view class="cu-form-group">
-				<view class="grid col-4 grid-square flex-sub">
-					<view class="bg-img" v-for="(item,index) in formData.coverImgList" :key="index" @tap="viewImage($event, formData.coverImgList)"
-						:data-url="item">
-						<image :src="item" mode="aspectFill"></image>
-						<view class="cu-tag bg-red" @tap.stop="delImg($event, formData.coverImgList)" :data-index="index">
+				<view class="grid grid-square flex-sub" v-else>
+					<view class="bg-img" v-for="(item,index) in formData.videoList" :key="index" :data-url="item">
+						<video :src="item" controls></video>
+						<view class="cu-tag bg-red" @tap.stop="delImg($event, formData.videoList)" :data-index="index">
 							<text class='cuIcon-close'></text>
 						</view>
 					</view>
-					<view class="solids" @tap="chooseImgList($event, 'coverImgList')" v-if="formData.coverImgList.length === 0">
-						<text class='cuIcon-cameraadd'></text>
-					</view>
-				</view>
-			</view>
-			<view class="cu-bar bg-white solid-top">
-				<view class="action text-black">
-					详情图上传
-				</view>
-			</view>
-			<view class="cu-form-group">
-				<view class="grid col-4 grid-square flex-sub">
-					<view class="bg-img" v-for="(item,index) in formData.descImgList" :key="index" @tap="viewImage($event, formData.descImgList)"
-						:data-url="item">
-						<image :src="item" mode="aspectFill"></image>
-						<view class="cu-tag bg-red" @tap.stop="delImg($event, formData.descImgList)" :data-index="index">
-							<text class='cuIcon-close'></text>
-						</view>
-					</view>
-					<view class="solids" @tap="chooseImgList($event, 'descImgList')" v-if="formData.descImgList.length<9">
-						<text class='cuIcon-cameraadd'></text>
-					</view>
-				</view>
-			</view>
-			<view class="cu-bar bg-white solid-top">
-				<view class="action text-black">
-					轮播图上传
-				</view>
-			</view>
-			<view class="cu-form-group">
-				<view class="grid col-4 grid-square flex-sub">
-					<view class="bg-img" v-for="(item,index) in formData.imgList" :key="index" @tap="viewImage($event, formData.imgList)"
-						:data-url="item">
-						<image :src="item" mode="aspectFill"></image>
-						<view class="cu-tag bg-red" @tap.stop="delImg($event, formData.imgList)" :data-index="index">
-							<text class='cuIcon-close'></text>
-						</view>
-					</view>
-					<view class="solids" @tap="chooseImgList($event, 'imgList')" v-if="formData.imgList.length<9">
-						<text class='cuIcon-cameraadd'></text>
-					</view>
-				</view>
-			</view>
-			<view class="cu-bar bg-white solid-top">
-				<view class="action text-black">
-					视频上传
-				</view>
-			</view>
-			<view class="bg-white padding-lr padding-bottom-sm">
-				<uni-file-picker limit="1" file-mediatype="video" return-type="object" @select="selectVideo">
-					<button class="cu-btn bg-main-color shadow-blur">选择文件</button>
-				</uni-file-picker>
-			</view>
-			<view class="padding-sm bg-white solid-top">
-				<textarea style="width: 100%;" class="solid radius text-left padding-sm" v-model="formData.detailDesc" maxlength="-1" placeholder="请输入详情介绍"></textarea>
-			</view>
-			
-			<view class="padding-bottom-lg padding-top bg-white text-center">
-				<button class="cu-btn bg-main-color shadow-blur long-btn" @click="submit">确定</button>
-			</view>
-		</form>
-	</view>
-</template>
-
-<script>
-	import myUniCombox from '@/components/uni-combox/my-uni-combox.vue';
-	
-	export default {
-		components: {
-			myUniCombox
-		},
-		data() {
-			return {
-				formData: {
-					servName: '',
-					servDesc: '',
-					specsList: [],
-					category: [],
-					productUnit: '',
-					isGoldenServ: false,
-					region: [],
-					districtList: [],
-					areaDesc: '',
-					doorPrice: '',
-					imgList: [],
-					detailDesc: '',
-					descImgList: [],
-					coverImgList: [],
-					video: ''
-				},
-				categoryList: [],
-				categoryMultiIndex: [0, 0, 0],
-				regionList: [],
-				regionMultiIndex: [0, 0],
-				isShowAllSpecs: false,
-				productUnits: [{
-					code: 1,
-					name: '台'
-				}, {
-					code: 2,
-					name: '件'
-				}, {
-					code: 3,
-					name: '套'
-				}, {
-					code: 4,
-					name: '个'
-				}, {
-					code: 5,
-					name: '平方'
-				}],
-				productProtectTimes: [{
-					code: 1,
-					name: '15天'
-				}, {
-					code: 2,
-					name: '30天'
-				}, {
-					code: 3,
-					name: '45天'
-				}]
-			}
-		},
-		onLoad(options) {
-			let goodId = null;
-			if (options && options.goodId) {
-				goodId = options.goodId;
-			}
-			this.loadData(goodId);
-		},
-		methods: {
-			async loadData(goodId) {
-				this.loadCategoryList();
-				this.loadRegionList();
-				// TODO 如果存在goodId说明是修改，需要查询good信息进行回显
-				// this.categoryList = await this.$api.data('categoryList');
-				// this.regionList = await this.$api.data('regionList');
-			},
-			async loadCategoryList(idArr) {
-				let typeList = await this.$request.listByStep();
-				typeList = typeList.data;
-				let col1Id = idArr ? idArr[0] : typeList[0].goodsCategoryId;
-				let subTypeList = await this.$request.listByStep({ goodsCategoryId: col1Id });
-				subTypeList = subTypeList.data;
-				let col2Id = idArr ? idArr[1] : subTypeList[0].goodsCategoryId;
-				let subSubTypeList = await this.$request.listByStep({ goodsCategoryId: col2Id });
-				subSubTypeList = subSubTypeList.data;
-				this.categoryList.push(typeList);
-				this.categoryList.push(subTypeList);
-				this.categoryList.push(subSubTypeList);
-			},
-			async loadRegionList() {
-				let regionList = await this.$request.areaListByStep();
-				regionList = regionList.data;
-				let subRegionList = [];
-				if (regionList && regionList.length > 0) {
-					subRegionList = await this.$request.areaListByStep({ parentCode: regionList[0].areaCode });
-					subRegionList = subRegionList.data;
-				}
-				this.regionList.push(regionList);
-				this.regionList.push(subRegionList);
-			},
-			async categoryChange(e) {
-				this.categoryMultiIndex = e.detail.value;
-				let chosenCategory = [];
-				for(let i = 0; i < this.categoryList.length; i++) {
-					chosenCategory.push(this.categoryList[i][this.categoryMultiIndex[i]]);
-				}
-				this.formData.category = chosenCategory;
-				
-				// 查询最后一级品类
-				let res = await this.$request.listByStep({goodsCategoryId: chosenCategory[2].goodsCategoryId});
-				this.formData.specsList = res.data;
-			},
-			async categoryColChange(e) {
-				let colObj = e.detail;
-				if (colObj.column == 0) {
-					// 通过一级查询二级，通过二级查三级
-					let subTypeList = await this.$request.listByStep({goodsCategoryId: this.categoryList[0][colObj.value].goodsCategoryId});
-					subTypeList = subTypeList.data;
-					let subSubTypeList = await this.$request.listByStep({ goodsCategoryId: subTypeList[0].goodsCategoryId });
-					subSubTypeList = subSubTypeList.data;
-					this.categoryList.pop();
-					this.categoryList.pop();
-					this.categoryList.push(subTypeList);
-					this.categoryList.push(subSubTypeList);
-					this.categoryMultiIndex = [colObj.value, 0, 0];
-				} else if (colObj.column == 1) {
-					// 通过二级查三级
-					let subSubTypeList = await this.$request.listByStep({ goodsCategoryId: this.categoryList[1][colObj.value].goodsCategoryId });
-					subSubTypeList = subSubTypeList.data;
-					this.categoryList.pop();
-					this.categoryList.push(subSubTypeList);
-					this.categoryMultiIndex = [this.categoryMultiIndex[0], colObj.value, 0];
-				}
-			},
-			async regionChange(e) {
-				this.regionMultiIndex = e.detail.value;
-				let chosenRegion = [];
-				for(let i = 0; i < this.regionList.length; i++) {
-					chosenRegion.push(this.regionList[i][this.regionMultiIndex[i]]);
-				}
-				this.formData.region = chosenRegion;
-				
-				// 查询最后一级区域
-				let areaList = await this.$request.areaListByStep({parentCode: chosenRegion[1].areaCode});
-				this.formData.districtList = areaList.data;
-			},
-			async regionColChange(e) {
-				let colObj = e.detail;
-				if (colObj.column == 0) {
-					// 通过一级查二级
-					let subAreaList = await this.$request.areaListByStep({parentCode: this.regionList[0][colObj.value].areaCode});
-					subAreaList = subAreaList.data;
-					this.regionList.pop();
-					this.regionList.push(subAreaList);
-					this.regionMultiIndex = [colObj.value, 0];
-				}
-			},
-			checkSpecs(e) {
-				let checkedIndexArr = e.detail.value;
-				for(let i = 0; i < this.formData.specsList.length; i++) {
-					if (checkedIndexArr.indexOf(String(i)) !== -1) {
-						this.formData.specsList[i].checked = true;
-					} else {
-						this.formData.specsList[i].checked = false;
-					}
-				}
-			},
-			inputSpecs(e, index, field) {
-				this.formData.specsList[index][field] = e.detail.value;
-			},
-			showAllSpecs() {
-				this.isShowAllSpecs = !this.isShowAllSpecs;
-			},
-			checkDistirct(e) {
-				let checkedIndexArr = e.detail.value;
-				for(let i = 0; i < this.formData.districtList.length; i++) {
-					if (checkedIndexArr.indexOf(String(i)) !== -1) {
-						this.formData.districtList[i].checked = true;
-					} else {
-						this.formData.districtList[i].checked = false;
-					}
-				}
-			},
-			chooseImgList(e, imgListField) {
-				uni.chooseImage({
-					count: 9, //默认9
-					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					sourceType: ['album'], //从相册选择
-					success: (res) => {
+				</view>
+			</view>
+			<view class="padding-sm bg-white solid-top">
+				<textarea style="width: 100%;" class="solid radius text-left padding-sm" v-model="formData.detailDesc"
+					maxlength="-1" placeholder="请输入详情介绍"></textarea>
+			</view>
+
+			<view class="padding-bottom-lg padding-top bg-white text-center">
+				<button class="cu-btn bg-main-color shadow-blur long-btn" @click="submit">确定</button>
+			</view>
+		</form>
+	</view>
+</template>
+
+<script>
+	import myUniCombox from '@/components/uni-combox/my-uni-combox.vue';
+
+	export default {
+		components: {
+			myUniCombox
+		},
+		data() {
+			return {
+				formData: {
+					servName: '',
+					servDesc: '',
+					specsList: [],
+					category: [],
+					productUnit: '',
+					isGoldenServ: false,
+					region: [],
+					districtList: [],
+					areaDesc: '',
+					doorPrice: '',
+					imgList: [],
+					detailDesc: '',
+					descImgList: [],
+					coverImgList: [],
+					videoList: []
+				},
+				categoryList: [],
+				categoryMultiIndex: [0, 0, 0],
+				regionList: [],
+				regionMultiIndex: [0, 0],
+				isShowAllSpecs: false,
+				productUnits: [{
+					code: 1,
+					name: '台'
+				}, {
+					code: 2,
+					name: '件'
+				}, {
+					code: 3,
+					name: '套'
+				}, {
+					code: 4,
+					name: '个'
+				}, {
+					code: 5,
+					name: '平方'
+				}],
+				productProtectTimes: [{
+					code: 1,
+					name: '15天'
+				}, {
+					code: 2,
+					name: '30天'
+				}, {
+					code: 3,
+					name: '45天'
+				}]
+			}
+		},
+		onLoad(options) {
+			let goodId = null;
+			if (options && options.goodId) {
+				goodId = options.goodId;
+			}
+			this.loadData(goodId);
+		},
+		methods: {
+			async loadData(goodId) {
+				this.loadCategoryList();
+				this.loadRegionList();
+				// TODO 如果存在goodId说明是修改，需要查询good信息进行回显
+				// this.categoryList = await this.$api.data('categoryList');
+				// this.regionList = await this.$api.data('regionList');
+			},
+			async loadCategoryList(idArr) {
+				let typeList = await this.$request.listByStep();
+				typeList = typeList.data;
+				let col1Id = idArr ? idArr[0] : typeList[0].goodsCategoryId;
+				let subTypeList = await this.$request.listByStep({
+					goodsCategoryId: col1Id
+				});
+				subTypeList = subTypeList.data;
+				let col2Id = idArr ? idArr[1] : subTypeList[0].goodsCategoryId;
+				let subSubTypeList = await this.$request.listByStep({
+					goodsCategoryId: col2Id
+				});
+				subSubTypeList = subSubTypeList.data;
+				this.categoryList.push(typeList);
+				this.categoryList.push(subTypeList);
+				this.categoryList.push(subSubTypeList);
+			},
+			async loadRegionList() {
+				let regionList = await this.$request.areaListByStep();
+				regionList = regionList.data;
+				let subRegionList = [];
+				if (regionList && regionList.length > 0) {
+					subRegionList = await this.$request.areaListByStep({
+						parentCode: regionList[0].areaCode
+					});
+					subRegionList = subRegionList.data;
+				}
+				this.regionList.push(regionList);
+				this.regionList.push(subRegionList);
+			},
+			async categoryChange(e) {
+				this.categoryMultiIndex = e.detail.value;
+				let chosenCategory = [];
+				for (let i = 0; i < this.categoryList.length; i++) {
+					chosenCategory.push(this.categoryList[i][this.categoryMultiIndex[i]]);
+				}
+				this.formData.category = chosenCategory;
+
+				// 查询最后一级品类
+				let res = await this.$request.listByStep({
+					goodsCategoryId: chosenCategory[2].goodsCategoryId
+				});
+				this.formData.specsList = res.data;
+			},
+			async categoryColChange(e) {
+				let colObj = e.detail;
+				if (colObj.column == 0) {
+					// 通过一级查询二级，通过二级查三级
+					let subTypeList = await this.$request.listByStep({
+						goodsCategoryId: this.categoryList[0][colObj.value].goodsCategoryId
+					});
+					subTypeList = subTypeList.data;
+					let subSubTypeList = await this.$request.listByStep({
+						goodsCategoryId: subTypeList[0].goodsCategoryId
+					});
+					subSubTypeList = subSubTypeList.data;
+					this.categoryList.pop();
+					this.categoryList.pop();
+					this.categoryList.push(subTypeList);
+					this.categoryList.push(subSubTypeList);
+					this.categoryMultiIndex = [colObj.value, 0, 0];
+				} else if (colObj.column == 1) {
+					// 通过二级查三级
+					let subSubTypeList = await this.$request.listByStep({
+						goodsCategoryId: this.categoryList[1][colObj.value].goodsCategoryId
+					});
+					subSubTypeList = subSubTypeList.data;
+					this.categoryList.pop();
+					this.categoryList.push(subSubTypeList);
+					this.categoryMultiIndex = [this.categoryMultiIndex[0], colObj.value, 0];
+				}
+			},
+			async regionChange(e) {
+				this.regionMultiIndex = e.detail.value;
+				let chosenRegion = [];
+				for (let i = 0; i < this.regionList.length; i++) {
+					chosenRegion.push(this.regionList[i][this.regionMultiIndex[i]]);
+				}
+				this.formData.region = chosenRegion;
+
+				// 查询最后一级区域
+				let areaList = await this.$request.areaListByStep({
+					parentCode: chosenRegion[1].areaCode
+				});
+				this.formData.districtList = areaList.data;
+			},
+			async regionColChange(e) {
+				let colObj = e.detail;
+				if (colObj.column == 0) {
+					// 通过一级查二级
+					let subAreaList = await this.$request.areaListByStep({
+						parentCode: this.regionList[0][colObj.value].areaCode
+					});
+					subAreaList = subAreaList.data;
+					this.regionList.pop();
+					this.regionList.push(subAreaList);
+					this.regionMultiIndex = [colObj.value, 0];
+				}
+			},
+			checkSpecs(e) {
+				let checkedIndexArr = e.detail.value;
+				for (let i = 0; i < this.formData.specsList.length; i++) {
+					if (checkedIndexArr.indexOf(String(i)) !== -1) {
+						this.formData.specsList[i].checked = true;
+					} else {
+						this.formData.specsList[i].checked = false;
+					}
+				}
+			},
+			inputSpecs(e, index, field) {
+				this.formData.specsList[index][field] = e.detail.value;
+			},
+			showAllSpecs() {
+				this.isShowAllSpecs = !this.isShowAllSpecs;
+			},
+			checkDistirct(e) {
+				let checkedIndexArr = e.detail.value;
+				for (let i = 0; i < this.formData.districtList.length; i++) {
+					if (checkedIndexArr.indexOf(String(i)) !== -1) {
+						this.formData.districtList[i].checked = true;
+					} else {
+						this.formData.districtList[i].checked = false;
+					}
+				}
+			},
+			chooseImgList(e, imgListField) {
+				uni.chooseImage({
+					count: 9, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: (res) => {
+						uni.showLoading({
+							title: '上传中',
+							mask: true
+						});
+						res.tempFilePaths.forEach((tmpUrl, index) => {
+							this.$request.uploadFile(tmpUrl).then((url) => {
+								this.formData[imgListField].push(url);
+								if (index === res.tempFilePaths.length - 1) {
+									uni.hideLoading();
+								}
+							});
+						});
+					}
+				});
+			},
+			viewImage(e, imgList) {
+				uni.previewImage({
+					urls: imgList,
+					current: e.currentTarget.dataset.url
+				});
+			},
+			delImg(e, imgList) {
+				uni.showModal({
+					title: '',
+					content: '确定要删除这张图片吗？',
+					cancelText: '取消',
+					confirmText: '确定',
+					success: res => {
+						if (res.confirm) {
+							imgList.splice(e.currentTarget.dataset.index, 1)
+						}
+					}
+				})
+			},
+			chooseVideo() {
+				let _this = this;
+				uni.chooseVideo({
+					sourceType: ['camera', 'album'],
+					success: function(res) {
 						uni.showLoading({
 							title: '上传中',
-							mask:true
+							mask: true
 						});
-						res.tempFilePaths.forEach((tmpUrl, index) => {
-							this.$request.uploadFile(tmpUrl).then((url) => {
-								this.formData[imgListField].push(url);
-								if (index === res.tempFilePaths.length - 1) {
-									uni.hideLoading();
-								}
-							});
-						});
-					}
-				});
-			},
-			viewImage(e, imgList) {
-				uni.previewImage({
-					urls: imgList,
-					current: e.currentTarget.dataset.url
-				});
-			},
-			delImg(e, imgList) {
-				uni.showModal({
-					title: '',
-					content: '确定要删除这张图片吗？',
-					cancelText: '取消',
-					confirmText: '确定',
-					success: res => {
-						if (res.confirm) {
-							imgList.splice(e.currentTarget.dataset.index, 1)
-						}
-					}
-				})
-			},
-			async selectVideo(e) {
-				uni.showLoading({
-					title: '上传中',
-					mask:true
-				});
-				this.formData.video = await this.$request.uploadFile(e.tempFilePaths[0]);
-				uni.hideLoading();
-			},
-			async submit() {
-				console.log(this.formData)
-				let goodsStandardList = this.formData.specsList.filter((item) => {
-					if (item.checked) {
-						return {
-							...item,
-							goodsNum: 99999
-						}
-					}
-				});
-				let goodsAreaList = this.formData.districtList.filter((item) => {
-					if (item.checked) {
-						item.countryAreaId = item.areaId;
-						return item;
-					}
-				});
-				// 0是轮播图，1是详情图
-				let goodsImgsList = [];
-				this.formData.imgList.forEach((url) => {
-					goodsImgsList.push({
-						imgUrl: url,
-						imgType: 0
-					});
-				});
-				this.formData.descImgList.forEach((url) => {
-					goodsImgsList.push({
-						imgUrl: url,
-						imgType: 1
-					});
-				});
-				
-				let params = {
-					goodsName: this.formData.servName,
-					deptGoodsCategoryId: this.formData.category[2].goodsCategoryId,
-					goodsStandardList: goodsStandardList,
-					goodsAreaList: goodsAreaList,
-					goodsImgUrl: this.formData.coverImgList[0],
-					goodsImgsList: goodsImgsList,
-					goodsVideoUrl: this.formData.video,
-					status: 0,
-					remark: this.formData.detailDesc
-				}
-				console.log("格式化后的请求参数：" + params)
-				let res = await this.$request.addGoods(params);
-				if (res.code === 0) {
-					uni.showToast({
-						icon: 'success'
-					})
-					uni.navigateBack({
-						delta: -1
-					})
-				}
-			}
-		},
-	}
-</script>
-
-<style scoped>
-	.cu-form-group picker::after {
-		display: none;
-	}
-	.certern-height {
-		max-height: 520rpx;
-		overflow: hidden;
-	}
-	.long-btn{ 
-		width: 95%;
-	}
+						_this.$request.uploadFile(res.tempFilePath).then((url) => {
+							uni.hideLoading();
+							_this.formData.videoList.push(url);
+						});
+					}
+				});
+			},
+			// async selectVideo(e) {
+			// 	uni.showLoading({
+			// 		title: '上传中',
+			// 		mask: true
+			// 	});
+			// 	this.formData.video = await this.$request.uploadFile(e.tempFilePaths[0]);
+			// 	uni.hideLoading();
+			// },
+			async submit() {
+				// let goodsStandardList = this.formData.specsList.filter((item) => {
+				// 	if (item.checked) {
+				// 		return {
+				// 			...item,
+				// 			goodsNum: 99999
+				// 		}
+				// 	}
+				// });
+				// let goodsAreaList = this.formData.districtList.filter((item) => {
+				// 	if (item.checked) {
+				// 		item.countryAreaId = item.areaId;
+				// 		return item;
+				// 	}
+				// });
+				// // 0是轮播图，1是详情图
+				// let goodsImgsList = [];
+				// this.formData.imgList.forEach((url) => {
+				// 	goodsImgsList.push({
+				// 		imgUrl: url,
+				// 		imgType: 0
+				// 	});
+				// });
+				// this.formData.descImgList.forEach((url) => {
+				// 	goodsImgsList.push({
+				// 		imgUrl: url,
+				// 		imgType: 1
+				// 	});
+				// });
+				// let goodsVideoUrl = this.formData.videoList.length ? this.formData.videoList[0] : '';
+				
+				// let params = {
+				// 	goodsName: this.formData.servName,
+				// 	deptGoodsCategoryId: this.formData.category[2].goodsCategoryId,
+				// 	goodsStandardList: goodsStandardList,
+				// 	goodsAreaList: goodsAreaList,
+				// 	goodsImgUrl: this.formData.coverImgList[0],
+				// 	goodsImgsList: goodsImgsList,
+				// 	goodsVideoUrl: goodsVideoUrl,
+				// 	status: 0,
+				// 	remark: this.formData.detailDesc
+				// }
+				// let res = await this.$request.addGoods(params);
+				// if (res && res.code === 0) {
+					uni.showToast({
+						icon: 'success'
+					})
+					uni.reLaunch({
+						url: '/pages/index/index?menuCode=supplyChainPage'
+					})
+				// }
+			}
+		},
+	}
+</script>
+
+<style scoped>
+	.cu-form-group picker::after {
+		display: none;
+	}
+
+	.certern-height {
+		max-height: 520rpx;
+		overflow: hidden;
+	}
+
+	.long-btn {
+		width: 95%;
+	}
 </style>
diff --git a/pages/order-manage/modal/edit-time-arrange.vue b/pages/order-manage/modal/edit-time-arrange.vue
index 4241a8e..c634d49 100644
--- a/pages/order-manage/modal/edit-time-arrange.vue
+++ b/pages/order-manage/modal/edit-time-arrange.vue
@@ -22,7 +22,7 @@
 					<view class="margin-bottom-xs">
 						<view class="margin-bottom-xs">选择日期：</view>
 						<picker mode="date" :value="date" :start="curDate" @change="dateChange">
-							<input class="radius-input" v-model="date"></input>
+							<input class="radius-input" v-model="date" disabled></input>
 						</picker>
 					</view>
 					<view>
@@ -34,7 +34,7 @@
 						<text class="margin-lr-xs">或</text> -->
 						<picker mode="selector" :value="timeRangeIndex" :range="timeRangeList"
 							@change="timeRangeChange">
-							<input class="radius-input" v-model="timeRange"></input>
+							<input class="radius-input" v-model="timeRange" disabled></input>
 						</picker>
 					</view>
 				</view>
diff --git a/pages/order-manage/modal/pay-qrcode.vue b/pages/order-manage/modal/pay-qrcode.vue
index 46b229c..5406391 100644
--- a/pages/order-manage/modal/pay-qrcode.vue
+++ b/pages/order-manage/modal/pay-qrcode.vue
@@ -1,23 +1,23 @@
 <template>
 	<!-- 报价/客户支付模态框 -->
 	<view class="cu-modal" :class="show?'show':''">
-		<view class="cu-dialog">
+		<view class="cu-dialog bg-white">
 			<view class="cu-bar bg-white justify-end">
 				<view class="content">支付宝扫码支付</view>
 				<view class="action" data-modal="showPayQrcodeModal" @click="finishQrPay">
 					<text class="cuIcon-close text-red"></text>
 				</view>
 			</view>
-			<view class="bg-white padding-bottom-xl">
-				<view class="padding-tb-sm" style="width: 300px; margin: 0 auto;">
+			<view class="bg-white">
+				<view class="padding-tb-sm" style="width: 300px; margin: 0 auto;" v-show="modal_qr">
 					<ayQrcode ref="qrcode" :modal="modal_qr" :url="url" @hideQrcode="hideQrcode" :height="300"
 						:width="300" />
 				</view>
 			</view>
-			<!-- <view class="text-center padding-bottom-xl">
+			<view class="text-center padding-bottom-xl">
 				<view>请客户扫描码付款后方能提交完单</view>
 				<view class="text-red">必须按二维码生成金额支付</view>
-			</view> -->
+			</view>
 		</view>
 	</view>
 </template>
@@ -50,12 +50,12 @@
 		},
 		methods: {
 			finishQrPay(e) {
-				this.$emit('finishQrPay', e);
+				this.$emit('finishQrPay', e);
+				this.hideQrcode();
 			},
 			// 展示二维码
 			showQrcode(url) {
-				this.url = url;
-				console.log(url);
+				this.url = url;
 				let _this = this;
 				this.modal_qr = true;
 				// uni.showLoading()
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 1912222..c7025f7 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -37,7 +37,11 @@
 			</view>
 			<!-- 状态分类tab -->
 			<view class="cu-list grid no-border col-5 padding-top-sm bg-white">
-				<view class="cu-item" :class="stateCur === 0 ? 'bg-main-color light' : ''" :data-id="0" @tap="statusSelect">
+				<view class="cu-item" :class="index==stateCur?'bg-main-color light cur':''" v-for="(item,index) in stateList" :key="index" :data-id="index" @tap="statusSelect">
+					<view class="margin-bottom-xs">{{item.name}}</view>
+					<view>(0)</view>
+				</view>
+				<!-- <view class="cu-item" :class="stateCur === 0 ? 'bg-main-color light' : ''" :data-id="0" @tap="statusSelect">
 					<view class="margin-bottom-xs">超时单</view>
 					<view>({{myOrders.summary.overtimeOrderNum}})</view>
 				</view>
@@ -53,10 +57,10 @@
 					<view class="margin-bottom-xs">急报单</view>
 					<view>({{myOrders.summary.urgentMsgOrderNum}})</view>
 				</view>
-				<view class="cu-item" :class="stateCur === 4 ? 'bg-main-color light' : ''" :data-id="4" @tap="statusSelect">
+				<view class="cu-item" :class="stateCur === 0 ? 'bg-main-color light' : ''" :data-id="4" @tap="statusSelect">
 					<view class="margin-bottom-xs">新订单</view>
 					<view>({{myOrders.summary.newOrderNum}})</view>
-				</view>
+				</view> -->
 			</view>
 			<!-- 子状态分类tab -->
 			<scroll-view scroll-x class="bg-white nav text-center" :scroll-with-animation="true" :scroll-left="scrollLeft">
@@ -143,7 +147,7 @@
 				<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>
 				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="finishOrder(order)">发起完单</button>
-				<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showPayQrcodeModal" @tap="makePayQrcode($event, order)">生成付款码</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>
@@ -264,22 +268,22 @@
 				areaMultiIndex: [0, 0, 0],
 				categoryList: [],
 				categoryMultiIndex: [0, 0, 0],
-				// stateList: [{
-				// 	code: 1,
-				// 	name: '超时单'
-				// }, {
-				// 	code: 2,
-				// 	name: '今日单'
-				// }, {
-				// 	code: 3,
-				// 	name: '明日单'
-				// }, {
-				// 	code: 4,
-				// 	name: '急报单'
-				// }, {
-				// 	code: 5,
-				// 	name: '新订单'
-				// }],
+				stateList: [{
+					code: 1,
+					name: '超时单'
+				}, {
+					code: 2,
+					name: '今日单'
+				}, {
+					code: 3,
+					name: '明日单'
+				}, {
+					code: 4,
+					name: '急报单'
+				}, {
+					code: 0,
+					name: '新订单'
+				}],
 				subStateList: [{
 					code: 1,
 					name: '未约/未排'
@@ -309,7 +313,7 @@
 				scrollLeft: 0,
 				stickyTop: this.CustomBar,
 				tabCur: 0,
-				stateCur: 0,
+				stateCur: null,
 				showTimeArrangeModal: false,
 				showArrangeFailTimeModal: false,
 				showNewServPriceModal: false,
@@ -368,9 +372,9 @@
 				this.loadMasterOrderPage();
 			},
 			async loadMasterOrderPage(params = {}) {
-				params.pageNum = this.pageParams[this.tabCur].pageNum;
 				params.pageSize = this.$globalData.initPageSize;
 				params.orderStatus = this.subStateList[this.tabCur].code;
+				params.pageNum = this.pageParams[this.tabCur].pageNum;
 				this.$refs.loadStatusBar.showLoading();
 				try {
 					let res = null;
@@ -527,15 +531,17 @@
 					orderKeywords: ''
 				}
 			},
-			tabSelect(e) {
+			tabSelect(e) {
+				this.stateCur = null;
 				this.tabCur = e.currentTarget.dataset.id;
 				this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
 				// this.reloadMasterOrderPage(this.stateCur, this.subStateList[this.tabCur].code);
 				this.reloadMasterOrderPage();
 			},
 			statusSelect(e) {
+				this.tabCur = null;
 				this.stateCur = e.currentTarget.dataset.id;
-				this.loadData(this.stateCur, this.subStateList[this.tabCur].code);
+				this.reloadMasterOrderPage();
 			},
 			getCurDateAndTime() {
 				let date = new Date();
@@ -644,8 +650,8 @@
 				}
 				let res = await this.$request.qrPay(orderInfo);
 				if (res && res.code === 0) {
-					this.$refs.payQrcode.showQrcode(res.data.expend.qrcode_url);
 					this.showModal(e, orderInfo);
+					this.$refs.payQrcode.showQrcode(res.data.expend.qrcode_url);
 				}
 			},
 			showServOrderDetail(order) {