From 77b1ff244bbda413def25419f4640c80ee63952e Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 5 Jun 2025 21:48:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=AE=A0=E7=89=A9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=92=8C=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正宠物信息跳转链接使用错误的orderId字段
- 统一清洁要求相关字段命名(catLitter->litterBox, urinePad->peePad)
- 调整步骤条激活状态文字颜色为白色
- 移除未使用的steps-custom.scss引用
---
 otherPages/myOrdersManage/service/detail.vue  | 112 +++++++++++++-------------
 otherPages/orderTakingManage/detail/index.vue |   2 +-
 utils/getUrl.js                               |   4 +-
 3 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/otherPages/myOrdersManage/service/detail.vue b/otherPages/myOrdersManage/service/detail.vue
index 45c92c5..fd2f21e 100644
--- a/otherPages/myOrdersManage/service/detail.vue
+++ b/otherPages/myOrdersManage/service/detail.vue
@@ -5,11 +5,11 @@
 		<view style="margin: 32rpx 0;">
 			<up-steps :current="currentStep" activeColor="#FFA042" inactiveColor="#E5E5E5" class="up-steps-custom">
 				<up-steps-item title="喂养要求"
-					:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 0 ? '#FFA042' : '#999999'}"></up-steps-item>
+					:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 0 ? '#fff' : '#999999'}"></up-steps-item>
 				<up-steps-item title="清洁要求"
-					:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 1 ? '#FFA042' : '#999999'}"></up-steps-item>
+					:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 1 ? '#fff' : '#999999'}"></up-steps-item>
 				<up-steps-item title="附加服务"
-					:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 2 ? '#FFA042' : '#999999'}"></up-steps-item>
+					:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 2 ? '#fff' : '#999999'}"></up-steps-item>
 			</up-steps>
 		</view>
 
@@ -319,7 +319,8 @@
 		<view v-if="currentStep === 1">
 			<view class="top box-size" :style="{borderRadius:'16rpx'}">
 				<view class="form-title">
-					您需要的清洁内容				</view>
+					您需要的清洁内容
+				</view>
 				<!-- <view class="empty-state-full">
 					<up-icon name="info-circle" size="60rpx" color="#999999"></up-icon>
 					<text class="empty-text-full">暂无清洁内容</text>
@@ -332,10 +333,10 @@
 						猫砂摆放位置
 					</view>
 					<view class="img mt20">
-						<template v-if="handleImageUrl(detail.catLitterLocation).length > 0">
+						<template v-if="handleImageUrl(detail.litterBoxLocation).length > 0">
 							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
 								@click="previewImage(item)"
-								v-for="(item, index) in handleImageUrl(detail.catLitterLocation)"
+								v-for="(item, index) in handleImageUrl(detail.litterBoxLocation)"
 								:key="index"></u-image>
 						</template>
 						<view v-else class="empty-state">
@@ -347,12 +348,12 @@
 						<view :style="{color:'#999999'}">猫砂更换频率</view>
 						<view class="level">
 							<view class="input_ mr10">
-								<input type="text" disabled :value="detail.catLitterChangeFrequencyDays"
+								<input type="text" disabled :value="detail.litterBoxChangeFrequencyDays"
 									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
 							</view>
 							<view>天</view>
 							<view class="input_ mr10">
-								<input type="text" disabled :value="detail.catLitterChangeFrequencyTimes"
+								<input type="text" disabled :value="detail.litterBoxChangeFrequencyTimes"
 									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
 							</view>
 							<view>次</view>
@@ -362,7 +363,7 @@
 						备注信息
 					</view>
 					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-						<input type="text" :value="detail.catLitterRemarks || '无'" :style="{height:'50rpx',fontSize:'30rpx'}">
+						<input type="text" :value="detail.litterBoxRemarks || '无'" :style="{height:'50rpx',fontSize:'30rpx'}">
 					</view>
 				</view>
 				<view class="line" :style="{borderRadius:'1rpx'}"></view>
@@ -375,10 +376,10 @@
 						尿垫摆放位置
 					</view>
 					<view class="img mt20">
-						<template v-if="handleImageUrl(detail.urinePadLocation).length > 0">
+						<template v-if="handleImageUrl(detail.peePadLocation).length > 0">
 							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
 								@click="previewImage(item)"
-								v-for="(item, index) in handleImageUrl(detail.urinePadLocation)" :key="index"></u-image>
+								v-for="(item, index) in handleImageUrl(detail.peePadLocation)" :key="index"></u-image>
 						</template>
 						<view v-else class="empty-state">
 							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
@@ -388,23 +389,24 @@
 					<view class="size-30 mt24 flex-between">
 						<view :style="{color:'#999999'}">更换尿垫</view>
 						<view class="level">
-							<view class="input_ mr10">
-								<input type="text" :value="detail.urinePadChangeFrequency"
+							<!-- <view class="input_ mr10">
+								<input type="text" :value="detail.peePadLocation"
 									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
