Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

src/pages/index/order.vue

@@ -232,20 +232,6 @@
 				});
 			},
 			handleClickCellButton(item) {
-				this.filish(item)
-			},
-			handleClick(item, type, showCountTime) { // type:类型，showCountTime：是否显示倒计时。详情页面情况太多，提前传值可以避免页面晃动
-				if(item.orderStatus===86 || item.orderStatus===88){
-					this.filish(item)
-					return 
-				}
-				//type类型
-				// 'waitAccept': 待接单、待抢单;'waitAppointment': 待预约;'waitCheckIn': 待签到;'waitFinish': 待完工;'audit': 审核中;'exception': 异常单;'finish': 已完工;'other': 工单结算信息
-				uni.navigateTo({
-					url: 'pages/order/detail?id=' + item.orderId + '&type=' + type + '&showCountTime=' + showCountTime
-				})
-			},
-			filish(item){
 				// 去完工
 				uni.navigateTo({
 					url: 'pages/order/complete?orderId='+item.orderId 
@@ -257,6 +243,13 @@
 						+ "&maintainStep=" + item.maintainStep
 				})
 			},
+			handleClick(item, type, showCountTime) { // type:类型，showCountTime：是否显示倒计时。详情页面情况太多，提前传值可以避免页面晃动
+				//type类型
+				// 'waitAccept': 待接单、待抢单;'waitAppointment': 待预约;'waitCheckIn': 待签到;'waitFinish': 待完工;'audit': 审核中;'exception': 异常单;'finish': 已完工;'other': 工单结算信息
+				uni.navigateTo({
+					url: 'pages/order/detail?id=' + item.orderId + '&type=' + type + '&showCountTime=' + showCountTime
+				})
+			},
 			handleClickSearch() {
 				uni.navigateTo({
 					url: 'pages/order/search'

src/pages/order/search.vue

@@ -27,7 +27,7 @@
 			<view v-if="orderList && orderList.length > 0" class="order-row">
 				<view v-for="(item, index) in orderList" :key="item.orderId">
 					<OrderCell :orderData="item" :orderType="orderType" :location="dataValue"
-						@click="handleClick" @action="handleClick"> </OrderCell>
+						@click="handleClick" @action="handleClickCellButton"> </OrderCell>
 				</view>
 				<u-loadmore :status="loadStatus" bgColor="#F4F5F7"></u-loadmore>
 			</view>
@@ -114,18 +114,7 @@
 					self.loaded = true
 				});
 			},
-			handleClick(item, type, showCountTime) { // type:类型，showCountTime：是否显示倒计时。详情页面情况太多，提前传值可以避免页面晃动
-				if(item.orderStatus===86 || item.orderStatus===88){
-					this.filish(item)
-					return 
-				}
-				//type类型
-				// 'waitAccept': 待接单、待抢单;'waitAppointment': 待预约;'waitCheckIn': 待签到;'waitFinish': 待完工;'audit': 审核中;'exception': 异常单;'finish': 已完工;'other': 工单结算信息
-				uni.navigateTo({
-					url: 'pages/order/detail?id=' + item.orderId + '&type=' + type + '&showCountTime=' + showCountTime
-				})
-			},
-			filish(item){
+			handleClickCellButton(item) {
 				// 去完工
 				uni.navigateTo({
 					url: 'pages/order/complete?orderId='+item.orderId 
@@ -136,7 +125,14 @@
 						+ "&auditResultsId=" + (item.auditResults?Object.keys(item.auditResults)[Object.keys(item.auditResults).length - 1]:'')
 						+ "&maintainStep=" + item.maintainStep
 				})
-			}
+			},
+			handleClick(item, type, showCountTime) { // type:类型，showCountTime：是否显示倒计时。详情页面情况太多，提前传值可以避免页面晃动
+				//type类型
+				// 'waitAccept': 待接单、待抢单;'waitAppointment': 待预约;'waitCheckIn': 待签到;'waitFinish': 待完工;'audit': 审核中;'exception': 异常单;'finish': 已完工;'other': 工单结算信息
+				uni.navigateTo({
+					url: 'pages/order/detail?id=' + item.orderId + '&type=' + type + '&showCountTime=' + showCountTime
+				})
+			},
 		},
 	}
 </script>