From cdc7f5102235b3402ad7fec1fefdae1ed8d9e71c Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 17 Apr 2025 20:19:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=92=8C=E5=8A=9F=E8=83=BD=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复 `dForm/index.vue` 中的样式作用域问题
- 在 `userManage/index.vue` 中添加 `userId` 参数以获取宠物列表
- 更新 `getUrl.js` 中的线上环境 API 地址
- 在 `uni.scss` 中添加新的按钮样式
- 修改 `timelineService.vue` 中的服务显示格式
- 优化 `serviceTime.js` 中的产品名称去重逻辑
- 删除 `myOrdersManage/service` 目录下的无用 CSS 文件
- 调整 `clock/index.vue` 中的字体大小
- 在 `orderTakingManage/detail/index.vue` 中添加跳转到我的订单功能
- 修复 `list.vue` 中的伴宠师认证检查逻辑
- 删除 `orderTakingManage/detail` 目录下的无用 CSS 文件
- 重构 `authentication/serve/index.vue` 中的表单逻辑和样式
---
 components/dForm/index.vue                         |    2 +-
 otherPages/authentication/serve/index - 副本.vue |  393 +++++++
 otherPages/authentication/serve/index.vue          |  136 ++-
 otherPages/myOrdersManage/clock/index.vue          |   10 +-
 otherPages/myOrdersManage/service/detail.vue       | 1185 +++++++++++---------
 otherPages/myOrdersManage/service/steps-custom.css |   35 -
 .../myOrdersManage/service/steps-custom.min.css    |    1 -
 otherPages/orderTakingManage/detail/index.css      |  252 -----
 otherPages/orderTakingManage/detail/index.min.css  |    1 -
 otherPages/orderTakingManage/detail/index.vue      |   37 +-
 .../myOrdersManage/components/timelineService.vue  |    2 +-
 pages/orderTakingManage/components/list.vue        |   29 +-
 pages/userManage/index.vue                         |    4 +-
 uni.scss                                           |   12 +-
 utils/getUrl.js                                    |    2 +-
 utils/serviceTime.js                               |    8 +-
 16 files changed, 1204 insertions(+), 905 deletions(-)
 create mode 100644 otherPages/authentication/serve/index - 副本.vue
 delete mode 100644 otherPages/myOrdersManage/service/steps-custom.css
 delete mode 100644 otherPages/myOrdersManage/service/steps-custom.min.css
 delete mode 100644 otherPages/orderTakingManage/detail/index.css
 delete mode 100644 otherPages/orderTakingManage/detail/index.min.css

diff --git a/components/dForm/index.vue b/components/dForm/index.vue
index f931e9b..3d63b90 100644
--- a/components/dForm/index.vue
+++ b/components/dForm/index.vue
@@ -159,7 +159,7 @@
 	defineExpose({ setDataByKey, setData, getData, validate })
 </script>
 
