From eb1b1d3e096b95140d3760650c195f0dcd87af81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=9F=E5=B7=9D=E4=B8=9C?= <wyemail666@163.com>
Date: Mon, 28 Apr 2025 15:06:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/config.js                    |   2 +-
 components/me-icon/me-icon.css   |  56 +++++++++++++++++--------------
 components/me-icon/me-icon.ttf   | Bin 3796 -> 4120 bytes
 pages/order/arrived-on-site.vue  |  10 ++++--
 pages/order/complete-service.vue |  20 ++++++++---
 pages/order/order-info.vue       |  25 +++-----------
 static/css/form.scss             |  19 ++++++++---
 utils/helpers.js                 |  14 ++++++++
 8 files changed, 89 insertions(+), 57 deletions(-)

diff --git a/api/config.js b/api/config.js
index b43ebf5..7a4c28e 100644
--- a/api/config.js
+++ b/api/config.js
@@ -3,7 +3,7 @@ let accountInfo = wx.getAccountInfoSync();
 let envVersion = accountInfo.miniProgram.envVersion
 
 //手动指定版本
-envVersion = 'trial'
+// envVersion = 'trial'
 
 let hosts = {
     "develop": 'http://wanyu.test',
diff --git a/components/me-icon/me-icon.css b/components/me-icon/me-icon.css
index 56fed6a..c128214 100644
--- a/components/me-icon/me-icon.css
+++ b/components/me-icon/me-icon.css
@@ -1,45 +1,51 @@
-.icon-arrow-up-line:before {
-  content: "\e90d";
-}
-.icon-progress-2-line:before {
-  content: "\e90e";
-}
-.icon-reset-left-line:before {
-  content: "\e90c";
-}
-.icon-upload-cloud-fill:before {
-  content: "\e90b";
-}
-.icon-arrow-right:before {
-  content: "\e90a";
-}
-.icon-info:before {
+.icon-arrow-right-circle:before {
   content: "\e900";
 }
-.icon-call:before {
+.icon-arrow-right:before {
   content: "\e901";
 }
-.icon-user:before {
+.icon-arrow-up-line:before {
   content: "\e902";
 }
-.icon-logout:before {
+.icon-call:before {
   content: "\e903";
 }
-.icon-navigation:before {
+.icon-checkbox-blank-circle:before {
   content: "\e904";
 }
-.icon-flashlight:before {
+.icon-checkbox-circle:before {
   content: "\e905";
 }
-.icon-time:before {
+.icon-close-circle-fill:before {
   content: "\e906";
 }
-.icon-arrow-right-circle:before {
+.icon-flashlight:before {
   content: "\e907";
 }
-.icon-checkbox-circle:before {
+.icon-info:before {
   content: "\e908";
 }
-.icon-checkbox-blank-circle:before {
+.icon-logout:before {
   content: "\e909";
 }
+.icon-navigation:before {
+  content: "\e90a";
+}
+.icon-progress-2-line:before {
+  content: "\e90b";
+}
+.icon-reset-left-fill:before {
+  content: "\e90c";
+}
+.icon-reset-left-line:before {
+  content: "\e90d";
+}
+.icon-time:before {
+  content: "\e90e";
+}
+.icon-upload-cloud-fill:before {
+  content: "\e90f";
+}
+.icon-user:before {
+  content: "\e910";
+}
diff --git a/components/me-icon/me-icon.ttf b/components/me-icon/me-icon.ttf
index 43b8f8aa95177c90b7243fc990460236dce84618..c5be73f4c0fecb70be449d661edc1ba8f0ca93f1 100644
GIT binary patch
delta 516
zcmca2J42zKfsuiMft#U$ftkU;KUm+0Ux-Z(D6$8L6OwZi3&g`NO=n<WlmYTX(i4jd
zfV2RR5288Jb1Ku`TQeR5@+*Lb{K-g7Owo?Kr_I2?TLP3f%K!?nPiMXc<gWqpRWfo*
zD!hOUApZi82+7G$c1)DMC)dNkz^4Kf(8*1#C}5CcI0fVf0Qm}eiMgpWy*PgZ`9KR9
z+Y0iFOMngq0{$N$c?M?YCle3YGYU*%^kx*8?8BHj`7hg%$%dQ<COdK)Y_4U}Vw&8|
zv25}|_H)cK44RWKu*>l&3#zk=vx}RHo2#3vvriV}km9Mdsf44+j!cq#jL+eGAY<}x
zR;S5Z8Ba{sWxX)Dko!FM{{zgcnGY~n0-ZE@0k`PnC0yccYU=EQitLk*bLsLpSwu53
zWGKo=t8sBp;t`pAhfSE@ze67=m?^8G5~QnVz%aRi>mbloo|D_y$|ry1oG^JIOTPlh
zU+Wsb@y7Gpd}ZKf0dX0g82em@(UTK+%o#-|&*1Tye1M0;1}x9TAi^LAjJ*d8KbW|f
x5||D#voWhNcQGGf{=^c&vVm2AwSaX8>pyTTi!z*GfSAfO`5>S0W_{kJi~yQbg7E+V

delta 378
zcmbQCa7DJBfsuiMft#U$ftkU;KUm+0Ux-ZtD6$8L6OwZi3&g`NO=VzUlmYTX(i4jd
zfV2RR5288Jb1KukBt&)t`4tQdTt_le6H~OM{Vf?7cx-_3W*I;M_UX)5fcz35UnL{A
zq{0cv0P<%537?$&WXD9YO_DW0fhRx#joieF0tN|&Qw$8eJV3reUSe+QOfSygK)w#p
zlD2~U;u4@kfq-udNS=Y2`N6~k_KbX!7`++!Ci^gEPCm+hVsj?57SrVSJe`v#aGago
z%I+|ECij8KTN#f`wq!duc{=N&$(2k8CP(s2n0%A#z+_8igUPX+=M_Mv3NK_bj_0@e
z%D~M6;xarDVU2^)lV|XnGYU_>!0TfHmg8a&VUS~JVw}Qwi%EpZi7AQc5VHz%8}l6&
g8<rN9CoF$hlfYps%y5DMVj9zAMgif?#e7Q{0myM#GXMYp

diff --git a/pages/order/arrived-on-site.vue b/pages/order/arrived-on-site.vue
index ad9a1f1..7942611 100644
--- a/pages/order/arrived-on-site.vue
+++ b/pages/order/arrived-on-site.vue
@@ -11,9 +11,15 @@
           <view class="desc flex-l">请上传上门的打卡照片（最多 10 张）</view>
         </view>
         <view class="imgs-ctr">
-          <view v-for="(imgUrl, index) in images" :key="index" @click="delImg(index)" class="img-ctr" :style="{marginRight: (index+1) % 5 === 0 ? '0' : '36rpx'}">
-            <image class="img" mode="aspectFill" :src="imgUrl"></image>
+          <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>
+            </view>
+            <view class="del" @click="delImg(index)">
+              <me-icon class="icon" type="icon-close-circle-fill" color="var(--importantColor)" size="40rpx"></me-icon>
+            </view>
           </view>
+
           <view @click="upload()" class="up-ctr flex-direction-column" hover-class="auto-mask-layer-radius4"
                 hover-start-time="0" hover-stay-time="50">
             <me-icon class="icon" type="icon-upload-cloud-fill" color="var(--summaryColor)" size="36rpx"></me-icon>
diff --git a/pages/order/complete-service.vue b/pages/order/complete-service.vue
index a1f0c39..1ab1c17 100644
--- a/pages/order/complete-service.vue
+++ b/pages/order/complete-service.vue
@@ -11,9 +11,15 @@
           <view class="desc flex-l">请上传完成图片（最多 10 张）</view>
         </view>
         <view class="imgs-ctr">
-          <view v-for="(imgUrl, index) in submitData.complete_images" :key="index" @click="delImg(index)" class="img-ctr" :style="{marginRight: (index+1) % 5 === 0 ? '0' : '36rpx'}">
-            <image class="img" mode="aspectFill" :src="imgUrl"></image>
+          <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>
+            </view>
+            <view class="del" @click="delImg(index)">
+              <me-icon class="icon" type="icon-close-circle-fill" color="var(--importantColor)" size="40rpx"></me-icon>
+            </view>
           </view>
+
           <view @click="upload('complete')" class="up-ctr flex-direction-column" hover-class="auto-mask-layer-radius4"
                 hover-start-time="0" hover-stay-time="50">
             <me-icon class="icon" type="icon-upload-cloud-fill" color="var(--summaryColor)" size="36rpx"></me-icon>
@@ -59,9 +65,15 @@
             <me-icon class="icon" type="icon-upload-cloud-fill" color="var(--summaryColor)" size="36rpx"></me-icon>
             <view class="up flex-c">点击上传</view>
           </view>
-          <view v-else @click="delPaymentImg()" class="img-ctr">
-            <image class="img" mode="aspectFill" :src="submitData.payment_image"></image>
+          <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>
+            </view>
+            <view class="del" @click="delPaymentImg()">
+              <me-icon class="icon" type="icon-close-circle-fill" color="var(--importantColor)" size="40rpx"></me-icon>
+            </view>
           </view>
+
         </view>
       </view>
     </view>
diff --git a/pages/order/order-info.vue b/pages/order/order-info.vue
index 889c882..7caa8d0 100644
--- a/pages/order/order-info.vue
+++ b/pages/order/order-info.vue
@@ -88,7 +88,7 @@
       <view class="images">
         <view class="title flex-l">上门图片</view>
         <view class="imgs-ctr">
-          <view @click="previewImage(imgUrl)" v-for="(imgUrl, index) in data.arrive_images" :key="index" class="img-ctr" :style="{marginRight: (index+1) % 5 === 0 ? '0' : '36rpx'}">
+          <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>
           </view>
         </view>
@@ -100,7 +100,7 @@
       <view class="images line-after">
         <view class="title flex-l">完成图片</view>
         <view class="imgs-ctr">
-          <view @click="previewImage(imgUrl)" v-for="(imgUrl, index) in data.images" :key="index" class="img-ctr" :style="{marginRight: (index+1) % 5 === 0 ? '0' : '36rpx'}">
+          <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>
           </view>
         </view>
@@ -126,7 +126,7 @@
       <view class="images">
         <view class="title flex-l">收款凭证</view>
         <view class="imgs-ctr">
-          <view @click="previewImage(data.image)" :key="index" class="img-ctr">
+          <view @click="helpers.previewImage(data.image)" :key="index" class="img-ctr">
             <image class="img" mode="aspectFill" :src="data.image"></image>
           </view>
         </view>
@@ -295,21 +295,6 @@ const getPriceDescText = () => {
 const getOrderStatusText = (status) => {
   return enums.WORKBENCH_STATUS_TEXT[status]
 }
-
-//预览图片
-const previewImage = (url) => {
-  uni.previewImage({
-    urls: [url],
-    longPressActions: {
-      itemList: ['发送给朋友', '保存图片', '收藏'],
-      success: function(data) {
-      },
-      fail: function(err) {
-        console.log(err.errMsg);
-      }
-    }
-  });
-}
 </script>
 
 <style lang="scss" scoped>
@@ -422,8 +407,8 @@ const previewImage = (url) => {
         display: flex;
         flex-wrap: wrap;
         .img-ctr {
-          width: 100rpx;
-          height: 100rpx;
+          width: 120rpx;
+          height: 120rpx;
           margin-right: 36rpx;
           margin-top: 16rpx;
           margin-bottom: 16rpx;
diff --git a/static/css/form.scss b/static/css/form.scss
index c1b2771..211dd89 100644
--- a/static/css/form.scss
+++ b/static/css/form.scss
@@ -89,10 +89,19 @@
       min-height: 100rpx;
       display: flex;
       flex-wrap: wrap;
+      .img-item {
+        position: relative;
+        .del {
+          position: absolute;
+          top: 0;
+          left: 94rpx;
+          width: 48rpx;
+          height: 48rpx;
+        }
+      }
       .img-ctr {
-        width: 100rpx;
-        height: 100rpx;
-        margin-right: 36rpx;
+        width: 120rpx;
+        height: 120rpx;
         margin-top: 16rpx;
         margin-bottom: 16rpx;
         .img {
@@ -102,8 +111,8 @@
         }
       }
       .up-ctr {
-        width: 100rpx;
-        height: 100rpx;
+        width: 120rpx;
+        height: 120rpx;
         background: var(--contentBgColor);
         border-radius: 8rpx;
         margin-top: 16rpx;
diff --git a/utils/helpers.js b/utils/helpers.js
index 4f4c09b..3b4cee3 100644
--- a/utils/helpers.js
+++ b/utils/helpers.js
@@ -180,5 +180,19 @@ class helpers {
 		}, timeout)
 	}
 
+	static previewImage = (url) => {
+		uni.previewImage({
+			urls: [url],
+			longPressActions: {
+				itemList: ['发送给朋友', '保存图片', '收藏'],
+				success: function(data) {
+				},
+				fail: function(err) {
+					console.log(err.errMsg);
+				}
+			}
+		});
+	}
+
 }
 export default helpers