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

src/common/api/order.js

@@ -88,7 +88,7 @@ let orderApiFun = function(vm){
 	/**
 	 * 检查是否可以拒单
 	 */
-	let checkRejectable = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/order/'+ vm.vuex_token+'/wokerOrder/checkRejectable', params);
+	let checkRejectable = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/'+ vm.vuex_token+'/wokerOrder/checkRejectable', params);
 
 	/**
 	 * 获取签到距离

src/pages/order/complete.vue

@@ -320,8 +320,8 @@
                 return pass
             },
             confirm(){// 检查结果窗口 确认回调
-                uni.switchTab({
-                    url: '/pages/index/order'
+                uni.reLaunch({
+                    url: '/pages/index/order?type=3'
                 })
             },
             closeCheckResult(){// 检查结果窗口取消回调

src/pages/order/detail.vue

@@ -456,7 +456,7 @@
 				}
 			},
 			dateChange(data){
-				this.loadTimerange()
+				// this.loadTimerange()
 				// 点击日期选择
 				console.log(data,'dateChange')
 				let self = this
@@ -635,8 +635,8 @@
 				// 检查是否可以拒单
 				var data={}
 				this.$u.api.checkRejectable(data).then(res => {
-					if (res.data.code === 200 ) {
-						if( res.data.data === true){
+					if (res.code === 200 ) {
+						if( res.data === true){
 							uni.navigateTo({
 								url: 'pages/order/refuse?orderId='+this.order.orderId
 							})