-<style>
+<style scoped>
 	.form-item {
 		min-height: 90rpx;
 		padding-top: 10rpx;
diff --git a/otherPages/authentication/serve/index - 副本.vue b/otherPages/authentication/serve/index - 副本.vue
new file mode 100644
index 0000000..9beb759
--- /dev/null
+++ b/otherPages/authentication/serve/index - 副本.vue	
@@ -0,0 +1,393 @@
+<template>
+	<view class="page bg-fff">
+		<view class="size-22 color-ffb flex-rowl tip">
+			<image class="icon" :src="configList.my_information_statement.paramValueImage"></image>
+			<view>
+				<up-parse :content="configList.my_information_statement.paramValueArea" containerStyle="{
+          color: '#FFBF60',
+          fontSize: '22rpx',
+          lineHeight: '40rpx',
+        }"></up-parse>
+			</view>
+		</view>
+		<view class="info">
+			<view class="title mt24">
+				基本资料
+			</view>
+			<view class="flex-colc">
+				<button class="btn-avatar" :plain="true" :hairline="false" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+					<view class="flex-colc">
+						<image class="head" :src="baseInfo.info.userImage" mode="widthFix"></image>
+						<!-- <image class="head" :src="form.headImage" mode="widthFix"></image> -->
+						<text class="size-28 color-999 mt10">点击更换头像</text>
+					</view>
+				</button>
+			</view>
+			<view class="form">
+				<!-- @input="fetchUpdate" -->
+				<DForm ref="baseInfoRef" :list="state.baseInfoList" v-model="baseInfo.info"></DForm>
+			</view>
+		</view>
+
+		<view class="info">
+			<view class="title mt24 flex-rowl">
+				展示信息
+				<text class="size-22 color-ffb fw700">(重要)</text>
+			</view>
+			<view class="form">
+				<DForm ref="displayInfoRef" :list="state.displayInfoList" @input="fetchUpdate">
+					<!-- 服务记录 -->
+					<template v-slot:jilu>
+						<view class="flex-rowr" @click="jumpToServeRecord">
+							<text>{{ `${serviceCount}条` }}</text>
+							<up-icon name="arrow-right" color="#999999" size="32rpx"></up-icon>
+						</view>
+					</template>
+				</DForm>
+			</view>
+		</view>
+
+		<view class="info">
+			<view class="title mt24 flex-rowl">
+				服务资料
+			</view>
+			<view class="form">
+				<DForm ref="serveInfoRef" :list="state.serveInfoList" @input="fetchUpdate">
+					<!-- 服务宠物类型 -->
+					<template v-slot:type>
+						<view class="flex-rowr" @click="openTypeSelectPopup">
+							<text>{{ typeDesc }}</text>
+							<up-icon name="arrow-right" color="#999999" size="32rpx"></up-icon>
+						</view>
+					</template>
+					<!-- 增值服务 -->
+					<template v-slot:zenz>
+						<view class="flex-rowr" @click="openServeSelectPopup">
+							<text>{{ serveDesc }}</text>
+							<up-icon name="arrow-right" color="#999999" size="32rpx"></up-icon>
+						</view>
+					</template>
+				</DForm>
+			</view>
+		</view>
+
+		<view class="size-24 color-ffb flex-rowc mt32 pb28">
+			伴宠师查看服务酬劳、服务时长等规则
+		</view>
+
+		<popupTypeSelect ref="popupTypeSelectRef" v-model="form.type" @confirm="fetchUpdate" ></popupTypeSelect>
+
+		<popupServeSelect ref="popupServeSelectRef" v-model="form.serve" @confirm="fetchUpdate" ></popupServeSelect>
+
+		<view class="uni-btn-color"
+		@click="submit">
+			保存
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref, reactive, computed, onMounted, nextTick } from "vue";
+	import { useStore } from 'vuex'
+	import { onShow } from '@dcloudio/uni-app'
+	import { ossUpload } from '@/utils/oss-upload/oss/index.js'
+
+	import DForm from "@/components/dForm/index.vue"
+	import popupTypeSelect from "./popupTypeSelect.vue";
+	import popupServeSelect from "./popupServeSelect.vue";
+	import { serviceLogList } from '@/api/serviceLog'
+	import {
+		binBaseInfo,
+	} from "@/api/home.js"
+
+	const store = useStore()
+
+	const configList = computed(() => {
+		return store.getters.configList
+	})
+	const userInfo = computed(() => {
+		return store.getters.userInfo
+	})
+	
+	const baseInfo = ref(JSON.parse(uni.getStorageSync("baseInfo")))
+	
+	const serviceCount = ref(0)
+
+	const fetchUpdate = (data) => {
+		// todo
+		console.log(data);
+	}
+
+	const form = reactive({
+		headImage: null,
+		type: [],
+		serve: [],
+	})
+
+	const onChooseAvatar = (res) => {
+		ossUpload(res.target.avatarUrl)
+		.then(url => {
+			form.headImage = url
+
+			fetchUpdate()
+		})
+	}
+
+	const baseInfoRef = ref(null)
+	const displayInfoRef = ref(null)
+	const serveInfoRef = ref(null)
+
+	const state = reactive({
+		baseInfoList: [{
+				type: "input",
+				label: "昵称",
+				key: "userName",
+				placeholder: "请输入",
+			},
+			{
+				type: "input",
+				label: "手机号",
+				key: "userTelephone",
+				placeholder: "请输入",
+			},
+			{
+				type: "select",
+				label: "性别",
+				key: "sex",
+				placeholder: "请选择",
+				options: [
+					{
+						name: "男",
+						value : '男',
+					},
+					{
+						name: "女",
+						value : '男',
+					}
+				]
+			}
+		],
+		displayInfoList: [{
+				type: "input",
+				label: "个人简介",
+				key: "jianjie",
+				placeholder: "请输入",
+			},
+			{
+				type: "input",
+				label: "养宠经验",
+				unit: "年",
+				key: "jingyan",
+				placeholder: "请输入",
+			},
+			{
+				type: "custom",
+				label: "服务记录",
+				key: "jilu",
+				placeholder: "请选择",
+				options: [{
+						name: "男"
+					},
+					{
+						name: "女"
+					}
+				]
+			}
+		],
+		serveInfoList: [{
+				type: "custom",
+				label: "服务宠物类型",
+				key: "type",
+				placeholder: "请选择",
+			},
+			{
+				type: "input",
+				label: "基础服务",
+				key: "base",
+				placeholder: "宠物喂养上门遛狗",
+			},
+			{
+				type: "custom",
+				label: "增值服务",
+				key: "zenz",
+				placeholder: "请选择",
+			}
+		],
+	})
+
+	const jumpToServeRecord = () => {
+		uni.navigateTo({
+			url: "/otherPages/authentication/serve/record"
+		})
+	}
+
+	const popupTypeSelectRef = ref()
+	const openTypeSelectPopup = () => {
+		popupTypeSelectRef.value.open()
+	}
+	const petTypeOptions = computed(() => {
+		return store.getters.petTypeOptions
+	})
+	const typeDesc = computed(() => {
+		const typeIds = form.type
+		if (!typeIds.length) {
+			return '请选择'
+		}
+		
+		let descArr = typeIds.map(typeId => {
+			return petTypeOptions.value.find(item => item.id === typeId).title
+		})
+
+		return descArr.join('、')
+	})
+
+	const popupServeSelectRef = ref()
+	const increaseServiceOptions = computed(() => {
+		return store.getters.increaseServiceOptions
+	})
+	const openServeSelectPopup = () => {
+		popupServeSelectRef.value.open()
+	}
+	const serveDesc = computed(() => {
+		const serveIds = form.serve
+		if (!serveIds.length) {
+			return '请选择'
+		}
+		
+		let descArr = serveIds.map(serveId => {
+			return increaseServiceOptions.value.find(option => option.id === serveId)?.title
+		})
+
+		return descArr.join('、')
+	})
+	
+	function getCountSerivce(){
+		serviceLogList({ userId: userInfo.value.userId })
+		.then(res => {
+			serviceCount.value = res.length
+		})
+	}
+	const getBaseInfo = () => {
+		binBaseInfo(baseInfo.value.userId).then(res => {
+			baseInfo.value = res.data
+			uni.setStorageSync(JSON.stringify(res.data))
+			
+			// baseInfoRef.value.setData(res.data.info)
+			
+			
+		})
+	}
+	
+	function submit(){
+	}
+
+	onShow(() => {
+		getCountSerivce()
+		getBaseInfo()
+		store.dispatch('fetchPetTypeOptions')
+		store.dispatch('fetchIncreaseServiceOptions')
+	})
+
+	onMounted(()=> {
+		// todo: fetch data and init data
+		
+		serveInfoRef.value.setDataByKey('base', configList.value.pet_basic_services.paramValueText)
+	})
+
+</script>
+
+<style lang="scss" scoped>
+	
+	.form{
+		.form-item {
+			min-height: 90rpx;
+			padding-top: 10rpx;
+			width: 100%;
+			border-bottom: 1rpx solid #f5f5f5;
+		}
+
+		.flex-rowr {
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+		}
+
+		.ml10 {
+			margin-left: 10rpx;
+		}
+	}
+
+	.page {
+		padding-top: 16rpx;
+		padding-bottom: 150rpx;
+
+		.tip {
+			background-color: rgba($color: #FFBF60, $alpha: 0.16);
+			padding: 13rpx 22rpx;
+			margin: 0 28rpx 37rpx 28rpx;
+
+			.icon {
+				width: 36rpx;
+				height: 36rpx;
+				margin-right: 15rpx;
+			}
+		}
+	}
+
+	.info {
+
+		& + & {
+			margin-top: 50rpx;
+		}
+
+	}
+	
+	.head {
+		width: 165rpx;
+    height: auto;	
+		margin-top: 28rpx;
+	}
+
+	.btn-avatar {
+		border: none;
+		padding: 0;
+	}
+
+	.title {
+		font-size: 30rpx;
+		font-weight: 700;
+		display: flex;
+		align-items: center;
+		padding: 0 40rpx;
+
+		&:before {
+			display: inline-block;
+			content: "";
+			width: 10rpx;
+			border-radius: 5rpx;
+			height: 33rpx;
+			background-color: #FFBF60;
+			margin-right: 7rpx;
+		}
+	}
+
+	.form {
+		padding: 0 22rpx;
+
+		:deep(.form-item){
+			padding-left: 24rpx;
+			padding-right: 30rpx;
+			box-sizing: border-box;
+		}
+	}
+	
+	.uni-btn-color{
+		border-radius: 40rpx;
+		padding: 20rpx;
+		margin: 40rpx;
+		background: #FFBF60;
+		color: #fff;
+		text-align: center;
+		font-size: 28rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/otherPages/authentication/serve/index.vue b/otherPages/authentication/serve/index.vue
index 043a4d3..1b69a5a 100644
--- a/otherPages/authentication/serve/index.vue
+++ b/otherPages/authentication/serve/index.vue
@@ -17,13 +17,14 @@
 			<view class="flex-colc">
 				<button class="btn-avatar" :plain="true" :hairline="false" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
 					<view class="flex-colc">
-						<image class="head" :src="form.headImage" mode="widthFix"></image>
+						<image class="head" :src="baseInfo.info.userImage" mode="widthFix"></image>
+						<!-- <image class="head" :src="form.headImage" mode="widthFix"></image> -->
 						<text class="size-28 color-999 mt10">点击更换头像</text>
 					</view>
 				</button>
 			</view>
 			<view class="form">
-				<DForm ref="baseInfoRef" :list="state.baseInfoList" @input="fetchUpdate"></DForm>
+				
 			</view>
 		</view>
 
@@ -33,15 +34,6 @@
 				<text class="size-22 color-ffb fw700">(重要)</text>
 			</view>
 			<view class="form">
-				<DForm ref="displayInfoRef" :list="state.displayInfoList" @input="fetchUpdate">
-					<!-- 服务记录 -->
-					<template v-slot:jilu>
-						<view class="flex-rowr" @click="jumpToServeRecord">
-							<text>{{ `${0}条` }}</text>
-							<up-icon name="arrow-right" color="#999999" size="32rpx"></up-icon>
-						</view>
-					</template>
-				</DForm>
 			</view>
 		</view>
 
@@ -50,22 +42,6 @@
 				服务资料
 			</view>
 			<view class="form">
-				<DForm ref="serveInfoRef" :list="state.serveInfoList" @input="fetchUpdate">
-					<!-- 服务宠物类型 -->
-					<template v-slot:type>
-						<view class="flex-rowr" @click="openTypeSelectPopup">
-							<text>{{ typeDesc }}</text>
-							<up-icon name="arrow-right" color="#999999" size="32rpx"></up-icon>
-						</view>
-					</template>
-					<!-- 增值服务 -->
-					<template v-slot:zenz>
-						<view class="flex-rowr" @click="openServeSelectPopup">
-							<text>{{ serveDesc }}</text>
-							<up-icon name="arrow-right" color="#999999" size="32rpx"></up-icon>
-						</view>
-					</template>
-				</DForm>
 			</view>
 		</view>
 
@@ -77,35 +53,38 @@
 
 		<popupServeSelect ref="popupServeSelectRef" v-model="form.serve" @confirm="fetchUpdate" ></popupServeSelect>
 
+		<view class="uni-btn-color"
+		@click="submit">
+			保存
+		</view>
 	</view>
 </template>
 
 <script setup>
-	import { ref, reactive, computed, onMounted } from "vue";
+	import { ref, reactive, computed, onMounted, nextTick } from "vue";
 	import { useStore } from 'vuex'
 	import { onShow } from '@dcloudio/uni-app'
 	import { ossUpload } from '@/utils/oss-upload/oss/index.js'
 
-	import DForm from "@/components/dForm/index.vue"
 	import popupTypeSelect from "./popupTypeSelect.vue";
 	import popupServeSelect from "./popupServeSelect.vue";
+	import { serviceLogList } from '@/api/serviceLog'
+	import {
+		binBaseInfo,
+	} from "@/api/home.js"
 
 	const store = useStore()
 
 	const configList = computed(() => {
 		return store.getters.configList
 	})
-
-	const fetchUpdate = (data) => {
-		// todo
-		console.log(data);
-		
-		for(let key in data){
-			state.baseInfoList[key] = data[key]
-		}
-		
-		console.log(state.baseInfoList);
-	}
+	const userInfo = computed(() => {
+		return store.getters.userInfo
+	})
+	
+	const baseInfo = ref(JSON.parse(uni.getStorageSync("baseInfo")))
+	
+	const serviceCount = ref(0)
 
 	const form = reactive({
 		headImage: null,
@@ -122,21 +101,21 @@
 		})
 	}
 
-	const baseInfoRef = ref()
-	const displayInfoRef = ref()
-	const serveInfoRef = ref()
+	const baseInfoRef = ref(null)
+	const displayInfoRef = ref(null)
+	const serveInfoRef = ref(null)
 
 	const state = reactive({
 		baseInfoList: [{
 				type: "input",
 				label: "昵称",
-				key: "name",
+				key: "userName",
 				placeholder: "请输入",
 			},
 			{
 				type: "input",
 				label: "手机号",
-				key: "idCard",
+				key: "userTelephone",
 				placeholder: "请输入",
 			},
 			{
@@ -144,11 +123,14 @@
 				label: "性别",
 				key: "sex",
 				placeholder: "请选择",
-				options: [{
-						name: "男"
+				options: [
+					{
+						name: "男",
+						value : '男',
 					},
 					{
-						name: "女"
+						name: "女",
+						value : '男',
 					}
 				]
 			}
@@ -246,24 +228,66 @@
 
 		return descArr.join('、')
 	})
+	
+	function getCountSerivce(){
+		serviceLogList({ userId: userInfo.value.userId })
+		.then(res => {
+			serviceCount.value = res.length
+		})
+	}
+	const getBaseInfo = () => {
+		binBaseInfo(baseInfo.value.userId).then(res => {
+			baseInfo.value = res.data
+			uni.setStorageSync(JSON.stringify(res.data))
+			
+			// baseInfoRef.value.setData(res.data.info)
+			
+			
+		})
+	}
+	
+	function submit(){
+	}
 
 	onShow(() => {
-    store.dispatch('fetchPetTypeOptions')
-    store.dispatch('fetchIncreaseServiceOptions')
+		getCountSerivce()
+		getBaseInfo()
+		store.dispatch('fetchPetTypeOptions')
+		store.dispatch('fetchIncreaseServiceOptions')
 	})
 
 	onMounted(()=> {
 		// todo: fetch data and init data
-
+		
 		serveInfoRef.value.setDataByKey('base', configList.value.pet_basic_services.paramValueText)
 	})
 
 </script>
 
 <style lang="scss" scoped>
+	
+	.form{
+		.form-item {
+			min-height: 90rpx;
+			padding-top: 10rpx;
+			width: 100%;
+			border-bottom: 1rpx solid #f5f5f5;
+		}
+
+		.flex-rowr {
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+		}
+
+		.ml10 {
+			margin-left: 10rpx;
+		}
+	}
 
 	.page {
 		padding-top: 16rpx;
+		padding-bottom: 150rpx;
 
 		.tip {
 			background-color: rgba($color: #FFBF60, $alpha: 0.16);
@@ -324,4 +348,14 @@
 			box-sizing: border-box;
 		}
 	}
+	
+	.uni-btn-color{
+		border-radius: 40rpx;
+		padding: 20rpx;
+		margin: 40rpx;
+		background: #FFBF60;
+		color: #fff;
+		text-align: center;
+		font-size: 28rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/otherPages/myOrdersManage/clock/index.vue b/otherPages/myOrdersManage/clock/index.vue
index 0bea85f..0b0706f 100644
--- a/otherPages/myOrdersManage/clock/index.vue
+++ b/otherPages/myOrdersManage/clock/index.vue
@@ -7,7 +7,7 @@
 			</view>
 			<view class="mt32 ml10">
 				<span :style="{fontSize:'30rpx',fontWeight:'400'}">手套照片</span>
-				<span :style="{fontSize:'22rpx',color:'#C7C7C7'}">(至少1张)</span>
+				<span :style="{fontSize:'26rpx',color:'#C7C7C7'}">(至少1张)</span>
 			</view>
 			<view class="level">
 				<view class="mt20 ml10">
@@ -25,7 +25,7 @@
 			</view>
 			<view class="mt32 ml10">
 				<span :style="{fontSize:'30rpx',fontWeight:'400'}">鞋套照片</span>
-				<span :style="{fontSize:'22rpx',color:'#C7C7C7'}">(至少1张)</span>
+				<span :style="{fontSize:'26rpx',color:'#C7C7C7'}">(至少1张)</span>
 			</view>
 			<view class="level">
 				<view class="mt20 ml10">
@@ -46,7 +46,7 @@
 			<view v-for="(pet, index) in petList" :key="index">
 				<view class="mt32 ml10">
 					<span :style="{fontSize:'30rpx',fontWeight:'400'}">{{ pet.title }}照片</span>
-					<span :style="{fontSize:'22rpx',color:'#C7C7C7'}">(至少2张)</span>
+					<span :style="{fontSize:'26rpx',color:'#C7C7C7'}">(至少2张)</span>
 				</view>
 				<view class="level">
 					<view class="mt20 ml10 mr20">
@@ -142,7 +142,7 @@
 			</view>
 			<view class="mt32 ml10">
 				<span :style="{fontSize:'30rpx',fontWeight:'400'}">遛狗</span>
-				<span :style="{fontSize:'22rpx',color:'#C7C7C7'}">(2-3张)</span>
+				<span :style="{fontSize:'26rpx',color:'#C7C7C7'}">(2-3张)</span>
 			</view>
 			<view class="level">
 				<view class="mt20 ml10 mr20">
@@ -157,7 +157,7 @@
 			</view>
 			<view class="mt32 ml10">
 				<span :style="{fontSize:'30rpx',fontWeight:'400'}">陪玩</span>
-				<span :style="{fontSize:'22rpx',color:'#C7C7C7'}">(2-3张)</span>
+				<span :style="{fontSize:'26rpx',color:'#C7C7C7'}">(2-3张)</span>
 			</view>
 			<view class="level">
 				<view class="mt20 ml10 mr20">
diff --git a/otherPages/myOrdersManage/service/detail.vue b/otherPages/myOrdersManage/service/detail.vue
index 7d7fabb..45c92c5 100644
--- a/otherPages/myOrdersManage/service/detail.vue
+++ b/otherPages/myOrdersManage/service/detail.vue
@@ -1,16 +1,19 @@
 <template>
 	<!-- <div>服务档案</div> -->
 	<view class="box box-size">
-		
-        <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>
-                <up-steps-item title="清洁要求" :titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 1 ? '#FFA042' : '#999999'}"></up-steps-item>
-                <up-steps-item title="附加服务" :titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 2 ? '#FFA042' : '#999999'}"></up-steps-item>
-            </up-steps>
-        </view>
-
-        <!-- v-if="detail.includeDryFood 
+
+		<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>
+				<up-steps-item title="清洁要求"
+					:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 1 ? '#FFA042' : '#999999'}"></up-steps-item>
+				<up-steps-item title="附加服务"
+					:titleStyle="{fontSize: '32rpx', fontWeight: 'bold', color: currentStep === 2 ? '#FFA042' : '#999999'}"></up-steps-item>
+			</up-steps>
+		</view>
+
+		<!-- v-if="detail.includeDryFood 
         || detail.includeWetFood
         || detail.includeHomemadeFood
         || detail.includeRawMeat
@@ -18,583 +21,671 @@
         || detail.includeSnacks
         " -->
 
-        <!-- 喂养要求内容 -->
-        <view v-if="currentStep === 0">
-		<view class="top box-size" :style="{borderRadius:'16rpx'}">
-			<view class="form-title">
-				本次喂养过程中，您需要喂养的食品包括
-			</view>
-			<view class="empty-state-full">
-				<up-icon name="info-circle" size="60rpx" color="#999999"></up-icon>
-				<text class="empty-text-full">暂无喂养食品</text>
-			</view>
-			<view class=" mt32 ml10">
-				<view class="color-A55 size-30 fw400">
-					干粮(主粮、冻干等)
-				</view>
-				<view class="size-30 mt32 fw400">
-					干粮摆放位置
-				</view>
-				<view class="img mt20">
-					<template v-if="handleImageUrl(detail.dryFoodLocation).length > 0">
-						<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.dryFoodLocation)" :key="index"></u-image>
-					</template>
-					<view v-else class="empty-state">
-						<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
-						<text class="empty-text">暂无图片</text>
+		<!-- 喂养要求内容 -->
+		<view v-if="currentStep === 0">
+			<view class="top box-size" :style="{borderRadius:'16rpx'}">
+				<view class="form-title">
+					本次喂养过程中，您需要喂养的食品包括
+				</view>
+				<view class=" mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						干粮(主粮、冻干等)
 					</view>
-				</view>
-				<view class="size-30 mt24 flex-between">
-					<view :style="{color:'#999999'}">干粮喂养重量</view>
-					<view class="level">
-						<view class="input_ mr10">
-							<input type="text" v-model="detail.dryFoodFeedWeight" :style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+					<view class="size-30 mt32 fw400">
+						干粮摆放位置
+					</view>
+					<view class="img mt20">
+						<template v-if="handleImageUrl(detail.dryFoodLocation).length > 0">
+							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+								@click="previewImage(item)"
+								v-for="(item, index) in handleImageUrl(detail.dryFoodLocation)" :key="index"></u-image>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
 						</view>
-						<view>/次(单位:克)</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" v-model="detail.dryFoodFeedFrequencyDays" :style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+					<view class="size-30 mt24 flex-between">
+						<view :style="{color:'#999999'}">干粮喂养重量</view>
+						<view class="level">
+							<view class="input_ mr10">
+								<input type="text" :value="detail.dryFoodFeedWeight"
+									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+							</view>
+							<view>/次(单位:克)</view>
 						</view>
-						<view>天</view>
-						<view class="input_ mr10">
-							<input type="text" v-model="detail.dryFoodFeedFrequencyTimes" :style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+					</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.dryFoodFeedFrequencyDays"
+									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+							</view>
+							<view>天</view>
+							<view class="input_ mr10">
+								<input type="text" :value="detail.dryFoodFeedFrequencyTimes"
+									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+							</view>
+							<view>次</view>
 						</view>
-						<view>次</view>
 					</view>
-				</view>
-				<view class="size-30 mt24" :style="{color:'#999999'}">
-					备注信息
-				</view>
-				<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-					<input type="text" disabled :value="detail.dryFoodRemarks || '无'" :style="{height:'50rpx',fontSize:'30rpx'}">
-				</view>
-			</view>
-			<view class="line" :style="{borderRadius:'1rpx'}"></view>
-			<view class=" mt32 ml10">
-				<view class="color-A55 size-30 fw400">
-					湿粮(罐头等)
-				</view>
-				<view class="size-30 mt32 fw400">
-					湿粮摆放位置
-				</view>
-				<view class="img mt20">
-					<template v-if="handleImageUrl(detail.wetFoodLocation).length > 0">
-						<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.wetFoodLocation)" :key="index"></u-image>
-					</template>
-					<view v-else class="empty-state">
-						<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
-						<text class="empty-text">暂无图片</text>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						备注信息
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" disabled :value="detail.dryFoodRemarks || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
 					</view>
 				</view>
-				<view class="size-30 mt24 flex-between">
-					<view :style="{color:'#999999'}">湿粮喂养重量</view>
-					<view class="level">
-						<view class="input_ mr10">
-							<input type="text" disabled v-model="detail.wetFoodFeedWeight" :style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+				<view class="line" :style="{borderRadius:'1rpx'}"></view>
+				<view class=" mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						湿粮(罐头等)
+					</view>
+					<view class="size-30 mt32 fw400">
+						湿粮摆放位置
+					</view>
+					<view class="img mt20">
+						<template v-if="handleImageUrl(detail.wetFoodLocation).length > 0">
+							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+								@click="previewImage(item)"
+								v-for="(item, index) in handleImageUrl(detail.wetFoodLocation)" :key="index"></u-image>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
 						</view>
-						<view>/次(单位:罐)</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" disabled v-model="detail.wetFoodFeedFrequencyDays" :style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+					<view class="size-30 mt24 flex-between">
+						<view :style="{color:'#999999'}">湿粮喂养重量</view>
+						<view class="level">
+							<view class="input_ mr10">
+								<input type="text" disabled :value="detail.wetFoodFeedWeight"
+									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+							</view>
+							<view>/次(单位:罐)</view>
 						</view>
-						<view>天</view>
-						<view class="input_ mr10">
-							<input type="text" disabled v-model="detail.wetFoodFeedFrequencyTimes" :style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+					</view>
+					<view class="size-30 mt24 flex-between">
+						<view :style="{color:'#999999'}">湿粮喂养频率</view>
+						<view class="level">
+							<view class="input_ mr10">
+								<input type="text" disabled :value="detail.wetFoodFeedFrequencyDays"
+									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+							</view>
+							<view>天</view>
+							<view class="input_ mr10">
+								<input type="text" disabled :value="detail.wetFoodFeedFrequencyTimes"
+									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+							</view>
+							<view>次</view>
 						</view>
-						<view>次</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						备注信息
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" :value="detail.wetFoodRemarks || '无'" :style="{height:'50rpx',fontSize:'30rpx'}">
 					</view>
 				</view>
-				<view class="size-30 mt24" :style="{color:'#999999'}">
-					备注信息
-				</view>
-				<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-					<input type="text" v-model="detail.wetFoodRemarks" :style="{height:'50rpx',fontSize:'30rpx'}">
-				</view>
-			</view>
-			<view class="line" :style="{borderRadius:'1rpx'}" v-if="detail.includeWetFood"></view>
-			<view class=" mt32 ml10" v-if="detail.includeHomemadeFood">
-				<view class="color-A55 size-30 fw400">
-					自制食品
-				</view>
-				<view class="size-30 mt32 fw400">
-					自制食品摆放位置
+				<view class="line" :style="{borderRadius:'1rpx'}"></view>
+				<view class=" mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						自制食品
+					</view>
+					<view class="size-30 mt32 fw400">
+						自制食品摆放位置
+					</view>
+					<view class="img mt20">
+						<template v-if="handleImageUrl(detail.homemadeFoodLocation).length > 0">
+							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+								@click="previewImage(item)"
+								v-for="(item, index) in handleImageUrl(detail.homemadeFoodLocation)"
+								:key="index"></u-image>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
+						</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						自制饭制作和喂食说明
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" :value="detail.homemadeFoodInstructions || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
+					</view>
 				</view>
-				<view class="img mt20">
-					<template v-if="handleImageUrl(detail.homemadeFoodLocation).length > 0">
-						<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.homemadeFoodLocation)" :key="index"></u-image>
-					</template>
-					<view v-else class="empty-state">
-						<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
-						<text class="empty-text">暂无图片</text>
+				<view class="line" :style="{borderRadius:'1rpx'}"></view>
+				<view class=" mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						生骨肉
+					</view>
+					<view class="size-30 mt32 fw400">
+						生骨肉摆放位置
+					</view>
+					<view class="img mt20">
+						<template v-if="handleImageUrl(detail.rawMeatLocation).length > 0">
+							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+								@click="previewImage(item)"
+								v-for="(item, index) in handleImageUrl(detail.rawMeatLocation)" :key="index"></u-image>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
+						</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						生骨肉喂食说明
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" disabled :value="detail.rawMeatFeedingInstructions || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
 					</view>
 				</view>
