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,