diff --git a/components/dForm/index.vue b/components/dForm/index.vue
index 5e36cea..24ba612 100644
--- a/components/dForm/index.vue
+++ b/components/dForm/index.vue
@@ -12,10 +12,11 @@
 				</template>
 				<template v-else-if="item.type==='select'">
 					<up-input inputAlign="right" :value="getDesc(formData[item.key], item.options)" disabled disabledColor="#ffffff"
-						:placeholder="item.placeholder" border="none"></up-input>
-					<template #right>
-						<up-icon name="arrow-right"></up-icon>
-					</template>
+						:placeholder="item.placeholder" border="none">
+						<template #suffix>
+							<up-icon name="arrow-right" color="#999999" size="32rpx"></up-icon>
+						</template>
+					</up-input>
 				</template>
 				<template v-else-if="item.type==='radio'">
 					<up-radio-group v-model="formData[item.key]" placement="column">
@@ -35,10 +36,15 @@
 						:multiple="item.multiple" :maxCount="item.maxCount" :accept='item.accept'
 						:previewFullImage="item.previewFullImage"></up-upload>
 				</template>
+				<template v-else>
+					<view>
+						<slot :name="item.key"></slot>
+					</view>
+				</template>
 
 			</up-form-item>
 
-			<slot :name="item.key"></slot>
+			<slot :name="`${item.key}-extend`"></slot>
 
 		</div>
 		<up-button @click="handleSubmit" class="mt20" type="warning" v-if="isFooter">提交</up-button>
@@ -131,11 +137,22 @@
 		})
 	}
 
+	const setData = (data) => {
+		list.forEach(item => {
+			const { key } = item
+			formData[key] = data[key] || null
+		})
+	}
+
+	const getData = () => {
+		return formData
+	}
+
 	const validate = () => {
 		return dFormRef.value.validate()
 	}
 
-	defineExpose({ validate })
+	defineExpose({ setData, getData, validate })
 </script>
 
 <style>
diff --git a/otherPages/authentication/components/popupSelect.vue b/otherPages/authentication/components/popupSelect.vue
new file mode 100644
index 0000000..dad2f22
--- /dev/null
+++ b/otherPages/authentication/components/popupSelect.vue
@@ -0,0 +1,93 @@
+<template>
+  <up-popup 
+    :show="show" 
+    round="16rpx"
+    @open="open" 
+    @close="close"
+  >
+    <view class="popup">
+      <view class="popup-header">
+        <text class="popup-title">{{ props.title }}</text>
+        <text class="popup-desc">{{ props.desc }}</text>
+      </view>
+      <view class="popup-content">
+        <slot></slot>
+      </view>
+      <view class="popup-footer">
+        <slot name="footer">
+          <button class="flex-rowc btn" plain @click="onConfirm">确定</button>
+        </slot>
+      </view>
+    </view>
+  </up-popup>
+</template>
+
+<script setup>
+  import { ref } from 'vue'
+
+  const props = defineProps({
+    title: {
+      type: String,
+      default: '',
+    },
+    desc: {
+      type: String,
+      default: '',
+    }
+  })
+
+  const emit = defineEmits(['confirm'])
+
+  const show = ref(false)
+
+  const open = () => {
+    show.value = true
+  }
+
+  const close = () => {
+    show.value = false
+  }
+
+  const onConfirm = () => {
+    emit('confirm')
+    close()
+  }
+
+  defineExpose({ open, close })
+</script>
+
+<style lang="scss" scoped>
+
+  .popup {
+    padding: 45rpx 28rpx 28rpx 28rpx;
+
+    &-header {
+      margin-bottom: 35rpx;
+    }
+
+    &-title {
+      color: #000000;
+      font-weight: 700;
+      font-size: 30rpx;
+      line-height: 40rpx;
+    }
+
+    &-desc {
+      color: #C7C7C7;
+      font-size: 22rpx;
+    }
+  }
+
+  .btn {
+    width: 594rpx;
+    height: auto;
+    padding: 27rpx 0;
+    box-sizing: border-box;
+    border: none;
+    background-color: #FFBF60;
+    color: #FFFFFF;
+    font-size: 30rpx;
+    line-height: 40rpx;
+    border-radius: 41rpx;
+  }
+</style>
\ No newline at end of file
diff --git a/otherPages/authentication/connectAddress/detail.vue b/otherPages/authentication/connectAddress/detail.vue
new file mode 100644
index 0000000..e738748
--- /dev/null
+++ b/otherPages/authentication/connectAddress/detail.vue
@@ -0,0 +1,12 @@
+<template>
+  <view class="page">
+
+  </view>
+</template>
+
+<script setup>
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/otherPages/authentication/connectAddress/index.vue b/otherPages/authentication/connectAddress/index.vue
index d3dbdc0..c546a5a 100644
--- a/otherPages/authentication/connectAddress/index.vue
+++ b/otherPages/authentication/connectAddress/index.vue
@@ -1,53 +1,123 @@
 <template>
-	<view class="tips flex-rowl">
-		<image src="@/static/images/ydd/icon2.png" mode=""></image>
-		<text class="color-ffb size-22 ml16">普通喂养员可设置3个接单地址，优选喂养员可设置5个接单地址</text>
-	</view>
-	<view class="li bg-fff">
-		<view class="size-30">
-			四季阳光花城
-		</view>
-		<view class="size-22 color-777 mt16">
-			接单范围：10km
+	<view class="page">
+		<view class="tips flex-rowl">
+			<image src="@/static/images/ydd/icon2.png" mode=""></image>
+			<text class="color-ffb size-22 ml16">普通喂养员可设置3个接单地址，优选喂养员可设置5个接单地址</text>
 		</view>
-		<view class="content mt16">
-			<view class="flex-between">
-				<text class="size-22 color-999">不接单日期</text>
-				<view class="flex-rowr">
-					<text class="size-22 color-ccc">修改</text>
-					<image src="@/static/images/ydd/right.png" mode="widthFix" style="width: 20rpx;"></image>
+		<view v-if="list.length">
+			<view class="li bg-fff"
+				v-for="(item, index) in list"
+				:key="`address-${index}`"
+			>
+				<view class="size-30">
+					{{ item.area }}
 				</view>
-			</view>
-			<view class="color-999 size-22 mt16">
-				共0天：暂无不可接单日期
-			</view>
-		</view>
-
-		<view class="flex-between mt16">
-			<view class="flex-rowl">
-				<view class="color-ffb size-22">
-					接单中
+				<view class="size-22 color-777 mt16">
+					{{ `接单范围：${item.distance}km` }}
 				</view>
-				<switch checked="true" color="#FFBF60" style="transform: scale(0.6);" />
-			</view>
-			<view class="flex-rowr">
-				<view class="flex-rowl">
-					<image src="@/static/images/ydd/edit.png" mode="widthFix" style="width: 20rpx;"></image>
-					<text class="size-22 color-777 ml10">编辑</text>
+				<view class="content mt16">
+					<view class="flex-between">
+						<text class="size-22 color-999">不接单日期</text>
+						<view class="flex-rowr">
+							<text class="size-22 color-ccc">修改</text>
+							<image src="@/static/images/ydd/right.png" mode="widthFix" style="width: 20rpx;"></image>
+						</view>
+					</view>
+					<view class="color-999 size-22 mt16 flex-rowl">
+						<text>
+							{{ `共${item.disabledDate.length}天：` }}
+						</text>
+						<text class="text-ellipsis" style="flex: 1;">
+							{{ getDisabledDateDesc(item.disabledDate) }}
+						</text>
+					</view>
 				</view>