-				<view class="size-30 mt24" :style="{color:'#999999'}">
-					自制饭制作和喂食说明
+				<view class="line" :style="{borderRadius:'1rpx'}"></view>
+				<view class=" mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						保健品
+					</view>
+					<view class="size-30 mt32 fw400">
+						保健品摆放位置
+					</view>
+					<view class="img mt20">
+						<template v-if="handleImageUrl(detail.healthSupplementsLocation).length > 0">
+							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+								@click="previewImage(item)"
+								v-for="(item, index) in handleImageUrl(detail.healthSupplementsLocation)"
+								:key="index"></u-image>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
+						</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						保健品喂养方式
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" disabled :value="detail.healthSupplementsFeedingInstructions || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
+					</view>
 				</view>
-				<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-					<input type="text" v-model="detail.homemadeFoodInstructions" :style="{height:'50rpx',fontSize:'30rpx'}">
+				<view class="line" :style="{borderRadius:'1rpx'}"></view>
+				<view class=" mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						零食
+					</view>
+					<view class="size-30 mt32 fw400">
+						零食摆放位置
+					</view>
+					<view class="img mt20">
+						<template v-if="handleImageUrl(detail.snacksLocation).length > 0">
+							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+								@click="previewImage(item)"
+								v-for="(item, index) in handleImageUrl(detail.snacksLocation)" :key="index"></u-image>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
+						</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						零食喂养方式
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" disabled :value="detail.snacksFeedingMethod || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
+					</view>
 				</view>
