From 744563aef16a8c6d0f6f3f0915a64faae601fa2d Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Tue, 8 Apr 2025 23:56:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/orderTakingManage/components/list.vue | 30 +++++++++++++++++++++++------
 pages/orderTakingManage/index.vue           |  4 ++--
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/pages/orderTakingManage/components/list.vue b/pages/orderTakingManage/components/list.vue
index f2cac3b..e9f1a40 100644
--- a/pages/orderTakingManage/components/list.vue
+++ b/pages/orderTakingManage/components/list.vue
@@ -11,13 +11,31 @@
 					</view>
 				</view>
 				<view class="container-list">
-					<view class="flex-between flex mb28">
+					<view class="flex-between flex mb28" >
 						<up-image style="flex-shrink:0" class="mr20" width="70px" height="70px"
-							src="https://cdn.catmdogd.com/Work/image/work/tx.png" shape="circle"></up-image>
-						<view>
-							<view class="font28 col3">服务天数: 共2天 I 12-07,12-08</view>
-							<view style="margin: 18rpx 0">期望上门时间：早</view>
-							<view>中华田园犬(小型犬) | 专业喂养+提前熟悉+陪玩</view>
+							:src="" shape="circle"></up-image>
+							<view>
+								<!-- <view class="font28 col3">服务天数: 共2天 I {{itemService.serviceDate}}</view> -->
+								<view class="font28 col3">服务天数: 共{{ item.h5OrderVO.orderServiceList.length }}天 I 
+								
+									<text v-for="itemService in item.h5OrderVO.orderServiceList"
+									:key="itemService.id">
+										{{ itemService.serviceDate }}
+									</text>
+									
+								</view>
+								
+								<!-- <view style="margin: 18rpx 0">期望上门时间：{{itemService.expectServiceTime}}</view> -->
+								<view>中华田园犬(小型犬) | 
+								
+									<text v-for="itemPet in item.h5OrderVO.orderItemList"
+									:key="itemPet.id">
+										{{ itemPet.productName }}
+									</text>
+									
+								</view>
+								
+							</view>
 						</view>
 
 					</view>
diff --git a/pages/orderTakingManage/index.vue b/pages/orderTakingManage/index.vue
index 77ce5d2..b035a3b 100644
--- a/pages/orderTakingManage/index.vue
+++ b/pages/orderTakingManage/index.vue
@@ -73,10 +73,10 @@
 	const getOrderList = async () => {
 		let response = await orderList({
 			status: current.value,
-			userId: userInfo.value.userId
+			userIdJson: userInfo.value.userId
 		});
 		if (response.code == 200 && response.data) {
-			orderlist.value = response.data;
+			orderlist.value = response.data.rows;
 		}
 	}