From 592423f97ff9d5445d8aa58eafcd21a355b37cc2 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 16 Apr 2025 20:26:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E5=B1=9E=E6=80=A7=E5=92=8C=E6=9C=8D=E5=8A=A1ID?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将`.box`的`height`改为`min-height`以适应内容高度变化，并修正`timelineService.vue`中服务ID的引用，使用`item.id`和`order.orderId`代替`item.orderServiceList.id`和`order.id`，以提高代码的可读性和一致性。
---
 otherPages/orderTakingManage/detail/index.scss      | 2 +-
 pages/myOrdersManage/components/timelineService.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/otherPages/orderTakingManage/detail/index.scss b/otherPages/orderTakingManage/detail/index.scss
index 483d90a..69af78b 100644
--- a/otherPages/orderTakingManage/detail/index.scss
+++ b/otherPages/orderTakingManage/detail/index.scss
@@ -1,6 +1,6 @@
 	.box {
 		width: 100vw;
-		height: 100vh;
+		min-height: 100vh;
 		background-color: #F5F5F5;
 		padding: 2% 3% 0 3%;
 	}
diff --git a/pages/myOrdersManage/components/timelineService.vue b/pages/myOrdersManage/components/timelineService.vue
index 057e0b0..8102633 100644
--- a/pages/myOrdersManage/components/timelineService.vue
+++ b/pages/myOrdersManage/components/timelineService.vue
@@ -180,11 +180,11 @@
 							});
 						}
 						
-						serviceId = item.orderServiceList.id,
+						serviceId = item.id,
 						
 						petList.push({
 							name: pet.name,
-							serviceId : item.orderServiceList.id,
+							serviceId : item.id,
 							gender: pet.gender === '男生' ? 'male' : 'female',
 							breed: pet.breed,
 							bodyType: `(${pet.bodyType})`,
@@ -196,7 +196,7 @@
 			}
 			
 			return {
-				id: order.id,
+				id: order.orderId,
 				orderId,
 				serviceId,
 				address: order.cityAddress,