-				<view class="flex-rowl" style="margin-left: 50rpx;">
-					<image src="@/static/images/ydd/cancel.png" mode="widthFix" style="width: 20rpx;"></image>
-					<text class="size-22 color-777 ml10">删除</text>
+
+				<view class="flex-between mt16">
+					<view class="flex-rowl">
+						<view class="color-ffb size-22">
+							接单中
+						</view>
+						<switch checked="true" color="#FFBF60" style="transform: scale(0.6);" />
+					</view>
+					<view class="flex-rowr">
+						<view class="flex-rowl">
+							<image src="@/static/images/ydd/edit.png" mode="widthFix" style="width: 20rpx;"></image>
+							<text class="size-22 color-777 ml10">编辑</text>
+						</view>
+						<view class="flex-rowl" style="margin-left: 50rpx;">
+							<image src="@/static/images/ydd/cancel.png" mode="widthFix" style="width: 20rpx;"></image>
+							<text class="size-22 color-777 ml10">删除</text>
+						</view>
+					</view>
 				</view>
 			</view>
 		</view>
+		<view v-else class="flex-rowc">
+			<image class="icon-empty" src="../static/connectAddress/icon-empty.png" mode="widthFix"></image>
+		</view>
+		
+		<view class="footer-btn">
+			<view class="btn" @click="toAdd">
+				新增接单地址
+			</view>
+		</view>
 	</view>
 </template>
 
-<script>
+<script setup>
+	import { onShow } from '@dcloudio/uni-app'
+	import dayjs from 'dayjs'
+	import { usePageList } from "@/utils/pageList";
+		
+	// todo
+	const { list, total, getData } = usePageList()
+
+	onShow(() => {
+		// todo: delte test data
+		
+		list.value = [
+			{
+				area: '四季阳光花城',
+				distance: 10,
+				disabledDate: [],
+			},
+			{
+				area: '四季阳光花城',
+				distance: 10,
+				disabledDate: ['02-19', '02-20', '02-21', '02-22', '02-23', '02-24', '02-25', '02-26'],
+			},
+		]
+
+		console.log('--onShow', list.value)
+
+	})
+
+	const getDisabledDateDesc = (dateArr) => {
+		if (!dateArr.length) {
+			return '暂无不可接单日期'
+		}
+
+		return dateArr.map(date => dayjs(date).format('MM-DD')).join('、')
+	}
+
+	const toAdd = () => {
+		uni.navigateTo({
+			url: "/otherPages/authentication/connectAddress/detail"
+		})
+	}
+
 </script>
 
 <style lang="scss" scoped>
+	.page {
+		.icon-empty {
+			width: 259rpx;
+			height: auto;
+			margin-top: 240rpx;
+		}
+	}
+
 	.content {
 		background-color: #F3F3F3;
 		border-radius: 20rpx;
@@ -55,7 +125,7 @@
 	}
 
 	.li {
-		margin: 16rpx 24rpx;
+		margin: 16rpx 24rpx 0 24rpx;
 		border-radius: 20rpx;
 		padding: 24rpx;
 	}
@@ -69,4 +139,10 @@
 			height: 32rpx;
 		}
 	}
+
+	.text-ellipsis{
+		overflow:hidden; //超出的文本隐藏
+		text-overflow:ellipsis; //溢出用省略号显示
+		white-space:nowrap; //溢出不换行
+	}
 </style>
\ No newline at end of file
diff --git a/otherPages/authentication/examination/end.vue b/otherPages/authentication/examination/end.vue
index 523e00d..cc2bb15 100644
--- a/otherPages/authentication/examination/end.vue
+++ b/otherPages/authentication/examination/end.vue
@@ -22,11 +22,12 @@
 								</view>
 							</view>
 							<view class="info">
+								<!-- todo: 实名认证 -->
 								<view class="size-22 color-777">
-									真实姓名：刘思恩
+									{{ `真实姓名：${form.name}` }}
 								</view>
 								<view class="size-22 color-777">
-									身份证号码：48234792837458923
+									{{ `身份证号码：${form.idCard}` }}
 								</view>
 							</view>
 						</view>
@@ -44,9 +45,13 @@
 									<image class="img" src="@/static/images/ydd/end13.png" mode="widthFix"></image>
 									<text class="size-30 color-000 fw700">履约保证金缴纳</text>
 								</view>
-								<view class="size-22 color-ffb jiao">
+								<view class="size-22 color-ffb jiao" @click="jumpToBond">
 									去缴纳
 								</view>
+								<!-- todo -->
+								<!-- <view class="size-22 highlight">
+									已完成
+								</view> -->
 							</view>
 							<view class="info color-777 size-22">
 								请缴纳履约保证金，保证金注销时可申请退还
@@ -66,11 +71,11 @@
 									<image class="img" src="@/static/images/ydd/end1(4).png" mode="widthFix"></image>
 									<text class="size-30 color-000 fw700">添加客服微信</text>
 								</view>
-								<view class="size-22 color-ffb jiao">
-									去缴纳
+								<view class="size-22 highlight">
+									请自行添加
 								</view>
 							</view>
-							<view class="info color-777 size-22 flex-rowc">
+							<view class="info color-777 size-22 flex-rowl">
 								<text class="size-22 color-777">微信二维码</text>
 								<image src="" mode="" style="width: 150rpx;height: 150rpx;"></image>
 							</view>
@@ -89,20 +94,25 @@
 									<image class="img" src="@/static/images/ydd/end13.png" mode="widthFix"></image>
 									<text class="size-30 color-000 fw700">服务工具准备</text>
 								</view>
-								<view class="size-22">
-									查看工具包
+								<!-- todo -->
+								<view class="size-22 flex-rowr">
+									<text>查看工具包</text>
+									<up-icon name="arrow-down" color="#7F7F7F" size="17rpx" style="margin-left: 5rpx;"></up-icon>
 								</view>
 							</view>
 							<view class="info color-777 size-22">
 								<view class="flex-between">
 									<text class="size-22">所在地区:</text>
-									<input type="text" placeholder="请选择" />
+                  <view plain class="flex-rowr" @click="selectAddr">
+										<text>{{ form.area ? form.area : '请选择' }}</text>
+										<up-icon style="margin-left: 22rpx;" name="arrow-down" color="#7F7F7F" size="21rpx"></up-icon>
+                  </view>
 								</view>
 							</view>
 							<view class="info color-777 size-22 mt20">
 								<view class="flex-between">
 									<text class="size-22">详细地址:</text>
-									<input type="text" placeholder="请输入道路、小区、门牌号等" />
+									<input v-model="form.address" type="text" placeholder="请输入道路、小区、门牌号等" />
 								</view>
 							</view>
 						</view>
@@ -119,69 +129,64 @@
 			</view>
 
 		</view>
-		<image src="@/static/images/ydd/chat.png" mode="widthFix" class="chat"></image>
+		<button plain class="chat" open-type="contact">
+			<image src="@/static/images/ydd/chat.png" mode="widthFix"></image>
+		</button>
 	</view>
 </template>
 
 <script setup>
-	import {
-		reactive
-	} from "vue";
+	import { reactive } from "vue";
+	import { onShow } from '@dcloudio/uni-app'
+
 	import stepProgress from '../components/stepProgress.vue';
 
