From b38f0975b1f3cb6544058501b109de985fa1344e Mon Sep 17 00:00:00 2001
From: gcd <wyemail666@163.com>
Date: Wed, 7 May 2025 22:04:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/arrived-on-site.vue        |  2 +-
 pages/order/complete-service.vue       |  4 +--
 pages/order/order-info.vue             | 38 +++++++++++++++++++-------
 pages/user/login.vue                   |  2 +-
 pages/workbench/workbench-skeleton.vue |  2 +-
 5 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/pages/order/arrived-on-site.vue b/pages/order/arrived-on-site.vue
index 7942611..6d96234 100644
--- a/pages/order/arrived-on-site.vue
+++ b/pages/order/arrived-on-site.vue
@@ -13,7 +13,7 @@
         <view class="imgs-ctr">
           <view class="img-item" v-for="(imgUrl, index) in images" :key="index">
             <view @click="helpers.previewImage(imgUrl)" class="img-ctr" :style="{marginRight: (index+1) % 4 === 0 ? '0' : '55rpx'}">
-              <image class="img" mode="aspectFill" :src="imgUrl"></image>
+              <image class="img" mode="aspectFit" :src="imgUrl"></image>
             </view>
             <view class="del" @click="delImg(index)">
               <me-icon class="icon" type="icon-close-circle-fill" color="var(--importantColor)" size="40rpx"></me-icon>
diff --git a/pages/order/complete-service.vue b/pages/order/complete-service.vue
index 1d94310..a81edf1 100644
--- a/pages/order/complete-service.vue
+++ b/pages/order/complete-service.vue
@@ -13,7 +13,7 @@
         <view class="imgs-ctr">
           <view class="img-item" v-for="(imgUrl, index) in submitData.complete_images" :key="index">
             <view @click="helpers.previewImage(imgUrl)" class="img-ctr" :style="{marginRight: (index+1) % 4 === 0 ? '0' : '55rpx'}">
-              <image class="img" mode="aspectFill" :src="imgUrl"></image>
+              <image class="img" mode="aspectFit" :src="imgUrl"></image>
             </view>
             <view class="del" @click="delImg(index)">
               <me-icon class="icon" type="icon-close-circle-fill" color="var(--importantColor)" size="40rpx"></me-icon>
@@ -67,7 +67,7 @@
           </view>
           <view v-else class="img-item">
             <view @click="helpers.previewImage(submitData.payment_image)" class="img-ctr">
-              <image class="img" mode="aspectFill" :src="submitData.payment_image"></image>
+              <image class="img" mode="aspectFit" :src="submitData.payment_image"></image>
             </view>
             <view class="del" @click="delPaymentImg()">
               <me-icon class="icon" type="icon-close-circle-fill" color="var(--importantColor)" size="40rpx"></me-icon>
diff --git a/pages/order/order-info.vue b/pages/order/order-info.vue
index c0386c6..a73148d 100644
--- a/pages/order/order-info.vue
+++ b/pages/order/order-info.vue
@@ -38,10 +38,13 @@
         </view>
         <view class="item-row flex-sb line-after">
           <view class="title flex-l">客户电话</view>
-          <view class="value flex-r value-theme" @click="helpers.makePhoneCall(data.order_info.tel)">
-            <me-icon class="icon" type="icon-call" color="var(--themeColor)" size="40rpx"></me-icon>
+          <view v-if="data.status === enums.ORDER_DISPATCH_STATUS.STATUS_FINISH" class="value flex-r">
             <text>{{ data.order_info.tel }}</text>
           </view>
+          <view v-else class="value flex-r value-theme" @click="helpers.makePhoneCall(data.order_info.tel)">
+            <text>{{ data.order_info.tel }}</text>
+            <me-icon class="icon" type="icon-call" color="var(--themeColor)" size="40rpx"></me-icon>
+          </view>
         </view>
       </template>
       <view class="item-row flex-sb line-after">
@@ -52,13 +55,21 @@
       </view>
       <view class="item-multi-line line-after">
         <view class="title flex-l">客户地址</view>
-        <view class="value flex-l">{{helpers.removeCommas(data.order_info.area.merge_name) + data.order_info.address}}</view>
+        <view class="value flex-l">{{helpers.removeCommas(data.order_info.area.merge_name)}}<template v-if="data.status !== enums.ORDER_DISPATCH_STATUS.STATUS_FINISH">{{ data.order_info.address }}</template></view>
       </view>
-      <view class="item-multi-line">
+      <view class="item-multi-line line-after">
         <view class="title flex-l">详情</view>
         <view class="value flex-l">{{data.order_info.detail ? data.order_info.detail : '暂无详情'}}</view>
       </view>
-      <view class="item-multi-line">
+      <view class="images line-after" v-if="data.order_info.images.length > 0">
+        <view class="title flex-l">图片</view>
+        <view class="imgs-ctr">
+          <view @click="helpers.previewImage(imgUrl)" v-for="(imgUrl, index) in data.order_info.images" :key="index" class="img-ctr" :style="{marginRight: (index+1) % 4 === 0 ? '0' : '55rpx'}">
+            <image class="img" mode="aspectFit" :src="imgUrl"></image>
+          </view>
+        </view>
+      </view>
+      <view class="item-multi-line line-after">
         <view class="title flex-l">客户备注</view>
         <view class="value flex-l">{{data.order_info.remark ? data.order_info.remark : '无备注信息'}}</view>
       </view>
