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

src/common/api/order.js

@@ -85,6 +85,12 @@ let orderApiFun = function(vm){
 	 */
 	let contactTime = async (params = {},orderId) => await vm.$u.get('/wxh-worker-rest/rest/order/record/'+ vm.vuex_token+'/contact/'+orderId, params);
 	
+	/**
+	 * 检查是否可以拒单
+	 */
+	let checkRejectable = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/order/'+ vm.vuex_token+'/wokerOrder/checkRejectable', params);
+	
+	
 	const orderApi = {
 		listByRecommendOrder,
 		listOrderCount,
@@ -105,6 +111,7 @@ let orderApiFun = function(vm){
 		getWatermark,
 		openTimerange,
 		contactTime,
+		checkRejectable
 	}
 	return orderApi
 }

src/components/order/index.vue

@@ -26,8 +26,8 @@
 		</view>
 
 		<view class="line-view"></view>
-		<view class="reason-view" v-if="showReason"><text>未通过原因：</text>
-			<text class="reason-text">{{orderData.auditResults.remark}}</text>
+		<view class="reason-view" v-if="showReason"><text class="reason-text">未通过原因：</text>
+			<text>{{orderData.auditResults.remark}}</text>
 		</view>
 		<view class="bottom-view">
 			<view>
@@ -83,7 +83,7 @@
 			 waitAppointment:待预约、
 			 waitCheckIn:待签到、
 			 waitFinish:待完工、
-			 review: 审核中、
+			 audit: 审核中、
 			 exception：异常单、
 			 finish：已完工
 			 */
@@ -158,7 +158,7 @@
 					.orderBusinessType != 'R')
 			},
 			showTime() {
-				return [4, 6].indexOf(this.orderType) != -1
+				return [4, 5, 6].indexOf(this.orderType) != -1
 			},
 			infoTexts() {
 				return {
@@ -224,7 +224,7 @@
 					'waitAppointment': 1, // 待预约、
 					'waitCheckIn': 2, // 待签到、
 					'waitFinish': 3, // 待完工、
-					'review': 4, // 审核中、
+					'audit': 4, // 审核中、
 					'exception': 5, // 异常单、
 					'finish': 6, //已完工
 				}
@@ -369,10 +369,12 @@
 			text-align: left;
 			margin-top: 30rpx;
 			font-size: 26rpx;
-			color: #666666;
-
+			color: #FA5A49;
+			display: flex;
+			align-items: flex-start;
 			.reason-text {
-				color: #FA5A49;
+				flex-shrink: 0;
+				color: #666666;
 			}
 		}
 

src/pages/index/index.vue

@@ -50,7 +50,7 @@
 		</view>
 		<!-- </view> -->
 		<!-- </scroll-view> -->
-		<view class="bottom-view" v-if="needSettled && orderList.length <= 0">
+		<view class="bottom-view" v-if="needSettled || orderList.length <= 0">
 			<view class="bottom-line-view"></view>
 			<view class="bottom-text">我也是有底线哒</view>
 			<view class="bottom-line-view"></view>

src/pages/order/detail.vue

@@ -246,7 +246,6 @@
 				this.takeStatus = true
 			},
 			closeTake(img) {
-				console.log(img)
 				this.takeStatus = false
 				// 获取返回的图片 ,如果返回的图片存在则直接异常签约，成功后跳转到去完工页面，
 				if(img){ // 拍照完成
@@ -437,8 +436,14 @@
 				})
 			},
 			rejectOrder() { // 拒单
-				uni.navigateTo({
-					url: 'pages/order/refuse?orderId='+this.order.orderId
+				// 检查是否可以拒单
+				var data={}
+				this.$u.api.checkRejectable(data).then(res => {
+					if (res.data.code === 200 && res.data.data === true) {
+						uni.navigateTo({
+							url: 'pages/order/refuse?orderId='+this.order.orderId
+						})
+					}
 				})
 			},
 			/**

src/pages/order/feedback.vue

@@ -59,8 +59,8 @@
 						<text class="txt">{{txt}}</text>
 					</view>
 				</view>
-				<view class="input-view">
-				<u-input v-show="showRemark" v-model="trace.remark" class="textarea" height="156" type="textarea" placeholder="请补充详细说明，以便于记录您的接单信用分"></u-input>
+				<view class="input-view" v-show="showRemark">
+				<u-input v-model="trace.remark" class="textarea" height="156" type="textarea" placeholder="请补充详细说明，以便于记录您的接单信用分"></u-input>
 				</view>
 			</view>
 			<view class="time-view">

src/pages/order/index.vue

@@ -107,7 +107,7 @@
 					'waitAppointment': 0, // 待预约、
 					'waitCheckIn': 1, // 待签到、
 					'waitFinish': 2, // 待完工、
-					'review': 3, // 审核中、
+					'audit': 3, // 审核中、
 					'exception': 4, // 异常单、
 					'finish': 5, //已完工
 				}
@@ -118,7 +118,7 @@
 					0: 'waitAppointment',
 					1: 'waitCheckIn',
 					2: 'waitFinish',
-					3: 'review',
+					3: 'audit',
 					4: 'exception',
 					5: 'finish'
 				}
@@ -134,7 +134,7 @@
 				this.pageNumber = 0
 				this.orderList = []
 				this.loadStatus = 'loading'
-				this.getOrderList(index === 0 ? 0 : 5)
+				this.getOrderList(index === 0 ? this.currentIndex : 5)
 			},
 			// tab栏切换
 			change(index) {