+	const form = reactive({
+		name: null,
+		idCard: null,
+		area: null,
+		latitude: null,
+		longitude: null,
+		address: null,
+	})
+
+	onShow(() => {
+		// todo: delete test data
+
+		form.name = '李*乐'
+		form.idCard = '4211********5624'
 
-	const state = reactive({
-		list: [{
-				type: "input",
-				label: "姓名",
-				key: "name",
-				placeholder: "请输入您的真实姓名",
-			},
-			{
-				type: "input",
-				label: "身份证号",
-				key: "idCard",
-				placeholder: "请输入您的真实身份证号",
-			},
-			{
-				type: "radio",
-				label: "性别",
-				key: "sex",
-				options: [{
-						name: "男"
-					},
-					{
-						name: "女"
-					}
-				]
-			},
-			{
-				type: "input",
-				label: "年龄",
-				key: "gender",
-				placeholder: "请输入您的年龄",
-			},
-			{
-				type: "input",
-				label: "养宠经验",
-				key: "shij",
-				placeholder: "请输入您的养宠年限",
-				unit: "年"
-			},
-			{
-				type: "select",
-				label: "是否有专业执照",
-				key: "shij",
-				placeholder: "请选择",
-				options: [{
-					name: "是"
-				}, {
-					name: "没有"
-				}]
-			},
-		]
 	})
 
+	const jumpToBond = () => {
+		uni.navigateTo({
+			url: "/otherPages/myOrdersManage/bond/index"
+		})
+	}
+
+	const setAddress = (res) => {
+		//经纬度信息
+		form.latitude = res.latitude
+		form.longitude = res.longitude
+
+		if (!res.address && res.name) { //用户直接选择城市的逻辑
+			return form.area = res.name
+		}
+		if (res.address || res.name) {
+			return form.area = res.address + res.name
+		}
+		form.area = '' //用户啥都没选就点击勾选
+	}
+
+	const selectAddr = () => {
+		console.log('--selectAddr')
+		uni.chooseLocation({
+			success: function(res) {
+				setAddress(res)
+			}
+		})
+	}
+
 	const onClick = () => {
 		// todo
 	}
@@ -189,12 +194,18 @@
 
 <style lang="scss" scoped>
 	.chat {
-		width: 96rpx;
 		position: fixed;
 		right: 20rpx;
 		bottom: 400rpx;
 		z-index: 9999;
-		background-color: #fff;
+		border: none;
+		padding: 0;
+		width: 97rpx;
+		height: auto;
+
+		image {
+			width: 100%;
+		}
 	}
 
 	.line {
@@ -356,4 +367,8 @@
 			}
 		}
 	}
+
+	.highlight {
+		color: #FFBF60;
+	}
 </style>
\ No newline at end of file
diff --git a/otherPages/authentication/examination/start.vue b/otherPages/authentication/examination/start.vue
index 4fc9131..be64bbf 100644
--- a/otherPages/authentication/examination/start.vue
+++ b/otherPages/authentication/examination/start.vue
@@ -6,9 +6,9 @@
 				<view class="com-title size-32 fw700 flex-rowl">
 					您选择的宠物类型
 				</view>
-				<image class="mt32" v-if="petType === 'cat'" src="../static/list/cat-active.png" mode="widthFix"></image>
-				<image class="mt32" v-else-if="petType === 'dog'" src="../static/list/dog-active.png" mode="widthFix"></image>
-				<image class="mt32" v-else-if="petType === 'special-pet'" src="../static/list/special-pet-active.png" mode="widthFix"></image>
+				<image class="mt32" v-if="petType === 'cat'" src="@/static/images/ydd/cat-active.png" mode="widthFix"></image>
+				<image class="mt32" v-else-if="petType === 'dog'" src="@/static/images/ydd/dog-active.png" mode="widthFix"></image>
+				<image class="mt32" v-else-if="petType === 'special-pet'" src="@/static/images/ydd/special-pet-active.png" mode="widthFix"></image>
 			</view>
 
 			<view class="text po-r bg-fff">
diff --git a/otherPages/authentication/list/index.vue b/otherPages/authentication/list/index.vue
index 345d42c..4975b07 100644
--- a/otherPages/authentication/list/index.vue
+++ b/otherPages/authentication/list/index.vue
@@ -53,20 +53,35 @@
 				<view class="flex-between wrap mt32">
 
 					<view class="type">
-						<image src="../static/list/cat.png" mode="widthFix" @click="onSelectPet('cat')"></image>
-						<image class="active" v-if="petType === 'cat'" src="../static/list/cat-active.png" mode="widthFix"></image>
+						<image src="@/static/images/ydd/cat.png" mode="widthFix" @click="onSelectPetType('cat')"></image>
+						<template v-if="petType === 'cat'">
+							<image class="active" src="@/static/images/ydd/cat-active.png" mode="widthFix"></image>
+							<view class="active-icon">
+								<up-icon name="checkmark-circle" color="#FFBF60" size="32rpx"></up-icon>
+							</view>
+						</template>
 					</view>
 
 					
 					<view class="type">
-						<image src="../static/list/dog.png" mode="widthFix" @click="onSelectPet('dog')"></image>
-						<image class="active" v-if="petType === 'dog'" src="../static/list/dog-active.png" mode="widthFix"></image>
+						<image src="@/static/images/ydd/dog.png" mode="widthFix" @click="onSelectPetType('dog')"></image>
+						<template v-if="petType === 'dog'">
+							<image class="active" src="@/static/images/ydd/dog-active.png" mode="widthFix"></image>
+							<view class="active-icon">
+								<up-icon name="checkmark-circle" color="#FFBF60" size="32rpx"></up-icon>
+							</view>
+						</template>
 					</view>
 
 					
 					<view class="type">
-						<image src="../static/list/special-pet.png" mode="widthFix" @click="onSelectPet('special-pet')"></image>
-						<image class="active" v-if="petType === 'special-pet'" src="../static/list/special-pet-active.png" mode="widthFix"></image>
+						<image src="@/static/images/ydd/special-pet.png" mode="widthFix" @click="onSelectPetType('special-pet')"></image>
+						<template v-if="petType === 'special-pet'">
+							<image class="active" src="@/static/images/ydd/special-pet-active.png" mode="widthFix"></image>
+							<view class="active-icon">
+								<up-icon name="checkmark-circle" color="#FFBF60" size="32rpx"></up-icon>
+							</view>
+						</template>
 					</view>
 
 				</view>
@@ -84,6 +99,8 @@
 
 <script setup>
 	import { ref, reactive } from "vue";
+	import { ossUpload } from '@/utils/oss-upload/oss/index.js'
+
 	import dForm from "@/components/dForm/index.vue"
 	import stepProgress from '../components/stepProgress.vue';
 
@@ -175,15 +192,22 @@
 			value: 4,
 		},
 	]
-	const afterRead = () => {
-		// todo
-	}
+	const afterRead = (event) => {
+		event.file.forEach(n => {
+			ossUpload(n.url)
+				.then(url => {
+					licenseData.fileList.push({
+						url
+					})
+				})
+		})
+	};
 	const deletePic = (event) => {
 		licenseData.fileList.splice(event.index, 1);
 	};
 
 	const petType = ref()
-	const onSelectPet = (type) => {
+	const onSelectPetType = (type) => {
 		petType.value = type
 	}
 
@@ -248,6 +272,12 @@
 			position: absolute;
 			top: 0;
 			left: 0;
+			
+      &-icon {
+  			position: absolute;
+        top: 14rpx;
+        right: 18rpx;
+      }
 		}
 	}
 