+				<view class="line" :style="{borderRadius:'1rpx'}"></view>
 			</view>
-			<view class="line" :style="{borderRadius:'1rpx'}" v-if="detail.includeHomemadeFood"></view>
-			<view class=" mt32 ml10" v-if="detail.includeRawMeat">
-				<view class="color-A55 size-30 fw400">
-					生骨肉
+			<view class="top mt24" :style="{borderRadius:'16rpx'}">
+				<view class="form-title">
+					食盆/自动喂食器
 				</view>
-				<view class="size-30 mt32 fw400">
-					生骨肉摆放位置
-				</view>
-				<view class="img mt20">
-					<template v-if="handleImageUrl(detail.rawMeatLocation).length > 0">
-						<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.rawMeatLocation)" :key="index"></u-image>
-					</template>
-					<view v-else class="empty-state">
-						<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
-						<text class="empty-text">暂无图片</text>
+				<view class=" mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						喂食器具摆放位置
+					</view>
+					<view class="mt20">
+						<template v-if="handleImageUrl(detail.feedingTrayAutomaticFeederLocation).length > 0">
+							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+								@click="previewImage(item)"
+								v-for="(item, index) in handleImageUrl(detail.feedingTrayAutomaticFeederLocation)"
+								:key="index"></u-image>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
+						</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						备注信息
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" disabled :value="detail.feedingTrayAutomaticFeederRemarks || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
 					</view>
-				</view>
-				<view class="size-30 mt24" :style="{color:'#999999'}">
-					生骨肉喂食说明
-				</view>
-				<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-					<input type="text" disabled v-model="detail.rawMeatFeedingInstructions" :style="{height:'50rpx',fontSize:'30rpx'}">
 				</view>
 			</view>
-			<view class="line" :style="{borderRadius:'1rpx'}" v-if="detail.includeRawMeat"></view>
-			<view class=" mt32 ml10" v-if="detail.includeHealthSupplements">
-				<view class="color-A55 size-30 fw400">
-					保健品
+			<view class="top mt24" :style="{borderRadius:'16rpx'}">
+				<view class="form-title">
+					饮用水
 				</view>
-				<view class="size-30 mt32 fw400">
-					保健品摆放位置
-				</view>
-				<view class="img mt20">
-					<template v-if="handleImageUrl(detail.healthSupplementsLocation).length > 0">
-						<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.healthSupplementsLocation)" :key="index"></u-image>
-					</template>
-					<view v-else class="empty-state">
-						<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
-						<text class="empty-text">暂无图片</text>
+				<view class=" mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						饮用水摆放位置
+					</view>
+					<view class="mt20">
+						<template v-if="handleImageUrl(detail.waterBowlLocation).length > 0">
+							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+								@click="previewImage(item)"
+								v-for="(item, index) in handleImageUrl(detail.waterBowlLocation)"
+								:key="index"></u-image>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
+						</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						饮用水添加要求
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" disabled :value="detail.waterBowlRemarks || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
 					</view>
-				</view>
-				<view class="size-30 mt24" :style="{color:'#999999'}">
-					保健品喂养方式
-				</view>
-				<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-					<input type="text" disabled v-model="detail.healthSupplementsFeedingInstructions" :style="{height:'50rpx',fontSize:'30rpx'}">
 				</view>
 			</view>
-			<view class="line" :style="{borderRadius:'1rpx'}" v-if="detail.includeHealthSupplements"></view>
-			<view class=" mt32 ml10" v-if="detail.includeSnacks">
-				<view class="color-A55 size-30 fw400">
-					零食
+			<view class="top mt24" :style="{borderRadius:'16rpx'}">
+				<view class="form-title">
+					其他补充信息(非必填)
 				</view>
-				<view class="size-30 mt32 fw400">
-					零食摆放位置
-				</view>
-				<view class="img mt20">
-					<template v-if="handleImageUrl(detail.snacksLocation).length > 0">
-						<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.snacksLocation)" :key="index"></u-image>
-					</template>
-					<view v-else class="empty-state">
-						<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
-						<text class="empty-text">暂无图片</text>
+				<view class=" mt32 ml10">
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						备注信息
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" disabled :value="detail.otherRemark || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
 					</view>
-				</view>
-				<view class="size-30 mt24" :style="{color:'#999999'}">
-					零食喂养方式
-				</view>
-				<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-					<input type="text" disabled v-model="detail.snacksFeedingMethod" :style="{height:'50rpx',fontSize:'30rpx'}">
 				</view>
 			</view>
-			<view class="line" :style="{borderRadius:'1rpx'}" v-if="detail.includeSnacks"></view>
 		</view>
-		<view class="top mt24" :style="{borderRadius:'16rpx'}">
-			<view class="form-title">
-				食盆/自动喂食器
-			</view>
-			<view class=" mt32 ml10">
-				<view class="color-A55 size-30 fw400">
-					喂食器具摆放位置
-				</view>
-				<view class="mt20">
-					<template v-if="handleImageUrl(detail.feedingTrayAutomaticFeederLocation).length > 0">
-						<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.feedingTrayAutomaticFeederLocation)" :key="index"></u-image>
-					</template>
-					<view v-else class="empty-state">
-						<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
-						<text class="empty-text">暂无图片</text>
+
+		<!-- 清洁要求内容 -->
+		<view v-if="currentStep === 1">
+			<view class="top box-size" :style="{borderRadius:'16rpx'}">
+				<view class="form-title">
+					您需要的清洁内容				</view>
+				<!-- <view class="empty-state-full">
+					<up-icon name="info-circle" size="60rpx" color="#999999"></up-icon>
+					<text class="empty-text-full">暂无清洁内容</text>
+				</view> -->
+				<view class="mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						猫砂
+					</view>
+					<view class="size-30 mt32 fw400">
+						猫砂摆放位置
+					</view>
+					<view class="img mt20">
+						<template v-if="handleImageUrl(detail.catLitterLocation).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)"
+								:key="index"></u-image>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
+						</view>
+					</view>
+					<view class="size-30 mt24 flex-between">
+						<view :style="{color:'#999999'}">猫砂更换频率</view>
+						<view class="level">
+							<view class="input_ mr10">
+								<input type="text" disabled :value="detail.catLitterChangeFrequencyDays"
+									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+							</view>
+							<view>天</view>
+							<view class="input_ mr10">
+								<input type="text" disabled :value="detail.catLitterChangeFrequencyTimes"
+									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+							</view>
+							<view>次</view>
+						</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						备注信息
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" :value="detail.catLitterRemarks || '无'" :style="{height:'50rpx',fontSize:'30rpx'}">
 					</view>
 				</view>
-				<view class="size-30 mt24" :style="{color:'#999999'}">
-					备注信息
-				</view>
-				<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-					<input type="text" disabled v-model="detail.feedingTrayAutomaticFeederRemarks" :style="{height:'50rpx',fontSize:'30rpx'}">
+				<view class="line" :style="{borderRadius:'1rpx'}"></view>
+
+				<view class="mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						尿垫
+					</view>
+					<view class="size-30 mt32 fw400">
+						尿垫摆放位置
+					</view>
+					<view class="img mt20">
+						<template v-if="handleImageUrl(detail.urinePadLocation).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>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
+						</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.urinePadChangeFrequency"
+									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+							</view>
+							<view>是</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"
+									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+							</view>
+							<view>天</view>
+							<view class="input_ mr10">
+								<input type="text" :value="detail.urinePadChangeFrequencyTimes"
+									:style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+							</view>
+							<view>次</view>
+						</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						备注信息
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" disabled :value="detail.urinePadRemarks || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
+					</view>
 				</view>
 			</view>
 		</view>
-		<view class="top mt24" :style="{borderRadius:'16rpx'}">
-			<view class="form-title">
-				饮用水
-			</view>
-			<view class=" mt32 ml10">
-				<view class="color-A55 size-30 fw400">
-					饮用水摆放位置
+
+		<!-- 附加服务内容 -->
+		<view v-if="currentStep === 2">
+			<view class="top box-size" :style="{borderRadius:'16rpx'}">
+				<view class="form-title">
+					您需要的附加服务
 				</view>
