From ea14b6e11ff7c41ddac053e28217134444ba1b4a Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 5 Mar 2023 23:50:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/demand-center/accept-demand-center.vue        | 2 +-
 pages/demand-center/demand-detail.vue               | 2 +-
 pages/order-manage/dispatch-order.vue               | 1 +
 pages/order-manage/modal/new-serv-price-offline.vue | 6 +++++-
 pages/order-manage/modal/new-serv-price-online.vue  | 6 +++++-
 style/default.css                                   | 8 +++++++-
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/pages/demand-center/accept-demand-center.vue b/pages/demand-center/accept-demand-center.vue
index 1ccc300..066f002 100644
--- a/pages/demand-center/accept-demand-center.vue
+++ b/pages/demand-center/accept-demand-center.vue
@@ -83,7 +83,7 @@
 				<view class="margin-top-sm">
 					<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-phone"></text></text>
 					<text class="margin-right-xs">{{task.customerName}}</text>
-					<text>{{task.customerPhone}}</text>
+					<text>{{task.customerPhone.substring(0, 3) + "****" + task.customerPhone.substring(7)}}</text>
 				</view>
 				<view class="padding-top-sm flex justify-end">
 					<button class="cu-btn bg-main-color margin-right-xs shadow-blur" data-modal="showForwardModal"
diff --git a/pages/demand-center/demand-detail.vue b/pages/demand-center/demand-detail.vue
index b85949a..2a10be2 100644
--- a/pages/demand-center/demand-detail.vue
+++ b/pages/demand-center/demand-detail.vue
@@ -30,7 +30,7 @@
 			<view class="margin-top-sm">
 				<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-phone"></text></text>
 				<text class="margin-right-xs">{{order.customerName}}</text>
-				<text>{{order.customerPhone}}</text>
+				<text>{{order.customerPhone.substring(0, 3) + "****" + order.customerPhone.substring(7)}}</text>
 			</view>
 		</view>
 		<view class="margin-top-sm bg-white margin-lr-sm margin-bottom-with-bar">
diff --git a/pages/order-manage/dispatch-order.vue b/pages/order-manage/dispatch-order.vue
index b8afac0..00df69d 100644
--- a/pages/order-manage/dispatch-order.vue
+++ b/pages/order-manage/dispatch-order.vue
@@ -63,6 +63,7 @@
 					</view>
 				</view>
 			</view>
+			<view class="occupancy-bottom-bar"></view>
 		</scroll-view>
 		<!-- 派单金额模态框 -->
 		<view class="cu-modal" :class="showDispatchPriceModal?'show':''">
diff --git a/pages/order-manage/modal/new-serv-price-offline.vue b/pages/order-manage/modal/new-serv-price-offline.vue
index 3b35e87..362ac3a 100644
--- a/pages/order-manage/modal/new-serv-price-offline.vue
+++ b/pages/order-manage/modal/new-serv-price-offline.vue
@@ -50,7 +50,8 @@
 					<textarea style="width: 100%; height: 200rpx;" class="solid radius text-left padding-sm"
 						v-model="remark" maxlength="-1"
 						placeholder="报价额需符合双方约定，并把关键内容附上。如保内维修XX含配件XXX等，分别XX元。如约定下单方寄配件，则订单内“申请配件发起”。"></textarea>
-				</view>
+				</view>
+				<view class="cu-btn line-main-color margin-top-sm long-btn" v-if="priceObj" @click="clearCurAddedPrice">清空加价</view>
 			</view>
 			<view class="cu-bar bg-white solid-top">
 				<view class="action margin-0 flex-sub text-black" data-modal="showNewServPriceOfflineModal"
@@ -172,6 +173,9 @@
 			},
 			goFinishOrder() {
 				this.$emit('finishOrder', this.data);
+			},
+			clearCurAddedPrice() {
+				this.changeOrderPrice(0);
 			}
 		}
 	}
diff --git a/pages/order-manage/modal/new-serv-price-online.vue b/pages/order-manage/modal/new-serv-price-online.vue
index 0de3a41..f63e940 100644
--- a/pages/order-manage/modal/new-serv-price-online.vue
+++ b/pages/order-manage/modal/new-serv-price-online.vue
@@ -50,7 +50,8 @@
 					<textarea style="width: 100%; height: 200rpx;" class="solid radius text-left padding-sm"
 						v-model="remark" maxlength="-1"
 						placeholder="报价额需符合双方约定，并把关键内容附上。如保内维修XX含配件XXX等，分别XX元。如约定下单方寄配件，则订单内“申请配件发起”。"></textarea>
-				</view>
+				</view>
+				<view class="cu-btn line-main-color margin-top-sm long-btn" v-if="priceObj" @click="clearCurAddedPrice">清空加价</view>
 			</view>
 			<view class="cu-bar bg-white solid-top">
 				<view class="action margin-0 flex-sub text-black" data-modal="showNewServPriceOnlineModal"
@@ -172,6 +173,9 @@
 			},
 			goFinishOrder() {
 				this.$emit('finishOrder', this.data);
+			},
+			clearCurAddedPrice() {
+				this.changeOrderPrice(0);
 			}
 		}
 	}
diff --git a/style/default.css b/style/default.css
index bb30d02..c7c8477 100644
--- a/style/default.css
+++ b/style/default.css
@@ -128,7 +128,13 @@
 	}
 }
 
-/* colorui end */
+/* colorui end */
+.occupancy-bottom-bar {
+	width: 100%;
+	height: calc(120rpx + constant(safe-area-inset-bottom) / 2);
+	height: calc(120rpx + env(safe-area-inset-bottom) / 2);
+}
+
 .margin-bottom-with-bar {
 	margin-bottom: calc(120rpx + constant(safe-area-inset-bottom) / 2);
 	margin-bottom: calc(120rpx + env(safe-area-inset-bottom) / 2);