diff --git a/otherPages/authentication/serve/index.vue b/otherPages/authentication/serve/index.vue
index 7939c0a..857b5e6 100644
--- a/otherPages/authentication/serve/index.vue
+++ b/otherPages/authentication/serve/index.vue
@@ -1,65 +1,122 @@
 <template>
-	<view class="box bg-fff">
-		<view class="size-22 color-ffb tip">
-			❗完善服务信息和接单状态后，才可以开始接单哦！
+	<view class="page bg-fff">
+		<view class="size-22 color-ffb flex-rowl tip">
+			<up-icon class="icon" name="error-circle" color="#FFBF60" size="36rpx"></up-icon>
+			<text>完善服务信息和接单状态后，才可以开始接单哦！</text>
 		</view>
-		<view class="title mt24">
-			基本资料
+		<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="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="handleSubmit"></DForm>
+			</view>
 		</view>
-		<view class="flex-colc">
-			<image class="head" src="@/static/images/ydd/img.png" mode="widthFix"></image>
-			<text class="size-28 color-999 mt10">点击更换头像</text>
+
+		<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="handleSubmit">
+					<!-- 服务记录 -->
+					<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>
-		<DForm :list="state.list" @submit="handleSubmit"></DForm>
 
-		<view class="title mt24 flex-rowl">
-			展示信息
-			<text class="size-22 color-ffb fw700">(重要)</text>
+		<view class="info">
+			<view class="title mt24 flex-rowl">
+				服务资料
+			</view>
+			<view class="form">
+				<DForm ref="serveInfoRef" :list="state.serveInfoList" @input="handleSubmit">
+					<!-- 服务宠物类型 -->
+					<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>
-		<DForm :list="state.list1" @submit="handleSubmit"></DForm>
 
-		<view class="title mt24 flex-rowl">
-			服务资料
+		<view class="size-24 color-ffb flex-rowc mt32 pb28">
+			伴宠师查看服务酬劳、服务时长等规则
 		</view>
-		<DForm :list="state.list2" @submit="handleSubmit"></DForm>
-	</view>
-	<view class="size-24 color-ffb flex-rowc mt32 pb28">
-		伴宠师查看服务酬劳、服务时长等规则
+
+		<popupTypeSelect ref="popupTypeSelectRef" v-model="form.type" ></popupTypeSelect>
+
+		<popupServeSelect ref="popupServeSelectRef" v-model="form.serve" :options="serveOptions" ></popupServeSelect>
+
 	</view>
 </template>
 
 <script setup>
+	import { ref, reactive, computed } from "vue";
+	import { onShow } from '@dcloudio/uni-app'
+	import { ossUpload } from '@/utils/oss-upload/oss/index.js'
+
 	import DForm from "@/components/dForm/index.vue"
-	import {
-		reactive
-	} from "vue";
+	import popupTypeSelect from "./popupTypeSelect.vue";
+	import popupServeSelect from "./popupServeSelect.vue";
 
