问题修复

common/js/request.js

@@ -435,8 +435,8 @@ export default {
 			header: {
 				pageNum: params.pageNum,
 				pageSize: params.pageSize,
-				orderByColumn: params.orderByColumn,
+				orderByColumn: params.orderByColumn ? params.orderByColumn : "",
-				isAsc: params.isAsc
+				isAsc: params.isAsc ? params.isAsc : ""
 			}
 		})
 		return res[1].data;
@@ -455,8 +455,8 @@ export default {
 			method: 'POST',
 			data: params,
 			header: {
-				orderByColumn: params.orderByColumn,
+				orderByColumn: params.orderByColumn ? params.orderByColumn : "",
-				isAsc: params.isAsc
+				isAsc: params.isAsc ? params.isAsc : ""
 			}
 		})
 		return res[1].data;
@@ -467,8 +467,8 @@ export default {
 			method: 'POST',
 			data: params,
 			header: {
-				orderByColumn: params.orderByColumn,
+				orderByColumn: params.orderByColumn ? params.orderByColumn : "",
-				isAsc: params.isAsc
+				isAsc: params.isAsc ? params.isAsc : ""
 			}
 		})
 		return res[1].data;
@@ -505,8 +505,8 @@ export default {
 			header: {
 				pageNum: params.pageNum,
 				pageSize: params.pageSize,
-				orderByColumn: params.orderByColumn,
+				orderByColumn: params.orderByColumn ? params.orderByColumn : "",
-				isAsc: params.isAsc
+				isAsc: params.isAsc ? params.isAsc : ""
 			}
 		})
 		return res[1].data;
@@ -777,5 +777,14 @@ export default {
 			data: params
 		})
 		return res[1].data;
+	},
+	
+	async callDetailCustomer(params = {}) {
+		let res = await uni.request({
+			url: '/order/detail/callCustomer',
+			method: 'POST',
+			data: params
+		})
+		return res[1].data;
 	}
 }

pages/order-manage/modal/time-arrange.vue

@@ -162,6 +162,11 @@
 						id: order.orderMasterId,
 						isCall: '02'
 					});
+				} else {
+					this.$request.callDetailCustomer({
+						id: order.orderDetailId,
+						isCall: '02'
+					});
 				}
 				uni.makePhoneCall({
 					phoneNumber: order.customerPhone

pages/order-manage/order-manage.vue

@@ -113,7 +113,9 @@
 			<view>
 				<view v-if="order.timeout == 1" class="float-left">
 					<view v-if="order.orderStatus === 0" class='cu-tag margin-right-xs radius line-red margin-top-xs'>超时未接单</view>
-					<view v-else-if="order.orderStatus === 1" class='cu-tag margin-right-xs radius line-red margin-top-xs'>超时未预约</view>
+					<view v-else-if="order.orderStatus === 1 && order.isCall === '1'" class='cu-tag margin-right-xs radius line-red margin-top-xs'>超时未预约</view>
+					<view v-else-if="order.orderStatus === 1 && order.isCall === '02'" class='cu-tag margin-right-xs radius line-red margin-top-xs'>超时未排单</view>
+					<view v-else-if="order.orderStatus === 1 && order.orderDetailId != null" class='cu-tag margin-right-xs radius line-red margin-top-xs'>超时未预约</view>
 					<view v-else-if="order.orderStatus === 2" class='cu-tag margin-right-xs radius line-red margin-top-xs'>超时未上门</view>
 					<view v-else-if="order.orderStatus === 3" class='cu-tag margin-right-xs radius line-red margin-top-xs'>超时未完单</view>
 				</view>
@@ -1076,12 +1078,6 @@
 				this.ifShowPageMeta = e.show;
 			},
 			makePhoneCall(order) {
-				if (order.orderDetailId == null) {
-					this.$request.callCustomer({
-						id: order.orderMasterId,
-						isCall: '02'
-					});
-				}
 				uni.makePhoneCall({
 					phoneNumber: order.customerPhone
 				})

pages/order-manage/serv-detail.vue

@@ -50,7 +50,7 @@
 				<text class="cuIcon-people text-main-color margin-right-xs"></text>
 				<text class="margin-right-sm">客户：{{servDetail.customerName}}</text>
 				<text>{{servDetail.customerPhone.substring(0, 3) + "****" + servDetail.customerPhone.substring(7)}}</text>
-				<button class="cu-btn line-main-color sm" @click="makePhoneCall(servDetail.customerPhone)">拨打</button>
+				<button class="cu-btn line-main-color sm" @click="makeCustomerPhoneCall(servDetail)">拨打</button>
 			</view>
 			<view class="margin-top-sm" v-if="servDetail.orderDetailId">
 				<text class="cuIcon-friendfamous text-main-color margin-right-xs"></text>
@@ -708,6 +708,23 @@
 					current: e.currentTarget.dataset.url
 				});
 			},
+			async makeCustomerPhoneCall(order) {
+				uni.makePhoneCall({
+					phoneNumber: order.customerPhone
+				})
+				if (order.orderDetailId == null) {
+					let res = await this.$request.callCustomer({
+						id: order.orderMasterId,
+						isCall: '02'
+					});
+				} else {
+					this.$request.callDetailCustomer({
+						id: order.orderDetailId,
+						isCall: '02'
+					});
+				}
+				this.loadData();
+			},
 			makePhoneCall(phoneNum) {
 				uni.makePhoneCall({
 					phoneNumber: phoneNum