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

src/pages/order/detail.vue

@@ -85,11 +85,12 @@
 							</view>
 							<view class="line-view-right">
 								<view>
-									<text>{{record.operationType}}</text>
+									<text>{{record.operationTypeText}}</text>
 									<text style="color: red;">{{record.overTime?'（超时）':''}}{{record.exception?'（异常）':''}}</text>
+									<text style="color: #2272FF;" v-show="record.operationType==='报备'">（跟进）</text>
 								</view>
-								<view v-show="record.operationType==='报备' || record.operationType==='改约'">
-									<text>{{record.operationType==='报备' ? '下次联系时间：' : '改约时间：'}}</text>
+								<view v-show="record.operationType==='报备' || record.operationType==='预约'|| record.operationType==='改约'">
+									<text>{{record.operationType==='报备' ? '下次联系时间：' : record.operationType==='改约'?'改约时间：': ''}}</text>
 									<text style="color: #2272FF;">{{
 										record.operationType==='报备' && record.orderRecordRemark && record.orderRecordRemark.length>1?
 										record.orderRecordRemark.substring(record.orderRecordRemark.indexOf('：')+1,record.orderRecordRemark.length)
@@ -425,6 +426,16 @@
 				};
 				self.$u.api.listOrderRecord(param).then((res) => {
 					if (res.code == 200) {
+						res.data.forEach(item =>{
+							if(item.operationType === '预约'){
+								item.operationTypeText = '上门时间'
+							}else if (item.operationType === '报备'){
+								let arr = item.orderRecordRemark.split(',')
+								item.operationTypeText = arr[0]
+							}else{
+								item.operationTypeText = item.operationType + '时间'
+							}
+						})
 						self.orderRecords = res.data
 					} else {
 						console.log(res.message, "获取订单详情失败！");