+	const form = reactive({
+		headImage: null,
+		type: [],
+		serve: [],
+	})
+
+	const onChooseAvatar = (res) => {
+		ossUpload(res.target.avatarUrl)
+		.then(url => {
+			form.headImage = url
+		})
+	}
+
+	const baseInfoRef = ref()
+	const displayInfoRef = ref()
+	const serveInfoRef = ref()
 
 	const state = reactive({
-		list2: [{
-				type: "select",
-				label: "服务宠物类型",
-				key: "type",
-				placeholder: "请选择",
-				options: [{
-						name: "大兴区"
-					},
-					{
-						name: "小型犬"
-					}
-				]
+		baseInfoList: [{
+				type: "input",
+				label: "昵称",
+				key: "name",
+				placeholder: "请输入",
 			},
 			{
 				type: "input",
-				label: "基础服务",
-				unit: "年",
-				key: "base",
-				placeholder: "宠物喂养上门遛狗",
+				label: "手机号",
+				key: "idCard",
+				placeholder: "请输入",
 			},
 			{
 				type: "select",
-				label: "增值服务",
-				key: "zenz",
+				label: "性别",
+				key: "sex",
 				placeholder: "请选择",
 				options: [{
 						name: "男"
@@ -70,7 +127,7 @@
 				]
 			}
 		],
-		list1: [{
+		displayInfoList: [{
 				type: "input",
 				label: "个人简介",
 				key: "jianjie",
@@ -84,7 +141,7 @@
 				placeholder: "请输入",
 			},
 			{
-				type: "select",
+				type: "custom",
 				label: "服务记录",
 				key: "jilu",
 				placeholder: "请选择",
@@ -97,65 +154,208 @@
 				]
 			}
 		],
-		list: [{
-				type: "input",
-				label: "昵称",
-				key: "name",
-				placeholder: "请输入",
+		serveInfoList: [{
+				type: "custom",
+				label: "服务宠物类型",
+				key: "type",
+				placeholder: "请选择",
 			},
 			{
 				type: "input",
-				label: "手机号",
-				key: "idCard",
-				placeholder: "请输入",
+				label: "基础服务",
+				unit: "年",
+				key: "base",
+				placeholder: "宠物喂养上门遛狗",
 			},
 			{
-				type: "select",
-				label: "性别",
-				key: "sex",
+				type: "custom",
+				label: "增值服务",
+				key: "zenz",
 				placeholder: "请选择",
-				options: [{
-						name: "男"
-					},
-					{
-						name: "女"
-					}
-				]
 			}
-		]
+		],
 	})
-	const handleSubmit = () => {}
+
+	onShow(() => {
+		// todo: fetch data and init data
+	})
+
+	const handleSubmit = () => {
+		// todo
+	}
+
+	const jumpToServeRecord = () => {
+		uni.navigateTo({
+			url: "/otherPages/authentication/serve/record"
+		})
+	}
+
+	const popupTypeSelectRef = ref()
+	const openTypeSelectPopup = () => {
+		popupTypeSelectRef.value.open()
+	}
+	const typeDesc = computed(() => {
+		const typeCodes = form.type
+		if (!typeCodes.length) {
+			return '请选择'
+		}
+		
+		let descArr = typeCodes.reduce((arr, item) => {
+			switch(item) {
+				case 'cat':
+					arr.push('猫咪')
+					break
+				case 'dog':
+					arr.push('狗狗')
+					break
+				case 'special-pet':
+					arr.push('异宠')
+					break
+				default:
+					break
+			}
+
+			return arr
+		}, [])
+
+		return descArr.join('、')
+	})
+
+	const popupServeSelectRef = ref()
+	const serveOptions = reactive([
+		{
+			title: '陪玩/遛狗',
+			desc: '外出遛狗或者陪玩，10mins/次',
+			value: 0,
+		},
+		{
+			title: '一天多次',
+			desc: '每额外上门一次，收取基础服务费用的80%',
+			value: 1,
+		},
+		{
+			title: '护理',
+			desc: '清洁宠物耳道、眼部、鼻部以及梳毛，10mins/次',
+			value: 2,
+		},
+		{
+			title: '提前熟悉',
+			desc: '提前上门熟悉，购买此服务支持免费更换伴宠师1次',
+			value: 3,
+		},
+		{
+			title: '清洁',
+			desc: '清洗砂盆或其他区域卫生，15mins/次',
+			value: 4,
+		},
+		{
+			title: '喂药',
+			desc: '将药品喂入宠物口中',
+			value: 5,
+		},
+		{
+			title: '上药',
+			desc: '将药品放入宠物水粮、或者涂抹在皮肤外表',
+			value: 6,
+		},
+		{
+			title: '打针',
+			desc: '兽医上门打针，自备药品',
+			value: 7,
+		},
+		{
+			title: '在线问诊',
+			desc: '在线问诊在职兽医健康问题',
+			value: 8,
+		},
+		{
+			title: '线下体察',
+			desc: '上门外表体查，给予宠物健康咨询',
+			value: 9,
+		},
+	])
+	const openServeSelectPopup = () => {
+		popupServeSelectRef.value.open()
+	}
+	const serveDesc = computed(() => {
+		const serveCodes = form.serve
+		if (!serveCodes.length) {
+			return '请选择'
+		}
+		
+		let descArr = serveCodes.reduce((arr, item) => {
+			const desc = serveOptions.find(option => option.value === item)?.title
+
+			arr.push(desc)
+
+			return arr
+		}, [])
+
+		return descArr.join('、')
+	})
+
 </script>
 
 <style lang="scss" scoped>
+
+	.page {
+		padding-top: 16rpx;
+
+		.tip {
+			background-color: rgba($color: #FFBF60, $alpha: 0.16);
+			padding: 13rpx 22rpx;
+			margin: 0 28rpx 37rpx 28rpx;
+
+			.icon {
+				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: block;
+			display: inline-block;
 			content: "";
 			width: 10rpx;
-			border-radius: 10rpx;
-			height: 34rpx;
+			border-radius: 5rpx;
+			height: 33rpx;
 			background-color: #FFBF60;
-			margin-right: 15rpx;
+			margin-right: 7rpx;
 		}
 	}
 
-	.box {
-		padding: 24rpx 36rpx;
+	.form {
+		padding: 0 22rpx;
 
-		.tip {
-			background-color: rgb(255, 245, 229);
-			padding: 15rpx;
+		:deep(.form-item){
+			padding-left: 24rpx;
+			padding-right: 30rpx;
+			box-sizing: border-box;
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/otherPages/authentication/serve/popupServeSelect.vue b/otherPages/authentication/serve/popupServeSelect.vue
new file mode 100644
index 0000000..1989f2e
--- /dev/null
+++ b/otherPages/authentication/serve/popupServeSelect.vue
@@ -0,0 +1,116 @@
+<template>
+  <popupSelect
+    ref="popupRef"
+    title="请选择增值服务"
+    @confirm="onConfirm"
+  >
+    <view class="content">
+      <view class="flex-between option"
+        v-for="(option, index) in props.options"
+        :key="`option-${index}`"
+        @click="onSelectServe(option.value)"
+      >
+        <view class="option-info">
+          <view class="option-title">{{ option.title }}</view>
+          <view class="option-desc">{{ option.desc }}</view>
+        </view>
+        <up-icon 
+          name="checkmark-circle-fill" 
+          :color="serves.includes(option.value) ? '#FFBF60' : '#BDBDBD'" 
+          size="46rpx"
+        ></up-icon>
+      </view>
+    </view>
+  </popupSelect>
+</template>
+
+<script setup>
+  import { ref } from 'vue'
+
+  import popupSelect from '../components/popupSelect.vue';
+
+  const props = defineProps({
+    modelValue: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    options: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+  })
+
+  const emit = defineEmits(['update:modelValue'])
+
+  const serves = ref([])
+
+  const onSelectServe = (serve) => {
+    const oldServes = serves.value
+    let newServes = []
+
+    if (oldServes.includes(serve)) {
+      newServes = oldServes.filter(item => item !== serve)
+    } else {
+      newServes = oldServes.concat(serve)
+    }
+
+    serves.value = newServes
+  }
+
+  const popupRef = ref()
+
+  const open = () => {
+    serves.value = props.modelValue
+    popupRef.value.open()
+  }
+
+  const close = () => {
+    popupRef.value.close()
+  }
+  
+  const onConfirm = () => {
+    emit('update:modelValue', serves.value)
+  }
+
+  defineExpose({ open, close })
+
+</script>
+
+<style lang="scss" scoped>
+
+  .content {
+    padding-bottom: 25rpx;
+  }
+
+  .option {
+    padding: 0 49rpx 0 25rpx;
+    background-color: #FFF5E5;
+    border-radius: 8rpx;
+
+    & + & {
+      margin-top: 12rpx;
+    }
+
+    &-info {
+      padding: 7rpx 0 13rpx 0;
+    }
+
+    &-title {
+      color: #000000;
+      font-size: 28rpx;
+      line-height: 37rpx;
+    }
+
+    &-desc {
+      margin-top: 12rpx;
+      color: #707070;
+      font-size: 20rpx;
+      line-height: 26rpx;
+    }
+  }
+
+</style>
\ No newline at end of file
diff --git a/otherPages/authentication/serve/popupTypeSelect.vue b/otherPages/authentication/serve/popupTypeSelect.vue
new file mode 100644
index 0000000..c4af8db
--- /dev/null
+++ b/otherPages/authentication/serve/popupTypeSelect.vue
@@ -0,0 +1,120 @@
+<template>
+  <popupSelect
+    ref="popupRef"
+    title="请选择服务宠物类型"
+    desc="（可多选）"
+    @confirm="onConfirm"
+  >
+    <view class="flex-between content">
+
+      <view class="type" @click="onSelectPetType('cat')">
+        <image src="@/static/images/ydd/cat.png" mode="widthFix"></image>
+        <template v-if="petTypes.includes('cat')">
+          <image class="active" src="@/static/images/ydd/cat-active.png" mode="widthFix"></image>
+          <view class="active-icon">
+            <up-icon name="checkmark-circle" color="#FFBF60" size="32rpx"></up-icon>
+          </view>
+        </template>
+      </view>
+
+      <view class="type" @click="onSelectPetType('dog')">
+        <image src="@/static/images/ydd/dog.png" mode="widthFix"></image>
+        <template v-if="petTypes.includes('dog')">
+          <image class="active" src="@/static/images/ydd/dog-active.png" mode="widthFix"></image>
+          <view class="active-icon">
+            <up-icon name="checkmark-circle" color="#FFBF60" size="32rpx"></up-icon>
+          </view>
+        </template>
+      </view>
+
+      <view class="type" @click="onSelectPetType('special-pet')">
+        <image src="@/static/images/ydd/special-pet.png" mode="widthFix"></image>
+        <template v-if="petTypes.includes('special-pet')">
+          <image class="active" src="@/static/images/ydd/special-pet-active.png" mode="widthFix"></image>
+          <view class="active-icon">
+            <up-icon name="checkmark-circle" color="#FFBF60" size="32rpx"></up-icon>
+          </view>
+        </template>
+      </view>
+
+    </view>
+  </popupSelect>
+</template>
+
+<script setup>
+  import { ref } from 'vue'
+
+  import popupSelect from '../components/popupSelect.vue';
+
+  const props = defineProps({
+    modelValue: {
+      type: Array,
+      default() {
+        return []
+      }
+    }
+  })
+
+  const emit = defineEmits(['update:modelValue'])
+
+  const petTypes = ref([])
+
+  const onSelectPetType = (type) => {
+    const oldTypes = petTypes.value
+    let newTypes = []
+
+    if (oldTypes.includes(type)) {
+      newTypes = oldTypes.filter(item => item !== type)
+    } else {
+      newTypes = oldTypes.concat(type)
+    }
+
+    petTypes.value = newTypes
+  }
+
+  const popupRef = ref()
+
+  const open = () => {
+    petTypes.value = props.modelValue
+    popupRef.value.open()
+  }
+
+  const close = () => {
+    popupRef.value.close()
+  }
+  
+  const onConfirm = () => {
+    emit('update:modelValue', petTypes.value)
+  }
+
+  defineExpose({ open, close })
+
+</script>
+
+<style lang="scss" scoped>
+
+  .content {
+    padding: 46rpx 26rpx;
+  }
+
+  .type {
+		width: 190rpx;
+		position: relative;
+
+		image {
+			width: 100%;
+		}
+
+		.active {
+			position: absolute;
+			top: 0;
+			left: 0;
+
+      &-icon {
+  			position: absolute;
+        top: 14rpx;
+        right: 18rpx;
+      }
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/otherPages/authentication/serve/record.vue b/otherPages/authentication/serve/record.vue
index 5ae58b7..6428ba4 100644
--- a/otherPages/authentication/serve/record.vue
+++ b/otherPages/authentication/serve/record.vue
@@ -1,28 +1,49 @@
 <template>
-	<view class="box">
+	<view class="page">
 		<view class="flex-rowl">
 			<view class="size-28 color-ffb fw700 tab">
 				全部记录
 			</view>
 		</view>
-		<view class="flex-rowc">
+		<view v-if="list.length">
+
+		</view>
+		<view v-else class="flex-rowc">
 			<image src="@/static/images/ydd/empy.png" mode="widthFix"></image>
 		</view>
-	</view>
-	<view class="footer" @click="toUp">
-		立即上传
+
+		<view class="footer-btn">
+			<view class="btn" @click="toUp">
+				立即上传
+			</view>
+		</view>
 	</view>
 </template>
 
 <script setup>
-	const toUp = () => {
+	import { onShow } from '@dcloudio/uni-app'
+	import { usePageList } from "@/utils/pageList";
+		
+	// todo
+	const { list, total, getData } = usePageList()
+
+	onShow(() => {
+		// todo: delte test data
+		
+	})
 
+	const toUp = () => {
+		uni.navigateTo({
+			url: "/otherPages/authentication/serve/upload"
+		})
 	}
 </script>
 
 <style lang="scss" scoped>
-	.box {
-		padding: 24rpx;
+	.page {
+		min-height: 100vh;
+		padding: 24rpx 24rpx 144rpx 24rpx;
+		background-color: #fff;
 
 		.tab {
 			border-bottom: 4rpx solid #FFBF60;
diff --git a/otherPages/authentication/serve/upload.vue b/otherPages/authentication/serve/upload.vue
index bc6815c..4595db3 100644
--- a/otherPages/authentication/serve/upload.vue
+++ b/otherPages/authentication/serve/upload.vue
@@ -1,80 +1,91 @@
 <template>
-	<view class="tips color-ffb size-22">
-		注意:这段内容将会在您的喂养员个人主页，做为"服务案例”展示，并开放给其他铲屎官查看，请认真编辑哟！
-	</view>
-	<view class="li bg-fff">
-		<view class="title">
-			服务类型
-			<text class="size-22 color-999 ml10">可多选</text>
+	<view class="page">
+		<view class="tips color-ffb size-22">
+			注意:这段内容将会在您的喂养员个人主页，做为"服务案例”展示，并开放给其他铲屎官查看，请认真编辑哟！
 		</view>
-		<up-checkbox-group v-model="state.checkboxValue" placement="column" @change="checkboxChange">
-			<view class="flex-rowl mt40">
-				<up-checkbox shape="circle" class="mr10" :customStyle="{marginBottom: '8px'}"
-					v-for="(item, index) in checkboxList1" :key="index" :label="item.name" :name="item.name">
-				</up-checkbox>
+		<view class="li bg-fff">
+			<view class="title">
+				服务类型
+				<text class="size-22 color-999 ml10">可多选</text>
 			</view>
-		</up-checkbox-group>
-	</view>
-
-	<view class="li bg-fff">
-		<view class="title">
-			服务时间
+			<up-checkbox-group v-model="state.petType" @change="checkboxChange">
+				<view class="flex-between mt40" style="width: 100%;">
+					<up-checkbox shape="circle" class="mr10" :customStyle="{marginBottom: '8px'}"
+						v-for="(item, index) in petTypeOptions" :key="index" :label="item.name" :name="item.name">
+					</up-checkbox>
+				</view>
+			</up-checkbox-group>
 		</view>
-		<view class="flex-between mt16">
-			<text class="size-28 color-999">选择服务时间</text>
-			<view class="flex-rowr">
-				<input disabled type="text" placeholder="请选择" class="t-r size-28 mr10" />
-				<image src="@/static/images/ydd/bottom.png" mode="widthFix" style="width: 30rpx;"></image>
+
+		<view class="li bg-fff">
+			<view class="title">
+				服务时间
 			</view>
+			<view class="flex-between mt16">
+				<text class="size-28 color-999">选择服务时间</text>
+				<view class="flex-rowr" @click="openTimePicker">
+					<view class="t-r size-28 mr10" :class="[state.serveTime ? 'highlight' : '']">{{ serveTimeDesc }}</view>
+					<up-icon name="arrow-right" color="#999999" size="27rpx"></up-icon>
+				</view>
+			</view>
+			<up-datetime-picker
+				v-model="state.serveTime"
+				:show="showTimePicker"
+				mode="date"
+				:closeOnClickOverlay="true"
+				@close="closeTimePicker"
+				@cancel="closeTimePicker"
+				@confirm="closeTimePicker"
+			></up-datetime-picker>
 		</view>
-	</view>
 
-	<view class="li bg-fff">
-		<view class="title">
-			服务地点
-		</view>
-		<view class="flex-between mt16">
-			<text class="size-28 color-999">选择服务地点</text>
-			<view class="flex-rowr">
-				<input disabled type="text" placeholder="请选择" class="t-r size-28 mr10" />
-				<image src="@/static/images/ydd/bottom.png" mode="widthFix" style="width: 30rpx;"></image>
+		<view class="li bg-fff">
+			<view class="title">
+				服务地点
+			</view>
+			<view class="flex-between mt16">
+				<text class="size-28 color-999">选择服务地点</text>
+				<view class="flex-rowr" @click="jumpToSeletAddress">
+					<view class="t-r size-28 mr10" :class="[selectedAddress.address ? 'highlight' : '']">{{ selectedAddress.address || '请选择' }}</view>
+					<up-icon name="arrow-right" color="#999999" size="27rpx"></up-icon>
+				</view>
 			</view>
 		</view>
-	</view>
 
-	<view class="li bg-fff">
-		<view class="title">
-			文字记录
+		<view class="li bg-fff">
+			<view class="title">
+				文字记录
+			</view>
+			<textarea class="text" placeholder="请输入文字记录，可简单描述服务过程中发生的趣事，或夸奖一下服务宠物吧，10-100字"></textarea>
 		</view>
-		<textarea class="text" placeholder="请输入文字记录，可简单描述服务过程中发生的趣事，或夸奖一下服务宠物吧，10-100字"></textarea>
-	</view>
 
-	<view class="li bg-fff">
-		<view class="title">
-			图片记录
-		</view>
-		<view class="size-28 color-999 mt16">
-			请选择具有代表性的2-3张服务宠物图片，服务过程图片或视频截图，让铲屎官感受到您对毛孩子的爱吧
+		<view class="li bg-fff">
+			<view class="title">
+				图片记录
+			</view>
+			<view class="size-28 color-999 mt16">
+				请选择具有代表性的2-3张服务宠物图片，服务过程图片或视频截图，让铲屎官感受到您对毛孩子的爱吧
+			</view>
 		</view>
-	</view>
 
-	<view class="footer-box">
-		<view class="btn">
-			立即上传
+		<view class="footer-btn">
+			<view class="btn">
+				立即上传
+			</view>
 		</view>
 	</view>
 </template>
 
 <script setup>
-	import {
-		reactive
-	} from 'vue';
-
+	import { ref, reactive, computed } from 'vue';
+	import { onShow } from '@dcloudio/uni-app'
+	import dayjs from 'dayjs'
 
 	const state = reactive({
-		checkboxValue: []
+		petType: [],
+		serveTime: null,
 	})
-	const checkboxList1 = [{
+	const petTypeOptions = [{
 			name: '猫咪喂养',
 		},
 		{
@@ -86,9 +97,42 @@
 	]
 
 	const checkboxChange = () => {}
+
+	const showTimePicker = ref(false)
+	const openTimePicker = () => {
+		showTimePicker.value = true
+	}
+	const closeTimePicker = () => {
+		showTimePicker.value = false
+	}
+	const serveTimeDesc = computed(() => {
+		if (!state.serveTime) {
+			return '请选择'
+		}
+
+		return dayjs(state.serveTime).format('YYYY/MM/DD')
+	})
+
+	const selectedAddress = ref({})
+	const jumpToSeletAddress = () => {
+		// todo: check select from map or address book ?
+		
+		uni.navigateTo({
+			url: "/otherPages/authentication/connectAddress/index"
+		})
+	}
+
+	onShow(() => {
+		selectedAddress.value = uni.getStorageSync('serveAddress')
+	})
 </script>
 
 <style lang="scss" scoped>
+	.page {
+		min-height: 100vh;
+		padding-bottom: 144rpx;
+	}
+
 	.text {
 		padding: 16rpx;
 		background-color: #F3F3F3;
@@ -124,4 +168,8 @@
 			margin-right: 15rpx;
 		}
 	}
+
+	.highlight {
+		color: #FFBF60;
+	}
 </style>
\ No newline at end of file
diff --git a/otherPages/authentication/static/connectAddress/icon-empty.png b/otherPages/authentication/static/connectAddress/icon-empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..5352c68e3adcee297f5b7d7bddd3dbcfed2d72c2
GIT binary patch
literal 15637
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
QKWE^vq9(dh-YWcm0j?=RE&u=k

literal 0
HcmV?d00001

diff --git a/otherPages/myOrdersManage/bond/detail.vue b/otherPages/myOrdersManage/bond/detail.vue
index 4d902e7..1a6aa05 100644
--- a/otherPages/myOrdersManage/bond/detail.vue
+++ b/otherPages/myOrdersManage/bond/detail.vue
@@ -2,37 +2,85 @@
 	<!-- <div>保证金明细</div> -->
 	<view class="box">
 		<view class="top flex" :style="{ borderRadius: '31.5rpx' }">
-			<view class="income flex element" :style="{ borderRadius: '31.5rpx' }">
-				收入明细
-			</view>
-			<view class="income flex element" :style="{ borderRadius: '31.5rpx' }">
-				支出明细
+			<view 
+				class="income flex element" 
+				v-for="(tab, tIdx) in tabs"
+				:key="`tab-${tIdx}`"
+				:class="[queryParams.status === tab.value ? 'is-active' : '']" 
+			>
+				{{ tab.title }}
 			</view>
 		</view>
-		<view class="Recharge flex">
-			<view class="flex">
-				<image src="https://img1.baidu.com/it/u=3034232350,1041791648&fm=253&fmt=auto&app=138&f=PNG?w=500&h=500"
-					mode=""></image>
-				<view class="text1">
-					<view class="text2">
-						押金充值
-					</view>
-					<view>
-						2020-12-29 12:54:54
+		<view>
+			<view class="Recharge flex"
+				v-for="(item, index) in list"
+				:key="`record-${index}`"
+			>
+				<view class="flex">
+					<image src="https://img1.baidu.com/it/u=3034232350,1041791648&fm=253&fmt=auto&app=138&f=PNG?w=500&h=500"
+						mode=""></image>
+					<view class="text1">
+						<view class="text2">
+							{{ item.title }}
+						</view>
+						<view>
+							{{ item.createTime }}
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="text3">
-				¥200
+				<view class="text3">
+					{{ `¥${item.price}` }}
+				</view>
 			</view>
 		</view>
 	</view>
 </template>
 
-<script>
+<script setup>
+import { reactive } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+import { usePageList } from "@/utils/pageList";
+
+const tabs = reactive([
+	{
+		title: '收入明细',
+		value: '0',
+	},
+	{
+		title: '支出明细',
+		value: '1',
+	},
+])
+
+// todo
+const { queryParams, list, total, getData } = usePageList()
+
+onShow(() => {
+	list.value = [
+		{
+			title: '提现',
+			price: 168,
+			status: '1',
+			createTime: '2020-12-29 12:54:54'
+		},
+		{
+			title: '提现',
+			price: 168,
+			status: '1',
+			createTime: '2020-12-29 12:54:54'
+		},
+		{
+			title: '提现',
+			price: 168,
+			status: '1',
+			createTime: '2020-12-29 12:54:54'
+		},
+	]
+})
+
 </script>
 
-<style>
+<style lang="scss" scoped>
 	.box {
 		width: 750rpx;
 		height: 1452rpx;
@@ -47,10 +95,13 @@
 		background-color: #F3F3F3;
 	}
 
-	.element:hover {
+	.element {
+		border-radius: 32rpx;
 
-		background-color: #FFBF60;
-		color: white;
+		&.is-active {
+			background-color: #FFBF60;
+			color: white;
+		}
 	}
 
 	.income {
@@ -64,9 +115,10 @@
 
 
 	.Recharge {
-		padding: 3% 3% 0 2%;
+		padding: 20rpx 0;
 		box-sizing: border-box;
 		justify-content: space-between;
+		border-bottom: 1rpx solid #E0E0E0;
 	}
 
 	.flex {
diff --git a/otherPages/myOrdersManage/bond/index.vue b/otherPages/myOrdersManage/bond/index.vue
index 0976609..e6308a3 100644
--- a/otherPages/myOrdersManage/bond/index.vue
+++ b/otherPages/myOrdersManage/bond/index.vue
@@ -7,10 +7,10 @@
 					账户总览
 				</view>
 				<view class="level text4">
-					<view>
+					<view @click="jumpToDetail">
 						资金明细
 					</view>
-					<view class="line">
+					<view @click="jumpToRefund" class="line">
 						申请退还
 					</view>
 				</view>
@@ -18,9 +18,9 @@
 			<view class="level Recharge">
 				<view class="money level">
 					<text>¥</text>
-					<input type="text" />
+					<input v-model="money" type="text" />
 				</view>
-				<view class="text2" :style="{ borderRadius: '23.5rpx' }">
+				<view class="text2" :style="{ borderRadius: '23.5rpx' }" @click="onPay">
 					去充值
 				</view>
 			</view>
@@ -41,7 +41,27 @@
 
 </template>
 
-<script>
+<script setup>
+	import { ref } from 'vue'
+
+	const money = ref()
+
+	const jumpToDetail = () => {
+		uni.navigateTo({
+			url: "/otherPages/myOrdersManage/bond/detail"
+		})
+	}
+
+	const jumpToRefund = () => {
+		uni.navigateTo({
+			url: "/otherPages/myOrdersManage/bond/refund"
+		})
+	}
+
+	const onPay = () => {
+		// todo: wx pay
+	}
+
 </script>
 
 <style scoped lang="scss">
diff --git a/otherPages/myOrdersManage/detail/index.vue b/otherPages/myOrdersManage/bond/refund.vue
similarity index 69%
rename from otherPages/myOrdersManage/detail/index.vue
rename to otherPages/myOrdersManage/bond/refund.vue
index 0bf419c..5a38269 100644
--- a/otherPages/myOrdersManage/detail/index.vue
+++ b/otherPages/myOrdersManage/bond/refund.vue
@@ -6,22 +6,11 @@
 				<view class="">
 					账户总览
 				</view>
-				<view class="level text2">
-					<view>
-						资金明细
-					</view>
-					<view class="line">
-						申请退还
-					</view>
-				</view>
 			</view>
 			<view class="level Recharge">
 				<view class="money level">
 					<text>¥</text>
-					<input type="text" />
-				</view>
-				<view class="text3" :style="{ borderRadius: '23.5rpx' }">
-					去充值
+					<input v-model="money" type="text" />
 				</view>
 			</view>
 		</view>
@@ -47,37 +36,54 @@
 				《履约保证金&认证费协议》
 			</view>
 		</view>
-		<view class="buttom level" :style="{ borderRadius: '41rpx' }">
+		<view class="buttom level" :style="{ borderRadius: '41rpx' }" @click="onRefund">
 			<text>退还并注销伴宠师</text>
 		</view>
-		<!-- <up-popup :show="show" mode="top" @close="close" @open="open">
-			<view>
-				<text>人生若只如初见，何事秋风悲画扇</text>
+
+		<up-popup 
+			:show="popupVisible"
+			mode="center" 
+			bgColor="transparent"
+			@close="onPopupClose" 
+		>
+			<view class="popup">
+				<image class="popup-bg" src="../static/bond/bg-popup.png"></image>
+
+				<view class="flex-colc popup-content">
+					<text>您已申请退还，请联系服务顾问</text>
+
+					<image class="qr" :src="qrCodeImage" mode="widthFix"></image>
+				</view>
+
+				<view class="btn-close" @click="popupVisible = false">
+					<up-icon name="close-circle-fill" color="#ffffff" size="60rpx"></up-icon>
+				</view>
 			</view>
-		</up-popup> -->
+		</up-popup>
 	</view>
 </template>
 
 <script setup>
-	// import {
-	// 	ref
-	// } from 'vue';
-
-	// // 创建响应式数据  
-	// const show = ref(false);
-
-	// // 定义方法  
-	// function open() {
-	// 	// 打开逻辑，比如设置 show 为 true  
-	// 	show.value = true;
-	// 	// console.log('open');  
-	// }
-
-	// function close() {
-	// 	// 关闭逻辑，设置 show 为 false  
-	// 	show.value = false;
-	// 	// console.log('close');  
-	// }
+	import { ref } from 'vue'
+
+	const money = ref()
+	const qrCodeImage = ref()
+
+	const popupVisible = ref(false)
+
+	const onPopupClose = () => {
+		uni.reLaunch({
+			 url: '/pages/workbenchManage/index'
+		})
+	}
+
+	
+	const onRefund = () => {
+		// todo: subimt refund and fetch qrcode and open popup 
+
+		popupVisible.value = true
+	}
+
 </script>
 
 <style scoped lang="scss">
@@ -200,4 +206,40 @@
 		color: #FFFFFF;
 		font-size: 30rpx;
 	}
+
+	.popup {
+		width: 632rpx;
+		height: 835rpx;
+		position: relative;
+
+		&-bg,
+		&-content {
+			width: 100%;
+			height: 100%;
+		}
+
+		&-content {
+			position: absolute;
+			top: 0;
+			left: 0;
+
+			padding-top: 276rpx;
+			box-sizing: border-box;
+			color: #707070;
+			font-size: 28rpx;
+			line-height: 37rpx;
+
+			.qr {
+				margin-top: 89rpx;
+				width: 307rpx;
+				height: auto;
+			}
+		}
+
+		.btn-close {
+			position: absolute;
+			top: -27rpx;
+			right: -13rpx;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/otherPages/myOrdersManage/static/bond/bg-popup.png b/otherPages/myOrdersManage/static/bond/bg-popup.png
new file mode 100644
index 0000000000000000000000000000000000000000..654d8b974224bd94549c0f1ab4e7dfe3f78491a8
GIT binary patch
literal 18447
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
ZlisPX!*;*se!~ynh4Xe6`RCk!|36Ctxb*-4

literal 0
HcmV?d00001

diff --git a/pages.json b/pages.json
index d2fe40e..acb9e25 100644
--- a/pages.json
+++ b/pages.json
@@ -110,6 +110,11 @@
 				"style": {
 					"navigationBarTitleText": "接单地址"
 				}
+			}, {
+				"path": "connectAddress/detail",
+				"style": {
+					"navigationBarTitleText": "新增接单地址"
+				}
 			}]
 		},
 		{
@@ -208,14 +213,14 @@
 						"navigationBarTitleText": "保证金"
 					}
 				}, {
-					"path": "withdrawal/index",
+					"path": "bond/refund",
 					"style": {
-						"navigationBarTitleText": "提现"
+						"navigationBarTitleText": "保证金退还"
 					}
 				}, {
-					"path": "detail/index",
+					"path": "withdrawal/index",
 					"style": {
-						"navigationBarTitleText": "保证金退还"
+						"navigationBarTitleText": "提现"
 					}
 				}, {
 					"path": "transaction/index",
diff --git a/otherPages/authentication/static/list/cat-active.png b/static/images/ydd/cat-active.png
similarity index 100%
rename from otherPages/authentication/static/list/cat-active.png
rename to static/images/ydd/cat-active.png
diff --git a/otherPages/authentication/static/list/cat.png b/static/images/ydd/cat.png
similarity index 100%
rename from otherPages/authentication/static/list/cat.png
rename to static/images/ydd/cat.png
diff --git a/otherPages/authentication/static/list/dog-active.png b/static/images/ydd/dog-active.png
similarity index 100%
rename from otherPages/authentication/static/list/dog-active.png
rename to static/images/ydd/dog-active.png
diff --git a/otherPages/authentication/static/list/dog.png b/static/images/ydd/dog.png
similarity index 100%
rename from otherPages/authentication/static/list/dog.png
rename to static/images/ydd/dog.png
diff --git a/otherPages/authentication/static/list/special-pet-active.png b/static/images/ydd/special-pet-active.png
similarity index 100%
rename from otherPages/authentication/static/list/special-pet-active.png
rename to static/images/ydd/special-pet-active.png
diff --git a/otherPages/authentication/static/list/special-pet.png b/static/images/ydd/special-pet.png
similarity index 100%
rename from otherPages/authentication/static/list/special-pet.png
rename to static/images/ydd/special-pet.png