@@ -90,7 +101,7 @@
         <view class="title flex-l">上门图片</view>
         <view class="imgs-ctr">
           <view @click="helpers.previewImage(imgUrl)" v-for="(imgUrl, index) in data.arrive_images" :key="index" class="img-ctr" :style="{marginRight: (index+1) % 4 === 0 ? '0' : '55rpx'}">
-            <image class="img" mode="aspectFill" :src="imgUrl"></image>
+            <image class="img" mode="aspectFit" :src="imgUrl"></image>
           </view>
         </view>
       </view>
@@ -98,11 +109,17 @@
 
     <!--    已完成 -->
     <view class="info" v-if="data.status === enums.ORDER_DISPATCH_STATUS.STATUS_FINISH">
+      <view class="item-row flex-sb line-after">
+        <view class="title flex-l">完成时间</view>
+        <view class="value flex-r">
+          <text>{{data.finish_time}}</text>
+        </view>
+      </view>
       <view :class="[data.order_info.receive_type === 1 ? 'line-after' : '', 'images']">
         <view class="title flex-l">完成图片</view>
         <view class="imgs-ctr">
           <view @click="helpers.previewImage(imgUrl)" v-for="(imgUrl, index) in data.images" :key="index" class="img-ctr" :style="{marginRight: (index+1) % 5 === 0 ? '0' : '36rpx'}">
-            <image class="img" mode="aspectFill" :src="imgUrl"></image>
+            <image class="img" mode="aspectFit" :src="imgUrl"></image>
           </view>
         </view>
       </view>
@@ -129,7 +146,7 @@
           <view class="title flex-l">收款凭证</view>
           <view class="imgs-ctr">
             <view @click="helpers.previewImage(data.image)" :key="index" class="img-ctr">
-              <image class="img" mode="aspectFill" :src="data.image"></image>
+              <image class="img" mode="aspectFit" :src="data.image"></image>
             </view>
           </view>
         </view>
@@ -151,8 +168,8 @@
 
     <!--    待上门-->
     <view class="bottom" v-if="data.status === enums.ORDER_DISPATCH_STATUS.STATUS_PLANIT">
-      <me-button @click="helpers.openLocation(data.order_info.lat, data.order_info.lng)" active-color="var(--contentBgColor)" icon-type="icon-navigation" text="到达现场" width="686rpx" text-color="var(--titleColor)" custom-icon-color="var(--titleColor)"></me-button>
-      <me-button @click="arrivedOnSite()" text="完成上门" width="686rpx" icon-type="icon-arrow-right-circle" margin-top="32rpx"></me-button>
+      <me-button @click="helpers.openLocation(data.order_info.lat, data.order_info.lng)" active-color="var(--contentBgColor)" icon-type="icon-navigation" text="导航至客户地址" width="686rpx" text-color="var(--titleColor)" custom-icon-color="var(--titleColor)"></me-button>
+      <me-button @click="arrivedOnSite()" text="到达现场" width="686rpx" icon-type="icon-arrow-right-circle" margin-top="32rpx"></me-button>
     </view>
 
     <!--    完成服务-->
@@ -392,6 +409,7 @@ const getOrderStatusText = (status) => {
     .report-order-exception {
       width: 100%;
       height: 80rpx;
+      margin-top: 20rpx;
       .report-ctr {
         width: 198rpx;
         height: 64rpx;
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 16040d1..7031462 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -3,7 +3,7 @@
     <view class="info">
       <view class="top flex-c">
         <view class="icon-container flex-c">
-          <image class="img" mode="aspectFill" :src="inject('globalData').appIcon"></image>
+          <image class="img" mode="aspectFit" :src="inject('globalData').appIcon"></image>
         </view>
       </view>
       <view class="bottom">超邦手工单系统</view>
diff --git a/pages/workbench/workbench-skeleton.vue b/pages/workbench/workbench-skeleton.vue
index 5f0f39c..46e8ca3 100644
--- a/pages/workbench/workbench-skeleton.vue
+++ b/pages/workbench/workbench-skeleton.vue
@@ -7,7 +7,7 @@
             <view class="status-bar top--status-bar data-v-e4d1a339 top--data-v-e4d1a339" style="height:47px"></view>
             <view class="capsule top--capsule flex-c top--flex-c data-v-e4d1a339 top--data-v-e4d1a339" style="height:40px">
               <view class="icon-ctr top--icon-ctr flex-c top--flex-c data-v-e4d1a339 top--data-v-e4d1a339">
-                <image class="icon top--icon data-v-e4d1a339 top--data-v-e4d1a339 sk-image" mode="aspectFill"></image>
+                <image class="icon top--icon data-v-e4d1a339 top--data-v-e4d1a339 sk-image" mode="aspectFit"></image>
               </view>
               <text class="title top--title data-v-e4d1a339 top--data-v-e4d1a339 sk-transparent sk-text-14-2857-32 sk-text">工作台</text>
             </view>