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

src/common/api/order.js

@@ -48,7 +48,7 @@ let orderApiFun = function(vm){
 	/**
 	 * 查询工单操作记录列表接口
 	 */
-	let listOrderRecord = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/order/record/'+ vm.vuex_token+'/listOrderRecord/'+params.orderId, params);
+	let listOrderRecord = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/order/record/'+ vm.vuex_token+'/listOrderRecord/V2/'+params.orderId, params);
 
 	/**
 	 * 接单

src/pages/order/detail.vue

@@ -90,7 +90,10 @@
 								</view>
 								<view v-show="record.operationType==='报备' || record.operationType==='改约'">
 									<text>{{record.operationType==='报备' ? '下次联系时间：' : '改约时间：'}}</text>
-									<text style="color: #2272FF;">{{record.orderRecordRemark}}</text>
+									<text style="color: #2272FF;">{{
+										record.operationType==='报备' && record.orderRecordRemark && record.orderRecordRemark.length>1?
+										record.orderRecordRemark.substring(record.orderRecordRemark.indexOf('：')+1,record.orderRecordRemark.length)
+										:record.orderRecordRemark}}</text>
 								</view>
 							</view>
 						</view>
@@ -345,13 +348,15 @@
 			contactTime() { 
 				let self = this
 				var data={}
-				self.$u.api.contactTime(data,this.order.orderId).then((res)=>{
-					if (res.code == 200) {
-						console.log("===", res.data)
-					} else {
-						console.log(res.message);
-					}
-				})
+				if(this.submitType === "workerAppointment"){
+					self.$u.api.contactTime(data,this.order.orderId).then((res)=>{
+						if (res.code == 200) {
+							console.log("===", res.data)
+						} else {
+							console.log(res.message);
+						}
+					})
+				}
 			},
 			handleClickRight(active) {
 				this.scenePhoto ? this.scenePhotoClick() : this.take()