-				<view class="mt20">
-					<template v-if="handleImageUrl(detail.waterBowlLocation).length > 0">
-						<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.waterBowlLocation)" :key="index"></u-image>
-					</template>
-					<view v-else class="empty-state">
-						<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
-						<text class="empty-text">暂无图片</text>
+
+				<!-- 陪玩服务 -->
+				<view class="mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						陪玩
+					</view>
+					<view class="size-30 mt32 fw400">
+						陪玩用具摆放位置
+					</view>
+					<view class="img mt20">
+						<template v-if="handleImageUrl(detail.playtimeToolsLocation).length > 0">
+							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+								@click="previewImage(item)"
+								v-for="(item, index) in handleImageUrl(detail.playtimeToolsLocation)"
+								:key="index"></u-image>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
+						</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						您希望的互动方式和要求
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" :value="detail.playtimeRequirements || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
 					</view>
 				</view>
-				<view class="size-30 mt24" :style="{color:'#999999'}">
-					饮用水添加要求
-				</view>
-				<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-					<input type="text" disabled v-model="detail.waterBowlRemarks" :style="{height:'50rpx',fontSize:'30rpx'}">
+				<view class="line" :style="{borderRadius:'1rpx'}"></view>
+
+				<!-- 活动区吸毛 -->
+				<view class="mt32 ml10" v-if="detail.furCleaningService">
+					<view class="color-A55 size-30 fw400">
+						活动区吸毛
+					</view>
+					<view class="size-30 mt32 fw400">
+						吸毛用品摆放位置
+					</view>
+					<view class="img mt20">
+						<template v-if="handleImageUrl(detail.furCleaningToolsLocation).length > 0">
+							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+								@click="previewImage(item)"
+								v-for="(item, index) in handleImageUrl(detail.furCleaningToolsLocation)"
+								:key="index"></u-image>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
+						</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						请说明吸毛区域及要求
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" :value="detail.furCleaningRequirements || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
+					</view>
 				</view>
-			</view>
-		</view>
-		<view class="top mt24" :style="{borderRadius:'16rpx'}">
-			<view class="form-title">
-				其他补充信息(非必填)
-			</view>
-			<view class=" mt32 ml10">
-				<view class="size-30 mt24" :style="{color:'#999999'}">
-					备注信息
+				<view class="line" :style="{borderRadius:'1rpx'}"></view>
+
+				<!-- 毛发梳理 -->
+				<view class="mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						毛发梳理
+					</view>
+					<view class="size-30 mt32 fw400">
+						毛发梳理用品摆放位置
+					</view>
+					<view class="img mt20">
+						<template v-if="handleImageUrl(detail.groomingToolsLocation).length > 0">
+							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+								@click="previewImage(item)"
+								v-for="(item, index) in handleImageUrl(detail.groomingToolsLocation)"
+								:key="index"></u-image>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
+						</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						请说明毛发梳理要求(如: 天数,次数等)
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" :value="detail.groomingRequirements || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
+					</view>
 				</view>
-				<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-					<input type="text" disabled v-model="detail.otherRemark" :style="{height:'50rpx',fontSize:'30rpx'}">
+				<view class="line" :style="{borderRadius:'1rpx'}" v-if="detail.groomingService"></view>
+
+				<!-- 食具深度清洁 -->
+				<view class="mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						食具深度清洁
+					</view>
+					<view class="size-30 mt32 fw400">
+						需深度清洁的用具及消毒剂摆放位置
+					</view>
+					<view class="img mt20">
+						<template v-if="handleImageUrl(detail.deepCleaningToolsLocation).length > 0">
+							<u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+								@click="previewImage(item)"
+								v-for="(item, index) in handleImageUrl(detail.deepCleaningToolsLocation)"
+								:key="index"></u-image>
+						</template>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
+						</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						请说明食具/饮水机深度清洁要求(如清洁方式、消毒剂使用方式、频率等)
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" :value="detail.deepCleaningRemarks || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
+					</view>
 				</view>
-			</view>
-		</view>
-        </view>
-        
-        <!-- 清洁要求内容 -->
-        <view v-if="currentStep === 1">
-            <view class="top box-size" :style="{borderRadius:'16rpx'}">
-                <view class="form-title">
-                    您需要的清洁内容
-                </view>
-                <view v-if="!detail.includeCatLitter && !detail.includeUrinePad" class="empty-state-full">
-                    <up-icon name="info-circle" size="60rpx" color="#999999"></up-icon>
-                    <text class="empty-text-full">暂无清洁内容</text>
-                </view>
-                <view class="mt32 ml10" v-if="detail.includeCatLitter">
-                    <view class="color-A55 size-30 fw400">
-                        猫砂
-                    </view>
-                    <view class="size-30 mt32 fw400">
-                        猫砂摆放位置
-                    </view>
-                    <view class="img mt20">
-                        <template v-if="handleImageUrl(detail.catLitterLocation).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)" :key="index"></u-image>
+				<view class="line" :style="{borderRadius:'1rpx'}"></view>
+
+				<!-- 喂药上药 -->
+				<view class="mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						喂药上药
+					</view>
+					<view class="size-30 mt32 fw400">
+						药品摆放位置
+					</view>
+					<view class="img mt20">
+                        <template v-if="handleImageUrl(detail.walkDogToolsLocation).length">
+						    <u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+							@click="previewImage(item)"
+							v-for="(item, index) in handleImageUrl(detail.administerMedicationLocation)"
+							:key="index"></u-image>
                         </template>
-                        <view v-else class="empty-state">
-                            <up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
-                            <text class="empty-text">暂无图片</text>
-                        </view>
-                    </view>
-                    <view class="size-30 mt24 flex-between">
-                        <view :style="{color:'#999999'}">猫砂更换频率</view>
-                        <view class="level">
-                            <view class="input_ mr10">
-                                <input type="text" disabled v-model="detail.catLitterChangeFrequencyDays" :style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
-                            </view>
-                            <view>天</view>
-                            <view class="input_ mr10">
-                                <input type="text" disabled v-model="detail.catLitterChangeFrequencyTimes" :style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
-                            </view>
-                            <view>次</view>
-                        </view>
-                    </view>
-                    <view class="size-30 mt24" :style="{color:'#999999'}">
-                        备注信息
-                    </view>
-                    <view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-                        <input type="text" v-model="detail.catLitterRemarks" :style="{height:'50rpx',fontSize:'30rpx'}">
-                    </view>
-                </view>
-                <view class="line" :style="{borderRadius:'1rpx'}" v-if="detail.includeCatLitter"></view>
-                
-                <view class="mt32 ml10" v-if="detail.includeUrinePad">
-                    <view class="color-A55 size-30 fw400">
-                        尿垫
-                    </view>
-                    <view class="size-30 mt32 fw400">
-                        尿垫摆放位置
-                    </view>
-                    <view class="img mt20">
-                        <template v-if="handleImageUrl(detail.urinePadLocation).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>
+						<view v-else class="empty-state">
+							<up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+							<text class="empty-text">暂无图片</text>
+						</view>
+					</view>
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						请说明药品使用方式
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" disabled :value="detail.administerMedicationRemarks || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
+					</view>
+				</view>
+				<view class="line" :style="{borderRadius:'1rpx'}"></view>
+
+				<!-- 遛狗服务 -->
+				<view class="mt32 ml10">
+					<view class="color-A55 size-30 fw400">
+						遛狗服务
+					</view>
+					<view class="size-30 mt32 fw400">
+						遛狗用品摆放位置
+					</view>
+					<view class="img mt20">
+                        
+                        <template v-if="handleImageUrl(detail.walkDogToolsLocation).length">
+						    <u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+							@click="previewImage(item)"
+							v-for="(item, index) in handleImageUrl(detail.walkDogToolsLocation)" :key="index"></u-image>
                         </template>
+                        
                         <view v-else class="empty-state">
                             <up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
                             <text class="empty-text">暂无图片</text>
                         </view>
-                    </view>
-                    <view class="size-30 mt24 flex-between">
-                        <view :style="{color:'#999999'}">更换尿垫</view>
-                        <view class="level">
-                            <view class="input_ mr10">
-                                <input type="text" v-model="detail.urinePadChangeFrequency" :style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
-                            </view>
-                            <view>是</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" v-model="detail.urinePadChangeFrequencyDays" :style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
-                            </view>
-                            <view>天</view>
-                            <view class="input_ mr10">
-                                <input type="text" v-model="detail.urinePadChangeFrequencyTimes" :style="{width:'80rpx',height:'50rpx',fontSize:'30rpx'}">
+					</view>
+
+					<!-- 雨天遛狗 -->
+					<view>
+						<view class="size-30 mt32 fw400">
+							狗狗雨具位置
+						</view>
+						<view class="img mt20">
+							
+                            <template v-if="handleImageUrl(detail.dogRainGearLocation).length">
+                                <u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx"
+                                @click="previewImage(item)"
+                                v-for="(item, index) in handleImageUrl(detail.dogRainGearLocation)"
+                                :key="index"></u-image>
+                            </template>
+                                
+                            <view v-else class="empty-state">
+                                <up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
+                                <text class="empty-text">暂无图片</text>
                             </view>
