diff --git a/components/Modal/index.vue b/components/Modal/index.vue
index 6f838b1..ee39c31 100644
--- a/components/Modal/index.vue
+++ b/components/Modal/index.vue
@@ -75,4 +75,4 @@ defineExpose({
     background: #FFF4E6;
     color: #FFC269;
 }
-</style>    
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/pages/orderTakingManage/components/list.vue b/pages/orderTakingManage/components/list.vue
index 0326685..fc4b5d2 100644
--- a/pages/orderTakingManage/components/list.vue
+++ b/pages/orderTakingManage/components/list.vue
@@ -11,25 +11,25 @@
                     </view>
                 </view>
                 <view class="container-list">
-                    <view class="flex-between flex mb28">
-                        <up-image style="flex-shrink:0" class="mr20" width="70px" height="70px" src=""
+                    <view class="flex mb28" v-for="(pet, index) in item.h5OrderVO.petVOList">
+                        <up-image style="flex-shrink:0" class="mr20" width="70px" height="70px" :src="pet.photo"
                             shape="circle"></up-image>
                         <view>
-                            <!-- <view class="font28 col3">服务天数: 共2天 I {{itemService.serviceDate}}</view> -->
-                            <view class="font28 col3">服务天数: 共{{ item.h5OrderVO.orderServiceList.length }}天 I
+                            <view class="font28 col3">服务天数: 共{{ pet.orderServiceText.length }}天 I {{ pet.orderServiceText.join(',') }}</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> -->
 
                             <!-- <view style="margin: 18rpx 0">期望上门时间：{{itemService.expectServiceTime}}</view> -->
-                            <view>中华田园犬(小型犬) |
+                            <view>{{ pet.breed }} | {{ pet.productNameText.join(',') }}
 
-                                <text v-for="itemPet in item.h5OrderVO.orderItemList" :key="itemPet.id">
+                                <!-- <text v-for="itemPet in item.h5OrderVO.orderItemList" :key="itemPet.id">
                                     {{ itemPet.productName }}
-                                </text>
+                                </text> -->
 
                             </view>
 
diff --git a/pages/orderTakingManage/index.vue b/pages/orderTakingManage/index.vue
index 0099f8f..cc1aee8 100644
--- a/pages/orderTakingManage/index.vue
+++ b/pages/orderTakingManage/index.vue
@@ -37,6 +37,7 @@
 	import {
 		useStore
 	} from "vuex"
+import dayjs from "dayjs";
 
 	const current = ref(0)
 	const list = reactive([{
@@ -78,8 +79,42 @@
 		if (response.code == 200 && response.data) {
 			orderlist.value = response.data.rows;
 			
+			orderlist.value.forEach(item => {
+				item.h5OrderVO.petVOList.forEach(pet => {
+					pet.orderServiceText = getOrderServiceText(pet.id, item.h5OrderVO.orderServiceList)
+					pet.productNameText = getProductNameText(pet.id, item.h5OrderVO.orderItemList, item.h5OrderVO.orderServiceList)
+				})
+			})
 		}
 	}
+	
+	function getOrderServiceText(petId, orderServiceList){
+		
+		let YYYY = undefined
+		
+		return orderServiceList
+		.filter(service => service.petId == petId)//过滤
+		.map(service => dayjs(service.serviceDate))//转成时间
+		.sort((a, b) => a.valueOf() - b.valueOf())//排序
+		.map((service, i) => {
+			if(YYYY && YYYY.format('YYYY-MM') == service.format('YYYY-MM')){
+				return service.format('DD')
+			}
+			if(YYYY && YYYY.format('YYYY') == service.format('YYYY')){
+				return service.format('MM-DD')
+			}
+			YYYY = service
+			return service.format('YYYY-MM-DD')
+		})
+	}
+	function getProductNameText(petId, productList, orderServiceList){
+		
+		let orderService = orderServiceList.filter(service => service.petId == petId)
+		
+		return productList
+		.filter(product => orderService.filter(service => service.id == product.orderServiceId).length > 0)
+		.map(product => product.productName)
+	}
 
 	const clickEvent = (item) => {
 		current.value = item.index;
diff --git a/utils/getUrl.js b/utils/getUrl.js
index 372b884..ad45444 100644
--- a/utils/getUrl.js
+++ b/utils/getUrl.js
@@ -1,9 +1,10 @@
 let current = "release";
 const accountInfo = wx.getAccountInfoSync();
-// current = accountInfo.miniProgram.envVersion;
+current = accountInfo.miniProgram.envVersion;
 
 const api = {
-	develop: "http://youyi-test.natapp1.cc/prod-api", // 开发
+	develop:"http://h5.xzaiyp.top/prod-api",
+	// develop: "http://youyi-test.natapp1.cc/prod-api", // 开发
 	trial: "https://pet-admin.hhlm1688.com/prod-api", //测试
 	release: "http://h5.xzaiyp.top/prod-api", // 线上
 }