From 50983f34364a8097d94357c22234014dc2c5ef58 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sun, 22 Jun 2025 11:07:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=81=E8=B4=A7=E5=9B=BE=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增送货图展示区域，支持预览主订单和子订单的所有送货图片
- 优化静态图片引用路径，使用@/前缀
- 将环境配置从local改为prod
- 移除冗余注释并调整代码结构
---
 config.js                   |   2 +-
 pages/order/orderDetail.vue |  87 ++++++++++++++++++++++++++++++++++++++++++--
 static/image/order/icon.png | Bin 0 -> 3091 bytes
 3 files changed, 85 insertions(+), 4 deletions(-)
 create mode 100644 static/image/order/icon.png

diff --git a/config.js b/config.js
index 4c91149..068f8c7 100644
--- a/config.js
+++ b/config.js
@@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'local'
+const type = 'prod'
 
 
 // 环境配置
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 55a155e..4843e0c 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -2,11 +2,10 @@
     <view>
         <navbar title="订单详情" bgColor="#DC2828" color="#fff" leftClick @leftClick="$utils.navigateBack" />
 
-        <!-- 水洗店 -->
         <view class="">
             <view class="controls">
                 <view class="title">
-                    <image src="../static/order/icon.png" mode=""></image>
+                    <image src="@/static/image/order/icon.png" mode=""></image>
                     服务完成
                 </view>
                 <view class="tips">
@@ -36,8 +35,28 @@
                 </view>
             </view>
         </view>
+		
+        <!-- 送货图 -->
+		<view class="" v-if="deliveryPictures.length > 0">
+		    <view class="controls">
+		        <view class="delivery-title">
+		            <view class="flex" style="display: flex; align-items: center;">
+		                <view style="width: 8rpx;height: 30rpx;
+						background: #FD5100;border-radius: 6rpx;" />
+		                <view class="head-title">送货图</view>
+		            </view>
+		        </view>
+		        <view class="delivery-images">
+		            <view class="image-item" 
+		                v-for="(image, index) in deliveryPictures" 
+		                :key="index"
+		                @click="previewImage(image, deliveryPictures)">
+		                <image :src="image.trim()" mode="aspectFill"></image>
+		            </view>
+		        </view>
+		    </view>
+		</view>
 
-        <!-- 酒店和水洗店 -->
         <view class="info">
             <view class="flex" style="display: flex;">
                 <view style="width: 8rpx;height: 30rpx;
@@ -230,6 +249,7 @@ export default {
             ],
             order: {},
             id: '',
+            deliveryPictures: [],
         }
     },
     onLoad(options) {
@@ -243,12 +263,43 @@ export default {
             }, res => {
                 this.order = res.result;
                 this.stepsCurrent = this.order.status;
+                this.deliveryPictures = this.getAllDeliveryPictures();
             })
         },
         // 联系客服
         clickService() {
             this.$refs.customerServicePopup.open();
         },
+        // 预览送货图片
+        previewImage(current, urls) {
+            uni.previewImage({
+                current: current.trim(),
+                urls: urls.map(url => url.trim())
+            });
+        },
+        // 提取所有送货图片（包括主订单和子订单）
+        getAllDeliveryPictures() {
+            let allPictures = [];
+            
+            // 提取主订单的送货图
+            if (this.order.deliveryPicture) {
+                const mainPictures = this.order.deliveryPicture.split(',').map(pic => pic.trim()).filter(pic => pic);
+                allPictures = allPictures.concat(mainPictures);
+            }
+            
+            // 提取所有子订单的送货图
+            if (this.order.children && Array.isArray(this.order.children)) {
+                this.order.children.forEach(child => {
+                    if (child.deliveryPicture) {
+                        const childPictures = child.deliveryPicture.split(',').map(pic => pic.trim()).filter(pic => pic);
+                        allPictures = allPictures.concat(childPictures);
+                    }
+                });
+            }
+            
+            // 去重（如果有重复的图片）
+            return [...new Set(allPictures)];
+        },
     }
 }
 </script>
@@ -316,6 +367,36 @@ export default {
             color: $uni-color;
         }
     }
+
+    .delivery-title {
+        width: 100%;
+        margin-bottom: 20rpx;
+        
+        .head-title {
+            font-family: PingFang SC, PingFang SC-Bold;
+            color: #2f2e2e;
+            line-height: 30rpx;
+            margin-left: 10rpx;
+        }
+    }
+
+    .delivery-images {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 20rpx;
+        
+        .image-item {
+            width: 200rpx;
+            height: 200rpx;
+            border-radius: 10rpx;
+            overflow: hidden;
+            
+            image {
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
 }
 
 .steps {
diff --git a/static/image/order/icon.png b/static/image/order/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8deeda704b8d4b52ff8ae294ad382474c6e4740
GIT binary patch
literal 3091
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

literal 0
HcmV?d00001