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/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
+						})
+					}
 				})
 			},
 			/**