-                            <view>次</view>
-                        </view>
-                    </view>
-                    <view class="size-30 mt24" :style="{color:'#999999'}">
-                        备注信息
-                    </view>
-                    <view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-                        <input type="text" disabled v-model="detail.urinePadRemarks" :style="{height:'50rpx',fontSize:'30rpx'}">
-                    </view>
-                </view>
-            </view>
-        </view>
-        
-        <!-- 附加服务内容 -->
-        <view v-if="currentStep === 2">
-            <view class="top box-size" :style="{borderRadius:'16rpx'}">
-                <view class="form-title">
-                    您需要的附加服务
-                </view>
-                <view v-if="!detail.additionalService || (!detail.playtimeService && !detail.furCleaningService && !detail.groomingService && !detail.deepCleaningService)" class="empty-state-full">
-                    <up-icon name="info-circle" size="60rpx" color="#999999"></up-icon>
-                    <text class="empty-text-full">暂无附加服务</text>
-                </view>
-                
-                <!-- 陪玩服务 -->
-                <view class="mt32 ml10" v-if="detail.playtimeService">
-                    <view class="color-A55 size-30 fw400">
-                        陪玩
-                    </view>
-                    <view class="size-30 mt32 fw400">
-                        陪玩用具摆放位置
-                    </view>
-                    <view class="img mt20">
-                        <template v-if="handleImageUrl(detail.playtimeToolsLocation).length > 0">
-                            <u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.playtimeToolsLocation)" :key="index"></u-image>
-                        </template>
-                        <view v-else class="empty-state">
-                            <up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
-                            <text class="empty-text">暂无图片</text>
-                        </view>
-                    </view>
-                    <view class="size-30 mt24" :style="{color:'#999999'}">
-                        您希望的互动方式和要求
-                    </view>
-                    <view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-                        <input type="text" v-model="detail.playtimeRequirements" :style="{height:'50rpx',fontSize:'30rpx'}">
-                    </view>
-                </view>
-                <view class="line" :style="{borderRadius:'1rpx'}" v-if="detail.playtimeService"></view>
-                
-                <!-- 活动区吸毛 -->
-                <view class="mt32 ml10" v-if="detail.furCleaningService">
-                    <view class="color-A55 size-30 fw400">
-                        活动区吸毛
-                    </view>
-                    <view class="size-30 mt32 fw400">
-                        吸毛用品摆放位置
-                    </view>
-                    <view class="img mt20">
-                        <template v-if="handleImageUrl(detail.furCleaningToolsLocation).length > 0">
-                            <u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.furCleaningToolsLocation)" :key="index"></u-image>
-                        </template>
-                        <view v-else class="empty-state">
-                            <up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
-                            <text class="empty-text">暂无图片</text>
-                        </view>
-                    </view>
-                    <view class="size-30 mt24" :style="{color:'#999999'}">
-                        请说明吸毛区域及要求
-                    </view>
-                    <view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-                        <input type="text" v-model="detail.furCleaningRequirements" :style="{height:'50rpx',fontSize:'30rpx'}">
-                    </view>
-                </view>
-                <view class="line" :style="{borderRadius:'1rpx'}" v-if="detail.furCleaningService"></view>
-                
-                <!-- 毛发梳理 -->
-                <view class="mt32 ml10" v-if="detail.groomingService">
-                    <view class="color-A55 size-30 fw400">
-                        毛发梳理
-                    </view>
-                    <view class="size-30 mt32 fw400">
-                        毛发梳理用品摆放位置
-                    </view>
-                    <view class="img mt20">
-                        <template v-if="handleImageUrl(detail.groomingToolsLocation).length > 0">
-                            <u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.groomingToolsLocation)" :key="index"></u-image>
-                        </template>
-                        <view v-else class="empty-state">
-                            <up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
-                            <text class="empty-text">暂无图片</text>
-                        </view>
-                    </view>
-                    <view class="size-30 mt24" :style="{color:'#999999'}">
-                        请说明毛发梳理要求(如: 天数,次数等)
-                    </view>
-                    <view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-                        <input type="text" v-model="detail.groomingRequirements" :style="{height:'50rpx',fontSize:'30rpx'}">
-                    </view>
-                </view>
-                <view class="line" :style="{borderRadius:'1rpx'}" v-if="detail.groomingService"></view>
-                
-                <!-- 食具深度清洁 -->
-                <view class="mt32 ml10" v-if="detail.deepCleaningService">
-                    <view class="color-A55 size-30 fw400">
-                        食具深度清洁
-                    </view>
-                    <view class="size-30 mt32 fw400">
-                        需深度清洁的用具及消毒剂摆放位置
-                    </view>
-                    <view class="img mt20">
-                        <template v-if="handleImageUrl(detail.deepCleaningToolsLocation).length > 0">
-                            <u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.deepCleaningToolsLocation)" :key="index"></u-image>
-                        </template>
-                        <view v-else class="empty-state">
-                            <up-icon name="info-circle" size="40rpx" color="#999999"></up-icon>
-                            <text class="empty-text">暂无图片</text>
-                        </view>
-                    </view>
-                    <view class="size-30 mt24" :style="{color:'#999999'}">
-                        请说明食具/饮水机深度清洁要求(如清洁方式、消毒剂使用方式、频率等)
-                    </view>
-                    <view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-                        <input type="text" v-model="detail.deepCleaningRemarks" :style="{height:'50rpx',fontSize:'30rpx'}">
-                    </view>
-                </view>
-                <view class="line" :style="{borderRadius:'1rpx'}" v-if="detail.deepCleaningService"></view>
-                
-                <!-- 喂药上药 -->
-                <view class="mt32 ml10" v-if="detail.administerMedication">
-                    <view class="color-A55 size-30 fw400">
-                        喂药上药
-                    </view>
-                    <view class="size-30 mt32 fw400">
-                        药品摆放位置
-                    </view>
-                    <view class="img mt20">
-                        <u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.administerMedicationLocation)" :key="index"></u-image>
-                    </view>
-                    <view class="size-30 mt24" :style="{color:'#999999'}">
-                        请说明药品使用方式
-                    </view>
-                    <view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-                        <input type="text" disabled v-model="detail.administerMedicationRemarks" :style="{height:'50rpx',fontSize:'30rpx'}">
-                    </view>
-                </view>
-                <view class="line" :style="{borderRadius:'1rpx'}" v-if="detail.administerMedication"></view>
-                
-                <!-- 遛狗服务 -->
-                <view class="mt32 ml10" v-if="detail.walkDog">
-                    <view class="color-A55 size-30 fw400">
-                        遛狗服务
-                    </view>
-                    <view class="size-30 mt32 fw400">
-                        遛狗用品摆放位置
-                    </view>
-                    <view class="img mt20">
-                        <u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.walkDogToolsLocation)" :key="index"></u-image>
-                    </view>
-                    
-                    <!-- 雨天遛狗 -->
-                    <view v-if="detail.walkDogRainyDay">
-                        <view class="size-30 mt32 fw400">
-                            狗狗雨具位置
-                        </view>
-                        <view class="img mt20">
-                            <u-image class="img" :src="item" mode="aspectFill" width="173rpx" height="230rpx" @click="previewImage(item)" v-for="(item, index) in handleImageUrl(detail.dogRainGearLocation)" :key="index"></u-image>
-                        </view>
-                        <view class="size-30 mt24" :style="{color:'#999999'}">
-                            下雨天遛狗要求
-                        </view>
-                        <view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-                            <input type="text" v-model="detail.walkDogRainRemark" :style="{height:'50rpx',fontSize:'30rpx'}">
-                        </view>
-                    </view>
-                    
-                    <!-- 遛狗时长 -->
-                    <view v-if="detail.isWalkDogDuration">
-                        <view class="size-30 mt24" :style="{color:'#999999'}">
-                            遛狗时长
-                        </view>
-                        <view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-                            <input type="text" v-model="detail.walkDogDuration" :style="{height:'50rpx',fontSize:'30rpx'}">
-                        </view>
-                    </view>
-                    
-                    <!-- 狗狗行为 -->
-                    <view v-if="detail.isDogBehavior">
-                        <view class="size-30 mt24" :style="{color:'#999999'}">
-                            狗狗行为
-                        </view>
-                        <view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-                            <input type="text" v-model="detail.dogBehavior" :style="{height:'50rpx',fontSize:'30rpx'}">
-                        </view>
-                    </view>
-                    
-                    <!-- 偏好区域 -->
-                    <view v-if="detail.isFavoriteRegion">
-                        <view class="size-30 mt24" :style="{color:'#999999'}">
-                            偏好区域
-                        </view>
-                        <view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-                            <input type="text" v-model="detail.favoriteRegion" :style="{height:'50rpx',fontSize:'30rpx'}">
-                        </view>
-                    </view>
-                    
-                    <!-- 偏好路线 -->
-                    <view v-if="detail.isFavoriteRoute">
-                        <view class="size-30 mt24" :style="{color:'#999999'}">
-                            偏好路线
-                        </view>
-                        <view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-                            <input type="text" v-model="detail.favoriteRoute" :style="{height:'50rpx',fontSize:'30rpx'}">
-                        </view>
-                    </view>
-                </view>
-                
-                <!-- 附加服务备注 -->
-                <view class="mt32 ml10">
-                    <view class="size-30 mt24" :style="{color:'#999999'}">
-                        附加服务备注
-                    </view>
-                    <view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
-                        <input type="text" v-model="detail.additionalServicesRemarks" :style="{height:'50rpx',fontSize:'30rpx'}">
-                    </view>
-                </view>
-            </view>
-        </view>
-        
-        <!-- 底部按钮 -->
+						</view>
+						<view class="size-30 mt24" :style="{color:'#999999'}">
+							下雨天遛狗要求
+						</view>
+						<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+							<input type="text" :value="detail.walkDogRainRemark || '无'"
+								:style="{height:'50rpx',fontSize:'30rpx'}">
+						</view>
+					</view>
+
+					<!-- 遛狗时长 -->
+					<view>
+						<view class="size-30 mt24" :style="{color:'#999999'}">
+							遛狗时长
+						</view>
+						<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+							<input type="text" :value="detail.walkDogDuration || '无'"
+								:style="{height:'50rpx',fontSize:'30rpx'}">
+						</view>
+					</view>
+
+					<!-- 狗狗行为 -->
+					<view>
+						<view class="size-30 mt24" :style="{color:'#999999'}">
+							狗狗行为
+						</view>
+						<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+							<input type="text" :value="detail.dogBehavior || '无'" :style="{height:'50rpx',fontSize:'30rpx'}">
+						</view>
+					</view>
+
+					<!-- 偏好区域 -->
+					<view>
+						<view class="size-30 mt24" :style="{color:'#999999'}">
+							偏好区域
+						</view>
+						<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+							<input type="text" :value="detail.favoriteRegion || '无'"
+								:style="{height:'50rpx',fontSize:'30rpx'}">
+						</view>
+					</view>
+
+					<!-- 偏好路线 -->
+					<view>
+						<view class="size-30 mt24" :style="{color:'#999999'}">
+							偏好路线
+						</view>
+						<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+							<input type="text" :value="detail.favoriteRoute || '无'"
+								:style="{height:'50rpx',fontSize:'30rpx'}">
+						</view>
+					</view>
+				</view>
+
+				<!-- 附加服务备注 -->
+				<view class="mt32 ml10">
+					<view class="size-30 mt24" :style="{color:'#999999'}">
+						附加服务备注
+					</view>
+					<view class="notes mt16 box-size ml--15" :style="{borderRadius:'16rpx'}">
+						<input type="text" :value="detail.additionalServicesRemarks || '无'"
+							:style="{height:'50rpx',fontSize:'30rpx'}">
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 底部按钮 -->
 		<view class="buttom_ mt60 box-size level" v-if="currentStep > 0">
 			<view class="buttom_item level size-30" :style="{borderRadius:'41rpx',color:'#fff'}" @click="prevStep">
 				上一页
