From bd164f41065df6f529ffed4a0675c4c180398cbe Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 12 May 2025 10:43:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0API=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E5=92=8C=E8=B0=83=E6=95=B4UI=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将开发环境API地址更改为http://h5.xzaiyp.top
- 调整companionPetList页面的卡片间距和内边距
- 在serviceNew页面添加下单方式的子标题和样式优化
---
 pages/companionPetList/companionPetList.vue |  4 +--
 pages/newOrder/serviceNew.vue               | 43 ++++++++++++++++++++++++-----
 utils/getUrl.js                             |  3 +-
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/pages/companionPetList/companionPetList.vue b/pages/companionPetList/companionPetList.vue
index 2aff41c..d9122ad 100644
--- a/pages/companionPetList/companionPetList.vue
+++ b/pages/companionPetList/companionPetList.vue
@@ -92,9 +92,9 @@
 				</checkbox-group> -->
 			</view>
 			<view>
-				<view v-if="companionList.length > 0">
+				<view v-if="companionList.length > 0" style="padding: 10rpx 0;">
 					<uni-row :span="12" v-for="(item,index) in companionList" :key="index">
-						<uni-card :is-shadow="false" padding=0 margin="10px"
+						<uni-card :is-shadow="false" padding=0 margin="6rpx 20rpx"
                         @click="getInfo(item.userId)">
 							<view class="personal-list-item">
 								<view class="personal-info">
diff --git a/pages/newOrder/serviceNew.vue b/pages/newOrder/serviceNew.vue
index 88f0add..7e4616d 100644
--- a/pages/newOrder/serviceNew.vue
+++ b/pages/newOrder/serviceNew.vue
@@ -30,13 +30,16 @@
 		</view>
 
         <view class="order-type-select" v-if="buyInfo.teacher">
-
-            <view class="order-type-title">
-                <image style="width: 40rpx; height: 40rpx;margin-right: 10rpx;" slot='cover' src="https://catmdogf.oss-cn-shanghai.aliyuncs.com/CMDF/front/petServiceOrder/OrderIcon.png">
-                </image>
-
-                <!-- <image style="width: 32rpx; height: 32rpx; margin-right: 10rpx;" src="https://catmdogf.oss-cn-shanghai.aliyuncs.com/CMDF/front/petServiceOrder/SystemOrderCircle.png"></image> -->
-                下单方式：指定喂养员 - <text style="color: #999;font-size: 26rpx;">{{buyInfo.teacher.userName}}</text>
+            <view class="order-type-title order-type-title-custom">
+                <image style="width: 40rpx; height: 40rpx; margin-right: 10rpx;" src="https://catmdogf.oss-cn-shanghai.aliyuncs.com/CMDF/front/petServiceOrder/OrderIcon.png"></image>
+                <view class="order-type-title-main">
+                    <view class="main-title">
+                        下单方式：指定喂养员 - {{buyInfo.teacher.userName}}
+                    </view>
+                    <view class="sub-title">
+                        （若伴宠师1小时内无响应或拒绝单则系统派单）
+                    </view>
+                </view>
             </view>
         </view>
 		
@@ -589,4 +592,30 @@
 			}
 		}
 	}
+	.order-type-title-custom {
+		background-color: #FFF9F0;
+		display: flex;
+		align-items: flex-start;
+		font-size: 28rpx;
+		color: #333;
+		margin-bottom: 20rpx;
+		padding: 20rpx;
+		border-radius: 20rpx;
+	}
+	.order-type-title-main {
+		display: flex;
+		flex-direction: column;
+	}
+	.main-title {
+		font-size: 28rpx;
+		font-weight: bold;
+		line-height: 1.2;
+		color: #D97B2B;
+	}
+	.sub-title {
+		font-size: 24rpx;
+		color: #D97B2B;
+		margin-top: 6rpx;
+		line-height: 1.2;
+	}
 </style>
\ No newline at end of file
diff --git a/utils/getUrl.js b/utils/getUrl.js
index 1a92ac1..d17ac11 100644
--- a/utils/getUrl.js
+++ b/utils/getUrl.js
@@ -5,7 +5,8 @@ current = accountInfo.miniProgram.envVersion;
 
 
 const api={
-	develop:"https://api.catmdogd.com/prod-api",
+	develop:"http://h5.xzaiyp.top",
+	// develop:"https://api.catmdogd.com/prod-api",
 	// develop:"https://api-test.catmdogd.com/test-api",
 	trial:"https://pet-admin.hhlm1688.com/api",
 	release:"https://api.catmdogd.com/prod-api",