From 6a7aa58833857fd50a89b74f5bd9f22cc8048b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 11 Nov 2024 18:05:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=B5=81=E7=A8=8B=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/orderdetails.vue | 43 +++++++++++++++++++++++++++---------
 pages/staff/goRoyalty.vue    |  1 +
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/pages/index/orderdetails.vue b/pages/index/orderdetails.vue
index 67724ad..79bc3f4 100644
--- a/pages/index/orderdetails.vue
+++ b/pages/index/orderdetails.vue
@@ -103,13 +103,14 @@
 				</view>
 
 				<view class="">
-						<view style="margin-bottom: 5px;">{{ item.content }}</view>
-					<view v-if="item.images" >
-						<view v-for="it in item.images.split(',')">
+						<view style="margin-bottom: 5px; box-sizing: border-box;padding-left: 10%">{{ item.content }}</view>
+					<view style="display: flex" v-if="item.images" >
+<!--						<view v-for="it in item.images.split(',')">-->
 
-							<image :src="baseImageUrl+'/'+it" style="width: 28vw; height: 12vh; margin-right: 1vw; "  ></image>
+<!--							<image :src="baseImageUrl+'/'+it" style="width: 28vw; height: 12vh; margin-right: 1vw; "  ></image>-->
 
-						</view>
+<!--						</view>-->
+            <u-album :urls="item.imageList" style="padding-left: 40px"></u-album>
 
 
 					</view>
@@ -511,7 +512,29 @@
 					}
 				})
 				this.detailData = res.data
-				this.inspectionId = res.data.inspectionId
+        console.log('this.detailData',this.detailData)
+        this.detailData.stepInfos.forEach(item => {
+          // 检查 item.images 是否为有效的字符串
+          if (typeof item.images === 'string' && item.images.trim() !== '') {
+            // 将里面的images转为数组
+            item.images = item.images.split(',');
+            // 使用map方法处理每个图片路径，转换为对象格式
+            item.images = item.images.map(image => this.baseImageUrl + "/"+image);
+
+            // 将处理后的图片列表赋值给imageList
+            item.imageList = item.images;
+          } else {
+            // 如果 item.images 不是有效的字符串，设置为空数组
+            item.images = [];
+            item.imageList = [];
+          }
+
+          // 输出最终结果
+        });
+        console.log('图片', this.detailData);
+
+
+        this.inspectionId = res.data.inspectionId
 				this.isOnline = res.data.isOnline
 				this.orderStatus = res.data.orderStatus
 				this.payMoney = res.data.goodsPrice / 100
@@ -825,8 +848,8 @@
 
 	.times {
 		width: 30%;
-		font-size: 12px;
-		font-weight: 400;
+		font-size: 14px;
+		font-weight: 600;
 		color: #999999;
 		margin-left: 25px;
 	}
@@ -1073,9 +1096,9 @@
 		display: flex;
 		align-items: center;
 		box-sizing: border-box;
-		padding-left: 10px;
+		padding-left: 6px;
 		color: #0D2E8D;
-		font-size: 22px;
+		font-size: 40px;
 		font-weight: bold;
 	}
 </style>
diff --git a/pages/staff/goRoyalty.vue b/pages/staff/goRoyalty.vue
index 8b9e4cd..9e5fd5d 100644
--- a/pages/staff/goRoyalty.vue
+++ b/pages/staff/goRoyalty.vue
@@ -11,6 +11,7 @@
         v-model="value1"
         mode="year-month"
         @input="selectDate"
+        @cancel="show = false"
     ></u-datetime-picker>
 
     <!-- 总提成金额 -->