@@ -678,7 +769,7 @@
 <style scoped lang="scss">
 	@import"detail.scss";
 	@import"steps-custom.scss";
-	
+
 	.empty-state {
 		display: flex;
 		flex-direction: column;
@@ -689,13 +780,13 @@
 		background-color: #f5f5f5;
 		border-radius: 8rpx;
 	}
-	
+
 	.empty-text {
 		margin-top: 10rpx;
 		font-size: 24rpx;
 		color: #999999;
 	}
-	
+
 	.empty-state-full {
 		display: flex;
 		flex-direction: column;
@@ -707,43 +798,43 @@
 		border-radius: 8rpx;
 		margin-top: 20rpx;
 	}
-	
+
 	.empty-text-full {
 		margin-top: 20rpx;
 		font-size: 28rpx;
 		color: #999999;
 	}
-	
+
 	/* 自定义步骤条样式 */
 	: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 {
@@ -751,4 +842,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/otherPages/myOrdersManage/service/steps-custom.css b/otherPages/myOrdersManage/service/steps-custom.css
deleted file mode 100644
index f5af114..0000000
--- a/otherPages/myOrdersManage/service/steps-custom.css
+++ /dev/null
@@ -1,35 +0,0 @@
-@charset "UTF-8";
-.box .up-steps-custom {
-  /* 自定义步骤条样式 */
-  /* 步骤条线条样式 */
-  /* 当前步骤前的线条为橙色 */
-  /* 步骤圆点样式 */
-  /* 未激活的步骤圆点 */
-  /* 步骤标题样式 */
-}
-
-.box .up-steps-custom :deep(.u-steps-item__line) {
-  background-color: #DDDDDD !important;
-  height: 4rpx !important;
-}
-
-.box .up-steps-custom :deep(.u-steps-item:first-child .u-steps-item__line) {
-  background-color: #FFA042 !important;
-}
-
-.box .up-steps-custom :deep(.u-steps-item__wrapper__circle) {
-  background-color: #FFA042 !important;
-  border-color: #FFA042 !important;
-  width: 36rpx !important;
-  height: 36rpx !important;
-}
-
-.box .up-steps-custom :deep(.u-steps-item:nth-child(2) .u-steps-item__wrapper__circle,
-.u-steps-item:nth-child(3) .u-steps-item__wrapper__circle) {
-  background-color: transparent !important;
-  border-color: #999999 !important;
-}
-
-.box .up-steps-custom :deep(.u-steps-item__content) {
-  margin-top: 16rpx !important;
-}
diff --git a/otherPages/myOrdersManage/service/steps-custom.min.css b/otherPages/myOrdersManage/service/steps-custom.min.css
deleted file mode 100644
index f4e8c42..0000000
--- a/otherPages/myOrdersManage/service/steps-custom.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.box .up-steps-custom :deep(.u-steps-item__line){background-color:#DDDDDD !important;height:4rpx !important}.box .up-steps-custom :deep(.u-steps-item:first-child .u-steps-item__line){background-color:#FFA042 !important}.box .up-steps-custom :deep(.u-steps-item__wrapper__circle){background-color:#FFA042 !important;border-color:#FFA042 !important;width:36rpx !important;height:36rpx !important}.box .up-steps-custom :deep(.u-steps-item:nth-child(2) .u-steps-item__wrapper__circle,.u-steps-item:nth-child(3) .u-steps-item__wrapper__circle){background-color:transparent !important;border-color:#999999 !important}.box .up-steps-custom :deep(.u-steps-item__content){margin-top:16rpx !important}
diff --git a/otherPages/orderTakingManage/detail/index.css b/otherPages/orderTakingManage/detail/index.css
deleted file mode 100644
index f4a45a2..0000000
--- a/otherPages/orderTakingManage/detail/index.css
+++ /dev/null
@@ -1,252 +0,0 @@
-@charset "UTF-8";
-.box {
-  width: 100vw;
-  height: 100vh;
-  background-color: #F5F5F5;
-  padding: 2% 3% 0 3%;
-}
-
-.box-size {
-  box-sizing: border-box;
-}
-
-.level {
-  display: flex;
-}
-
-/* 垂直、水平居中 */
-.vertically_center {
-  display: grid;
-  place-items: center;
-}
-
-.top {
-  width: 710rpx;
-  height: 176rpx;
-  background-color: #FFFFFF;
-  padding: 1% 2%;
-  font-size: 22rpx;
-  display: grid;
-  justify-content: space-between;
-}
-
-.top_left {
-  width: 520rpx;
-  height: auto;
-  display: flex;
-  justify-content: space-between;
-  padding-top: 20rpx;
-}
-
-.text1 {
-  color: #FF2A2A;
-  font-size: 25rpx;
-}
-
-.top_bottom {
-  /* background-color: aqua; */
-  margin-left: 10rpx;
-  color: #999999;
-}
-
-.top-button {
-  width: 132rpx;
-  height: 54rpx;
-  border: 1rpx solid #FFBF60;
-  color: #FFBF60;
-  display: grid;
-  justify-content: center;
-  line-height: 54rpx;
-  position: absolute;
-  top: 30rpx;
-  right: 30rpx;
-}
-
-.information {
-  width: 710rpx;
-  background-color: #FFFFFF;
-  /* background-color: pink; */
-  margin-top: 10rpx;
-  padding: 10rpx 10rpx;
-}
-
-.time {
-  width: 660rpx;
-  /* background-color: gray; */
-  padding: 0 2%;
-  margin-top: 50rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.time .time-content {
-  width: 500rpx;
-}
-
-.service {
-  width: 710rpx;
-  height: auto;
-  background-color: #FFFFFF;
-  margin-top: 2%;
-  padding: 0 3% 3% 3%;
-}
-
-.horizontal_distribution {
-  display: flex;
-  justify-content: space-between;
-}
-
-.flex {
-  display: flex;
-}
-
-.service_top {
-  width: 670rpx;
-}
-
-.text2 {
-  width: auto;
-  height: 20rpx;
-  margin-top: 45rpx;
-  font-size: 22rpx;
-  color: #999999;
-}
-
-.pet_information {
-  width: 670rpx;
-  height: auto;
-  /* background-color: pink; */
-  padding: 5% 0 0 3%;
-}
-
-.pet_item {
-  color: #999999;
-  font-size: 28rpx;
-}
-
-.img image {
-  width: 140rpx;
-  height: 140rpx;
-  border-radius: 100rpx;
-  margin-right: 20rpx;
-}
-
-.name {
-  margin-bottom: 15rpx;
-}
-
-.name image {
-  width: 35rpx;
-  height: 35rpx;
-  border-radius: 35rpx;
-  background-color: red;
-  margin-left: 15rpx;
-}
-
-.name_text {
-  color: #000 !important;
-  font-size: 30rpx !important;
-}
-
-.pet- {
-  height: 40rpx;
-  line-height: 40rpx;
-  color: #999999;
-  font-size: 28rpx;
-  margin: 20rpx 0 20rpx 0;
-}
-
-.pet- text {
-  margin: 0 8rpx 0 30rpx;
-  color: #000;
-}
-
-.money_total {
-  width: 670rpx;
-  height: 45rpx;
-  /* background-color: pink; */
-  margin: 60rpx 0 20rpx 0;
-  justify-content: space-between;
-  font-size: 30rpx;
-}
-
-.money_text {
-  color: red !important;
-  font-size: 34rpx !important;
-}
-
-.other_information {
-  width: 710rpx;
-  height: 350rpx;
-  background-color: #FFFFFF;
-  /* background-color: pink; */
-  margin-top: 20rpx;
-  padding: 0 1% 0 3%;
-}
-
-.text3 {
-  margin: 40rpx 15rpx 0 15rpx;
-}
-
-.bottom {
-  width: 100vw;
-  height: 163rpx;
-  background-color: #FFFFFF;
-  margin-top: 20rpx;
-  position: relative;
-}
-
-.bottom_button {
-  width: 594rpx;
-  height: 94rpx;
-  background-color: #FFBF60;
-  color: #FFFFFF;
-  font-size: 30rpx;
-  line-height: 94rpx;
-  justify-content: center;
-  position: absolute;
-  top: 19%;
-  left: 11%;
-}
-
-.success {
-  width: 310rpx;
-  height: 370rpx;
-  background-color: #FFFFFF;
-}
-
-.pop_top {
-  width: 310rpx;
-  height: 100rpx;
-  background-image: linear-gradient(to bottom, #FFBF60, #FFD494);
-}
-
-.code {
-  width: 250rpx;
-  height: 50rpx;
-  background-color: #F3F3F3;
-  margin: 30rpx 0 0 30rpx;
-}
-
-.pop_image {
-  display: grid;
-  place-items: center;
-  margin-top: 20rpx;
-}
-
-.copy {
-  width: 260rpx;
-  height: 50rpx;
-  background-color: #FFBF60;
-  margin: 30rpx 0 0 25rpx;
-}
-
-.cancel {
-  width: 40rpx;
-  height: 40rpx;
-  background-color: #FFFFFF;
-  position: absolute;
-  top: -20rpx;
-  right: -17rpx;
-}
diff --git a/otherPages/orderTakingManage/detail/index.min.css b/otherPages/orderTakingManage/detail/index.min.css
deleted file mode 100644
index 6fe2d99..0000000
--- a/otherPages/orderTakingManage/detail/index.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.box{width:100vw;height:100vh;background-color:#F5F5F5;padding:2% 3% 0 3%}.box-size{box-sizing:border-box}.level{display:flex}.vertically_center{display:grid;place-items:center}.top{width:710rpx;height:176rpx;background-color:#FFFFFF;padding:1% 2%;font-size:22rpx;display:grid;justify-content:space-between}.top_left{width:520rpx;height:auto;display:flex;justify-content:space-between;padding-top:20rpx}.text1{color:#FF2A2A;font-size:25rpx}.top_bottom{margin-left:10rpx;color:#999999}.top-button{width:132rpx;height:54rpx;border:1rpx solid #FFBF60;color:#FFBF60;display:grid;justify-content:center;line-height:54rpx;position:absolute;top:30rpx;right:30rpx}.information{width:710rpx;background-color:#FFFFFF;margin-top:10rpx;padding:10rpx 10rpx}.time{width:660rpx;padding:0 2%;margin-top:50rpx;display:flex;justify-content:space-between;align-items:center}.time .time-content{width:500rpx}.service{width:710rpx;height:auto;background-color:#FFFFFF;margin-top:2%;padding:0 3% 3% 3%}.horizontal_distribution{display:flex;justify-content:space-between}.flex{display:flex}.service_top{width:670rpx}.text2{width:auto;height:20rpx;margin-top:45rpx;font-size:22rpx;color:#999999}.pet_information{width:670rpx;height:auto;padding:5% 0 0 3%}.pet_item{color:#999999;font-size:28rpx}.img image{width:140rpx;height:140rpx;border-radius:100rpx;margin-right:20rpx}.name{margin-bottom:15rpx}.name image{width:35rpx;height:35rpx;border-radius:35rpx;background-color:red;margin-left:15rpx}.name_text{color:#000 !important;font-size:30rpx !important}.pet-{height:40rpx;line-height:40rpx;color:#999999;font-size:28rpx;margin:20rpx 0 20rpx 0}.pet- text{margin:0 8rpx 0 30rpx;color:#000}.money_total{width:670rpx;height:45rpx;margin:60rpx 0 20rpx 0;justify-content:space-between;font-size:30rpx}.money_text{color:red !important;font-size:34rpx !important}.other_information{width:710rpx;height:350rpx;background-color:#FFFFFF;margin-top:20rpx;padding:0 1% 0 3%}.text3{margin:40rpx 15rpx 0 15rpx}.bottom{width:100vw;height:163rpx;background-color:#FFFFFF;margin-top:20rpx;position:relative}.bottom_button{width:594rpx;height:94rpx;background-color:#FFBF60;color:#FFFFFF;font-size:30rpx;line-height:94rpx;justify-content:center;position:absolute;top:19%;left:11%}.success{width:310rpx;height:370rpx;background-color:#FFFFFF}.pop_top{width:310rpx;height:100rpx;background-image:linear-gradient(to bottom, #FFBF60, #FFD494)}.code{width:250rpx;height:50rpx;background-color:#F3F3F3;margin:30rpx 0 0 30rpx}.pop_image{display:grid;place-items:center;margin-top:20rpx}.copy{width:260rpx;height:50rpx;background-color:#FFBF60;margin:30rpx 0 0 25rpx}.cancel{width:40rpx;height:40rpx;background-color:#FFFFFF;position:absolute;top:-20rpx;right:-17rpx}
diff --git a/otherPages/orderTakingManage/detail/index.vue b/otherPages/orderTakingManage/detail/index.vue
index ff4cb59..9754db8 100644
--- a/otherPages/orderTakingManage/detail/index.vue
+++ b/otherPages/orderTakingManage/detail/index.vue
@@ -215,7 +215,7 @@
 			</view>
 			<view class="handbook">
 				接单即接受
-				<text class="text">《伴宠师手册》</text>
+				<text class="text" @click="configPopupRef.open('pet_platform_introduction')">《伴宠师手册》</text>
 			</view>
 			<up-button @click="conform" color="#FFBF60" text="确定" shape="circle"></up-button>
 		</view>
@@ -239,9 +239,13 @@
 				<up-input placeholder="" border="none" v-model="value" disabled
 					:customStyle="{height:'60rpx','text-indent': '20rem', 'background-color': '#F3F3F3', position : 'relative','z-index' : '999' }"></up-input>
 			</view>
-			<up-button @click="noneOrder" color="#FFBF60" text="复制订单编号" shape="circle"></up-button>
+			<view class="button-group">
+				<up-button @click="noneOrder" color="#FFBF60" text="复制订单编号" shape="circle"></up-button>
+				<up-button @click="toMyOrder" color="#FFBF60" text="到我的订单查看" shape="circle" style="margin-top: 20rpx;"></up-button>
+			</view>
 		</view>
 	</up-popup>
+	<configPopup ref="configPopupRef" />
 </template>
 
 <script setup>
@@ -267,6 +271,8 @@
 	} from "vuex"
 	
 	import dayjs from "dayjs";
+	import configPopup from '@/components/configPopup.vue'
+	const configPopupRef = ref(null)
 
 	onLoad((options) => {
 		orderId.value = options.id || null;
@@ -431,6 +437,27 @@
 			url: `/otherPages/orderTakingManage/pet/detail?id=${id}`
 		})
 	}
+	
+	// 复制订单编号
+	const noneOrder = () => {
+		uni.setClipboardData({
+			data: orderDetail.value.order.orderSn,
+			success: function() {
+				uni.showToast({
+					title: '复制成功',
+					icon: 'none'
+				});
+			}
+		});
+	}
+	
+	// 跳转到我的订单页面
+	const toMyOrder = () => {
+		orderSuccessClose();
+		uni.navigateTo({
+			url: '/pages/myOrdersManage/list/index'
+		});
+	}
 </script>
 
 <style scoped lang="scss">
@@ -532,6 +559,12 @@
 		margin-bottom: 40rpx;
 	}
 	
+	.button-group {
+		display: flex;
+		flex-direction: column;
+		gap: 20rpx;
+	}
+	
 	.btn-confirmed {
 		background: #CCCCCC !important; /* 灰色背景 */
 	}
diff --git a/pages/myOrdersManage/components/timelineService.vue b/pages/myOrdersManage/components/timelineService.vue
index 217e34f..2059ce2 100644
--- a/pages/myOrdersManage/components/timelineService.vue
+++ b/pages/myOrdersManage/components/timelineService.vue
@@ -76,7 +76,7 @@
 									</text>
 								</view>
 								<view class="pet-description">
-									{{ pet.breed }}{{ pet.bodyType }} | {{ pet.services.join('，') }}
+									{{ pet.breed }}{{ pet.bodyType }} | {{ pet.services.join('+') }}
 								</view>
 							</view>
 						</view>
diff --git a/pages/orderTakingManage/components/list.vue b/pages/orderTakingManage/components/list.vue
index 6473ede..744dd89 100644
--- a/pages/orderTakingManage/components/list.vue
+++ b/pages/orderTakingManage/components/list.vue
@@ -15,7 +15,7 @@
                         <up-image style="flex-shrink:0" class="mr20" width="70px" height="70px" :src="pet.photo"
                             shape="circle"></up-image>
                         <view>
-                            <view class="font28 col3">服务天数: 共{{ pet.orderServiceText.length }}天 I {{ pet.orderServiceText.join('，') }}</view>
+                            <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">
@@ -25,7 +25,7 @@
                             </view> -->
 
                             <!-- <view style="margin: 18rpx 0">期望上门时间：{{itemService.expectServiceTime}}</view> -->
-                            <view class="" style="margin-top: 10rpx;">{{ pet.breed }}({{ pet.bodyType }}) | {{ pet.productNameText.join('，') }}
+                            <view class="" style="margin-top: 10rpx;">{{ pet.breed }}({{ pet.bodyType }}) | {{ pet.productNameText.join('+') }}
 
                                 <!-- <text v-for="itemPet in item.h5OrderVO.orderItemList" :key="itemPet.id">
                                     {{ itemPet.productName }}
@@ -130,7 +130,8 @@ const emits = defineEmits(['update']);
 
 // 跳转订单详情
 const toOrderDetail = (id) => {
-	console.log(userInfo.userBcs);
+	if(checkUserBcs()) return
+	
     uni.navigateTo({
         url: `/otherPages/orderTakingManage/detail/index?id=${id}`
     });
@@ -144,7 +145,29 @@ const cancel = () => {
 
 }
 
+function checkUserBcs(){
+	const { userBcs, userBcsRole } = userInfo.value
+	
+	if(userBcs == 0){
+		uni.showModal({
+			title: '完成伴宠师认证认证后在进行操作！',
+			content: '当前无法操作，如果您已经提交伴宠师认证，请耐心等待',
+			confirmText: '去查看',
+			success(res) {
+				if(res.confirm){
+					uni.navigateTo({
+						url: "/otherPages/authentication/list/index"
+					})
+				}
+			}
+		})
+		return true
+	}
+	return false
+}
+
 const unableToAcceptOrder = (currentId) => {
+	if(checkUserBcs()) return
     modal.value.open();
     id.value = currentId;
 }
diff --git a/pages/userManage/index.vue b/pages/userManage/index.vue
index 3f5a47c..5924a12 100644
--- a/pages/userManage/index.vue
+++ b/pages/userManage/index.vue
@@ -294,7 +294,9 @@
 	};
 
 	const getPet = async () => {
-		let response = await getpetList();
+		let response = await getpetList({
+			userId: userInfo.value.userId
+		});
 		petList.value = response?.data || [];
 	}
 
diff --git a/uni.scss b/uni.scss
index 93dec51..d048f4e 100644
--- a/uni.scss
+++ b/uni.scss
@@ -1,3 +1,13 @@
 @import '@/uni_modules/uni-scss/variables.scss';
 /* uni.scss */
-@import '@/uni_modules/uview-plus/theme.scss';
\ No newline at end of file
+@import '@/uni_modules/uview-plus/theme.scss';
+
+.uni-btn-color{
+	border-radius: 40rpx;
+	padding: 20rpx;
+	margin: 40rpx;
+	background: #FFBF60;
+	color: #fff;
+	text-align: center;
+	font-size: 28rpx;
+}
\ No newline at end of file
diff --git a/utils/getUrl.js b/utils/getUrl.js
index a50a731..f9acf5e 100644
--- a/utils/getUrl.js
+++ b/utils/getUrl.js
@@ -6,7 +6,7 @@ const api = {
 	develop:"http://h5.xzaiyp.top",
 	// develop: "http://youyi-test.natapp1.cc/prod-api", // 开发
 	trial: "http://h5.xzaiyp.top", //测试
-	release: "http://h5.xzaiyp.top", // 线上
+	release: "https://api.catmdogd.com/prod-api",
 }
 
 const currentUrl = api[current];
diff --git a/utils/serviceTime.js b/utils/serviceTime.js
index a8294ef..80c24b3 100644
--- a/utils/serviceTime.js
+++ b/utils/serviceTime.js
@@ -31,10 +31,12 @@ export function getOrderServiceText(petId, orderServiceList) {
 export function getProductNameText(petId, productList, orderServiceList) {
 
 	let orderService = orderServiceList.filter(service => service.petId == petId)
-
-	return productList
+	
+	let list = (productList
 		.filter(product => orderService.filter(service => service.id == product.orderServiceId).length > 0)
-		.map(product => product.productName)
+		.map(product => product.productName))
+
+	return [...new Set(list)]
 }
 
 export default {