-							</view>
-							<view>是</view>
+							</view> -->
+							<view v-if="detail.changePeePad">是</view>
+							<view v-else>否</view>
 						</view>
 					</view>
 					<view class="size-30 mt24 flex-between">
 						<view :style="{color:'#999999'}">尿垫更换频率</view>
 						<view class="level">
 							<view class="input_ mr10">
-								<input type="text" :value="detail.urinePadChangeFrequencyDays"
+								<input type="text" :value="detail.peePadFrequencyDays"
 									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
 							</view>
 							<view>天</view>
 							<view class="input_ mr10">
-								<input type="text" :value="detail.urinePadChangeFrequencyTimes"
+								<input type="text" :value="detail.peePadFrequencyTimes"
 									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
 							</view>
 							<view>次</view>
@@ -414,7 +416,7 @@
 						备注信息
 					</view>
 					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-						<input type="text" disabled :value="detail.urinePadRemarks || '无'"
+						<input type="text" disabled :value="detail.peePadRemarks || '无'"
 							:style="{height:'50rpx',fontSize:'30rpx'}">
 					</view>
 				</view>
@@ -768,7 +770,7 @@
 
 <style scoped lang="scss">
 	@import"detail.scss";
-	@import"steps-custom.scss";
+	// @import"steps-custom.scss";
 
 	.empty-state {
 		display: flex;
@@ -806,40 +808,40 @@
 	}
 
 	/* 自定义步骤条样式 */
-	:deep(.up-steps-custom) {
-		.u-steps-item__wrapper {
-			width: 40rpx !important;
-			height: 40rpx !important;
-
-			&__circle {
-				width: 40rpx !important;
-				height: 40rpx !important;
-				background: #E5E5E5;
-
-				&__text {
-					font-size: 24rpx;
-				}
-			}
-		}
-
-		.u-steps-item__line {
-			top: 20rpx !important;
-			height: 4rpx !important;
-			background: #E5E5E5 !important;
-		}
-
-		/* 激活状态样式 */
-		.u-steps-item--active {
-			.u-steps-item__wrapper__circle {
-				background: linear-gradient(90deg, #FFA042, #FFD591) !important;
-			}
-		}
-
-		/* 已完成步骤前的线条样式 */
-		.u-steps-item--process {
-			.u-steps-item__line {
-				background: linear-gradient(90deg, #FFA042, #FFD591) !important;
-			}
-		}
-	}
+	// :deep(.up-steps-custom) {
+	// 	.u-steps-item__wrapper {
+	// 		width: 40rpx !important;
+	// 		height: 40rpx !important;
+
+	// 		&__circle {
+	// 			width: 40rpx !important;
+	// 			height: 40rpx !important;
+	// 			background: #E5E5E5;
+
+	// 			&__text {
+	// 				font-size: 24rpx;
+	// 			}
+	// 		}
+	// 	}
+
+	// 	.u-steps-item__line {
+	// 		top: 20rpx !important;
+	// 		height: 4rpx !important;
+	// 		background: #E5E5E5 !important;
+	// 	}
+
+	// 	/* 激活状态样式 */
+	// 	.u-steps-item--active {
+	// 		.u-steps-item__wrapper__circle {
+	// 			background: linear-gradient(90deg, #FFA042, #FFD591) !important;
+	// 		}
+	// 	}
+
+	// 	/* 已完成步骤前的线条样式 */
+	// 	.u-steps-item--process {
+	// 		.u-steps-item__line {
+	// 			background: linear-gradient(90deg, #FFA042, #FFD591) !important;
+	// 		}
+	// 	}
+	// }
 </style>
diff --git a/otherPages/orderTakingManage/detail/index.vue b/otherPages/orderTakingManage/detail/index.vue
index 269de40..7e38464 100644
--- a/otherPages/orderTakingManage/detail/index.vue
+++ b/otherPages/orderTakingManage/detail/index.vue
@@ -326,7 +326,7 @@
 	// 查看宠物信息
 	const petInfo = () => {
 		uni.navigateTo({
-			url: "/otherPages/orderTakingManage/pet/index?id=" + orderId.value
+			url: "/otherPages/orderTakingManage/pet/index?id=" + orderDetail.value.order.orderId
 		})
 	}
 
diff --git a/utils/getUrl.js b/utils/getUrl.js
index 1d1a292..ac138f6 100644
--- a/utils/getUrl.js
+++ b/utils/getUrl.js
@@ -3,10 +3,10 @@ const accountInfo = wx.getAccountInfoSync();
 // current = accountInfo.miniProgram.envVersion;
 
 const api = {
-	// develop:"http://127.0.0.1:8002",
+	develop:"http://127.0.0.1:8002",
 	// develop:"http://h5.xzaiyp.top",
 	// develop:"https://api.catmdogd.com/prod-api",
-	develop:"https://pet-admin.hhlm1688.com/api",
+	// develop:"https://pet-admin.hhlm1688.com/api",
 	// develop: "http://youyi-test.natapp1.cc/prod-api", // 开发
 	trial: "https://api.catmdogd.com/prod-api", //测试
 	release: "https://api.catmdogd.com/prod-api",