From 9739f49cab0b3feb46680c5fbe6dff07967d529e Mon Sep 17 00:00:00 2001
From: Fox-33 <1466778434@qq.com>
Date: Thu, 27 Mar 2025 23:46:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=B4=E5=AE=A0=E5=B8=88=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E6=B5=81=E7=A8=8B(=E6=9A=82=E5=AD=98);?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/dForm/index.vue                         |  43 +++--
 otherPages/authentication/examination/base.vue     | 182 +++++++++++++++------
 otherPages/authentication/examination/start.vue    |  38 ++++-
 otherPages/authentication/list/index.vue           | 174 ++++++++++++++++++--
 .../authentication/static/list/cat-active.png      | Bin
 .../authentication/static/list/cat.png             | Bin
 .../authentication/static/list/dog-active.png      | Bin
 .../authentication/static/list/dog.png             | Bin
 .../authentication/static/list/icon-upload.png     | Bin 0 -> 6869 bytes
 .../static/list/special-pet-active.png             | Bin
 .../authentication/static/list/special-pet.png     | Bin
 pages.json                                         |  17 +-
 project.config.json                                |   2 +-
 static/images/ydd/img3.png                         | Bin 6350 -> 0 bytes
 utils/pageList.js                                  |  55 +++++++
 15 files changed, 423 insertions(+), 88 deletions(-)
 rename static/images/ydd/img1.png => otherPages/authentication/static/list/cat-active.png (100%)
 rename static/images/ydd/img5.png => otherPages/authentication/static/list/cat.png (100%)
 rename static/images/ydd/img7.png => otherPages/authentication/static/list/dog-active.png (100%)
 rename static/images/ydd/img2.png => otherPages/authentication/static/list/dog.png (100%)
 create mode 100644 otherPages/authentication/static/list/icon-upload.png
 rename static/images/ydd/img6.png => otherPages/authentication/static/list/special-pet-active.png (100%)
 rename static/images/ydd/img4.png => otherPages/authentication/static/list/special-pet.png (100%)
 delete mode 100644 static/images/ydd/img3.png
 create mode 100644 utils/pageList.js

diff --git a/components/dForm/index.vue b/components/dForm/index.vue
index 8db56cf..5e36cea 100644
--- a/components/dForm/index.vue
+++ b/components/dForm/index.vue
@@ -10,34 +10,36 @@
 							class="ml10">{{item.unit?item.unit:""}}</text>
 					</div>
 				</template>
-				<template v-if="item.type==='select'">
-					<up-input inputAlign="right" v-model="formData[item.key]" disabled disabledColor="#ffffff"
+				<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>
 				</template>
-				<template v-if="item.type==='radio'">
+				<template v-else-if="item.type==='radio'">
 					<up-radio-group v-model="formData[item.key]" placement="column">
 						<div class="flex-rowr">
 							<up-radio class="mr16" activeColor="#FFBF60" :customStyle="{marginBottom: '8px'}"
-								v-for="key in item.options" :key="key.name" :label="key.name" :name="key.name">
+								v-for="option in item.options" :key="option.value" :label="option.name" :name="option.value">
 							</up-radio>
 						</div>
 					</up-radio-group>
 				</template>
-				<template v-if="item.type==='textarea'">
+				<template v-else-if="item.type==='textarea'">
 					<up-textarea v-model="formData[item.key]" :placeholder="item.placeholder" count autoHeight
 						:maxlength="item.maxlength"></up-textarea>
 				</template>
-				<template v-if="item.type==='upload'">
+				<template v-else-if="item.type==='upload'">
 					<up-upload :fileList="item.fileList" @afterRead="afterRead" @delete="deletePic" name="1"
 						:multiple="item.multiple" :maxCount="item.maxCount" :accept='item.accept'
 						:previewFullImage="item.previewFullImage"></up-upload>
 				</template>
 
-
 			</up-form-item>
+
+			<slot :name="item.key"></slot>
+
 		</div>
 		<up-button @click="handleSubmit" class="mt20" type="warning" v-if="isFooter">提交</up-button>
 	</up-form>
@@ -50,7 +52,8 @@
 	import {
 		reactive,
 		ref,
-		computed
+		computed,
+		watch,
 	} from "vue"
 	const {
 		list,
@@ -66,12 +69,18 @@
 		},
 		isFooter: true
 	})
-	const emit = defineEmits(['submit'])
+	const emit = defineEmits(['submit', 'input'])
 	const formData = reactive({
 		name: ""
 	})
+
+	watch(formData, (val) => {
+		emit('input', val)
+	})
+
 	const sheet = reactive({
 		show: false,
+		key: null,
 		actions: [],
 		title: "",
 		description: ""
@@ -89,6 +98,7 @@
 	// 开启弹框
 	const open = (item) => {
 		sheet.show = true
+		sheet.key = item.key
 		sheet.actions = item.options
 		sheet.title = item.placeholder
 		sheet.description = item.description || ""
@@ -100,8 +110,13 @@
 
 	// 选择
 	const handleSelect = (val) => {
-		console.log(val)
+		formData[sheet.key] = val?.value
 	}
+
+	const getDesc = (val, options) => {
+		return options.find(item => item.value === val)?.name
+	}
+
 	// 上传
 	const afterRead = () => {}
 	// 删除上传文件
@@ -115,11 +130,17 @@
 			}
 		})
 	}
+
+	const validate = () => {
+		return dFormRef.value.validate()
+	}
+
+	defineExpose({ validate })
 </script>
 
 <style>
 	.form-item {
-		height: 90rpx;
+		min-height: 90rpx;
 		padding-top: 10rpx;
 		width: 100%;
 		border-bottom: 1rpx solid #f5f5f5;
diff --git a/otherPages/authentication/examination/base.vue b/otherPages/authentication/examination/base.vue
index 41556ce..5efbbaa 100644
--- a/otherPages/authentication/examination/base.vue
+++ b/otherPages/authentication/examination/base.vue
@@ -1,44 +1,141 @@
 <template>
-	<view class="box">
-		<view class="">
-			<view class="color-fff size-28">
-				答题进度 10/23
-			</view>
-			<view class="step mt20 mb32">
-				<view class="in">
+	<view class="page">
+		<view class="bg"></view>
 
-				</view>
-			</view>
-		</view>
+		<view class="content">
 
-		<view class="content bg-fff">
-			<view class="label size-22">
-				选择题
-			</view>
-			<view class="">
-				<view class="size-28 mt32 mb20">
-					1、猫咪每天在地上走路，时不时还会打滚， 身上是很不干净的，最好每个星期洗次澡
+			<view class="box">
+				<view class="">
+					<view class="flex-rowc color-fff size-28">
+						{{ `答题进度 ${answerCount}/${total}` }}
+					</view>
+					<up-line-progress :percentage="progress" activeColor="FFBF60" inactiveColor="#D9D9D9" height="16rpx" :showText="false"></up-line-progress>
 				</view>
-				<view class="size-28 color-777 p20 daan">
-					A、对
+
+				<view class="content bg-fff">
+					<view class="label size-22">
+						选择题
+					</view>
+					<view class="">
+						<view v-for="(item, qIdx) in list" :key="`question-${qIdx}`">
+							<view class="size-28 mt32 mb20">
+								{{ item.question }}
+							</view>
+							<view class="size-28 color-777 p20 daan"
+								v-for="(option, oIdx) in item.options"
+								:key="`${qIdx}-option-${oIdx}`"
+							>
+								{{ `${String.fromCharCode(65 + oIdx)}、${option.label}` }}
+							</view>
+						</view>
+					</view>
 				</view>
-				<view class="size-28 color-777 p20 daan active mt24">
-					B、错
+			</view>
+			<view class="footer-btn">
+				<view class="btn">
+					提交
 				</view>
 			</view>
-		</view>
-	</view>
-	<view class="footer-btn">
-		<view class="btn">
-			提交
+
 		</view>
 	</view>
 </template>
 
-<script>
+<script setup>
+import { ref, computed } from 'vue'
+import { onShow, onReachBottom } from '@dcloudio/uni-app'
+import { usePageList } from "@/utils/pageList";
+
+const answerCount = ref(0)
+const total = ref(0)
+
+
+// todo
+const { list, getData, getMore } = usePageList()
+
+onShow(() => {
+	// todo fetch
+	answerCount.value = 30
+	total.value = 100
+
+	list.value = [
+		{
+			question: '猫咪每天在地上走路，时不时还会打滚，身上是很不干净的，最好每个星期洗次澡',
+			options: [
+				{
+					label: '对',
+					value: 0,
+				},
+				{
+					label: '错',
+					value: 1,
+				},
+			]
+		},
+		{
+			question: '当狗狗出现乱拉乱尿或者捣乱拆家等反映时，您会如何处理?',
+			options: [
+				{
+					label: '暴力制止，根据情况是否严重来判断下手轻重，让狗狗知道这样做会受到惩罚',
+					value: 0,
+				},
+				{
+					label: '奖罚分明，制止后耐心引导，直到狗狗做出正确的行为，并立马给出奖励',
+					value: 1,
+				},
+				{
+					label: '狗狗也不是故意的，也不会造成什么很大的影响，默默打扫好就算了吧',
+					value: 2,
+				},
+			]
+		},
+		{
+			question: '3、狗狗和猫咪一样是肉食性动物，最好可以纯肉喂养，对狗狗的身心健康有很大好处',
+			options: [
+				{
+					label: '对',
+					value: 0,
+				},
+				{
+					label: '错',
+					value: 1,
+				},
+			]
+		},
+	]
+	return
+
+	getData()
+})
+
+onReachBottom(() => {
+	// todo: fetch more
+	return
+	getMore()
+})
+
+const progress = computed(() => {
+	return Math.floor(answerCount.value / total.value)
+})
+
 </script>
 
 <style lang="scss" scoped>
+	.page {
+		width: 100vw;
+		& > .bg {
+			width: 100%;
+			height: 298rpx;
+			background: linear-gradient(178deg,#ffbf60 2%, #ffbf60 5%, #f2f2f2 63%);
+		}
+
+		& > .content {
+			position: absolute;
+			top: 0;
+			width: 100%;
+		}
+	}
+
 	.active {
 		color: #FFBF60;
 		background-color: rgb(255, 241, 240);
@@ -54,32 +151,17 @@
 	}
 
 	.box {
-		background-image: linear-gradient(to bottom, #ffbf60, #f2f2f2);
 		padding: 16rpx;
 
-		.step {
-			width: 720rpx;
-			height: 32rpx;
-			border-radius: 32rpx;
-			background-color: #D9D9D9;
-
-			.in {
-				width: 50%;
-				height: 32rpx;
-				background-color: #ffbf60;
-				border-radius: 32rpx;
-			}
-		}
-	}
-
-	.content {
-		border-radius: 20rpx;
-		padding: 15rpx 20rpx;
+		.content {
+			border-radius: 20rpx;
+			padding: 15rpx 20rpx;
 
-		.label {
-			padding: 5rpx 15rpx;
-			color: #fff;
-			background-color: #FFBF60;
+			.label {
+				padding: 5rpx 15rpx;
+				color: #fff;
+				background-color: #FFBF60;
+			}
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/otherPages/authentication/examination/start.vue b/otherPages/authentication/examination/start.vue
index 237dc59..4fc9131 100644
--- a/otherPages/authentication/examination/start.vue
+++ b/otherPages/authentication/examination/start.vue
@@ -6,7 +6,9 @@
 				<view class="com-title size-32 fw700 flex-rowl">
 					您选择的宠物类型
 				</view>
-				<image class="mt32" src="../../../static/images/ydd/img1.png" mode="widthFix"></image>
+				<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>
 			</view>
 
 			<view class="text po-r bg-fff">
@@ -30,8 +32,9 @@
 
 		</view>
 		<view class="footer-btn flex-colc">
-			<view class="size-22 color-777">
-				剩余考试次数:3次
+			<view class="size-22 color-777 tips-rest">
+				<!-- todo -->
+				剩余考试机会：<text class="highlight">{{ restTimes }}</text>次
 			</view>
 			<view class="btn" @click="toNext">
 				开始考试
@@ -41,6 +44,18 @@
 </template>
 
 <script setup>
+	import { ref, onMounted } from 'vue'
+	import { onShow } from '@dcloudio/uni-app'
+
+	const petType = ref()
+	const restTimes = ref()
+	
+	onShow(() => {
+		// todo: fetch
+		petType.value = 'cat'
+		restTimes.value = 3
+	})
+
 	const content =
 		`即将开始基础养宠经验考核，该环节是对喂养员科学养宠经验及理念的基础考核，考核题目均为选择判断题，题目较为简单;大多为科学养宠所涉及的常识题，以客观事实判定标准答案;小部分题目为平台对喂养员的要求，以平台自行判定标准答案!`
 
@@ -97,4 +112,21 @@
 			width: 198rpx;
 		}
 	}
+
+	.tips {
+		&-rest {
+			color: #707070;
+			font-size: 22rpx;
+			margin: 9rpx 0 13rpx 0;
+			.highlight {
+				color: #FF8DC6;
+			}
+		}
+	}
+
+	.footer-btn {
+		height: 163rpx;
+		box-sizing: border-box;
+		padding-bottom: 18rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/otherPages/authentication/list/index.vue b/otherPages/authentication/list/index.vue
index 5410374..e9692e1 100644
--- a/otherPages/authentication/list/index.vue
+++ b/otherPages/authentication/list/index.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="containers po-r">
 		<image src="" mode="" class="mainBg"></image>
+		
 		<view class="w-100 po-a content">
 			<view class="flex-rowl">
 				<image src="@/static/images/ydd/logo.png" mode="" class="logo"></image>
@@ -44,7 +45,40 @@
 				<view class="title fw700 size-30 flex-rowl">
 					基本信息
 				</view>
-				<dFrom :list="state.list" :isFooter="false" />
+				<dForm ref="formRef" :list="state.list" labelWidth="220rpx" :isFooter="false" @input="onFormInput"></dForm>
+			</view>
+			
+			<view class="license__view" v-if="form.license">
+				<view class="license">
+					<up-checkbox-group 
+						v-model="licenseData.selected" 
+						shape="circle"
+						activeColor="#FFBF60"
+						labelColor="#000000"
+						labelSize="26rpx"
+					>
+						<view class="license-options">
+							<up-checkbox
+								v-for="item in LICENSE_OPTIONS"
+								:key="`license-${item.value}`"
+								:label="item.label"
+								:name="item.value"
+							>
+							</up-checkbox>
+						</view>
+					</up-checkbox-group>
+					<view class="tips">
+						温馨提示：上传专业执照将大大增加通过概率，且会快速晋升为高级伴宠师获取更高报酬
+					</view>
+					<up-upload
+						:fileList="licenseData.fileList"
+						@afterRead="afterRead"
+						@delete="deletePic"
+						multiple
+					>
+						<image src="../static/list/icon-upload.png" style="width: 144rpx;height: 144rpx;"></image>
+					</up-upload>
+				</view>							
 			</view>
 
 			<view class="bg-fff mt22 form bt120">
@@ -52,12 +86,24 @@
 					个人宠物类型
 				</view>
 				<view class="flex-between wrap mt32">
-					<image class="type" src="@/static/images/ydd/img1.png" mode="widthFix"></image>
-					<image class="type" src="@/static/images/ydd/img2.png" mode="widthFix"></image>
-					<image class="type" src="@/static/images/ydd/img3.png" mode="widthFix"></image>
-					<image class="type" src="@/static/images/ydd/img4.png" mode="widthFix"></image>
-					<image class="type" src="@/static/images/ydd/img5.png" mode="widthFix"></image>
-					<image class="type" src="@/static/images/ydd/img6.png" mode="widthFix"></image>
+
+					<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>
+					</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>
+					</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>
+					</view>
+
 				</view>
 			</view>
 
@@ -72,10 +118,8 @@
 </template>
 
 <script setup>
-	import {
-		reactive
-	} from "vue";
-	import dFrom from "@/components/dForm/index.vue"
+	import { ref, reactive } from "vue";
+	import dForm from "@/components/dForm/index.vue"
 
 	const state = reactive({
 		list: [{
@@ -95,10 +139,12 @@
 				label: "性别",
 				key: "sex",
 				options: [{
-						name: "男"
+						name: "男",
+						value: 0,
 					},
 					{
-						name: "女"
+						name: "女",
+						value: 1,
 					}
 				]
 			},
@@ -116,20 +162,76 @@
 				unit: "年"
 			},
 			{
-				type: "select",
+				type: "radio",
 				label: "是否有专业执照",
-				key: "shij",
+				key: "license",
 				placeholder: "请选择",
 				options: [{
-					name: "是"
+					name: "是",
+					value: 1,
 				}, {
-					name: "没有"
+					name: "没有",
+					value: 0,
 				}]
 			},
 		]
 	})
 
+	const formRef = ref()
+	const form = ref({})
+	const onFormInput = (e) => {
+		form.value = e
+	}
+
+	const licenseData = reactive({
+		selected: [],
+		fileList: []
+	})
+	const LICENSE_OPTIONS = [
+		{
+			label: '兽医职称专业执照',
+			value: 0,
+		},
+		{
+			label: '宠物美容洗护专业执照',
+			value: 1,
+		},
+		{
+			label: '宠物康复护理专业执照',
+			value: 2,
+		},
+		{
+			label: '宠物膳食管理专业执照',
+			value: 3,
+		},
+		{
+			label: '其他专业执照',
+			value: 4,
+		},
+	]
+	const afterRead = () => {
+		// todo
+	}
+	const deletePic = (event) => {
+		licenseData.fileList.splice(event.index, 1);
+	};
+
+	const petType = ref()
+	const onSelectPet = (type) => {
+		petType.value = type
+	}
+
 	const toNext = () => {
+		// todo: save data
+
+		const data = {
+			...form.value,
+			...licenseData,
+			petType: petType.value,
+		}
+
+		console.log('--data', data)
+
 		uni.navigateTo({
 			url: "/otherPages/authentication/examination/start"
 		})
@@ -170,6 +272,17 @@
 	.type {
 		width: 190rpx;
 		margin-bottom: 74rpx;
+		position: relative;
+
+		image {
+			width: 100%;
+		}
+
+		.active {
+			position: absolute;
+			top: 0;
+			left: 0;
+		}
 	}
 
 	.form {
@@ -244,4 +357,31 @@
 			}
 		}
 	}
+
+	.license__view {
+		width: 716rpx;
+		padding-bottom: 40rpx;
+		box-sizing: border-box;
+		background-color: #FFFFFF;
+
+		.license {
+			width: 100%;
+			padding: 13rpx 16rpx;
+			box-sizing: border-box;
+			background-color: #FFFCF1;
+
+			&-options {
+				display: grid;
+				grid-template-columns: repeat(2, 1fr);
+			}
+		}
+
+		.tips {
+			margin: 22rpx 0 24rpx 0;
+			color: #FFBF60;
+			font-size: 22rpx;
+			width: 100%;
+			word-break: break-all;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/static/images/ydd/img1.png b/otherPages/authentication/static/list/cat-active.png
similarity index 100%
rename from static/images/ydd/img1.png
rename to otherPages/authentication/static/list/cat-active.png
diff --git a/static/images/ydd/img5.png b/otherPages/authentication/static/list/cat.png
similarity index 100%
rename from static/images/ydd/img5.png
rename to otherPages/authentication/static/list/cat.png
diff --git a/static/images/ydd/img7.png b/otherPages/authentication/static/list/dog-active.png
similarity index 100%
rename from static/images/ydd/img7.png
rename to otherPages/authentication/static/list/dog-active.png
diff --git a/static/images/ydd/img2.png b/otherPages/authentication/static/list/dog.png
similarity index 100%
rename from static/images/ydd/img2.png
rename to otherPages/authentication/static/list/dog.png
diff --git a/otherPages/authentication/static/list/icon-upload.png b/otherPages/authentication/static/list/icon-upload.png
new file mode 100644
index 0000000000000000000000000000000000000000..38d7518394dbdf44b93d0f5f9340714e19ce584f
GIT binary patch
literal 6869
zcmV;`8Y<<9P)<h;3K|Lk000e1NJLTq0058x0058(1^@s6=SJeV00001b5ch_0Itp)
z=>Py4k4Z#9RCr$PoqJ$Z)wTaW>zqjf2?41ff{LK_VQqWcTdS7x$Rr>YAMMpfOCgy_
zglKD#S|7C!6|Pl_?_crJf|3dNXhE-6X{GYWgqJU*?Y&hL1?ARfMMQxFlFT{lmve^9
z49^)Rgh#T^e=}$8b@u-5@7ZVVwbx!-*na7<%6>FEs}U(ci2*lBFfuuDKN>y)WhKH1
zt^a|(Bf*;E5;C((ZF&}bg8<JZWvB<{NH9{7kXumIgFut_`>v#%tj1=d46S}9<(X%I
z&H_0p{-4G`9+zO``w5wss`9CCtiY9fQtGt@k^7}6a!s;*;WKE~8$pIA<Wy#3+t<pl
z2j23vgHRj(Il@gT_4oe0UWy_&rv9h3;ajn|62*#FjW<EBk>Z-i6VF@}z7$KZ0U4N5
zx2wppr^(<Mn-g-i;d_A)LP0{#aZ9oP`QH+(^ZEjfjy(wij{x6D)}MQcSvSj>Gu}&L
z7P<`NI-pMqwqds9%#m}aHKfR`0QnkVC*+!(J~DFFhe?_8;fVDlN`6ZHy*_vuSMH^_
z`awwus|wMI(WvBMsiOL^6xTeJ(wSXwxfF{dQW~&HiX(R>WF}3r81_a#$QhUNz-C-s
zB_%VT*g==$ehu3inUHhYfYbCBIrEV>l5*pY#c8?#+v>UfKSfw2MUgov1j=Dk^S>i{
zR#KNX11qGYW`08MnTq4cks#tGUjX41?5+!C$o(6WogNyBCB-`sNF^%8)r)r^(4x?p
zAcMBk$Gf!=M;6HN>Q%}5SDp&)U`WBtmH9M&uu?|NYfKU-bT-0QL2{A=lG!Xf{xz92
z$@K~J?8Tp9TkLy?^h@HeE6BB%>_Emv<)<OmupP(<|4m`;D{|^I4;TN^+E5iDeeqt8
z)~m_6O-9c0Uii4o;&B6sIb*OikdU$Hg37s|UqBe2EW86^=7&LG&j{$U%0il*TXD5o
zR426z!IM<P8^O(G5ZE^aM57fU(EpKO<nQ}d)JPiyKr|ZmMxMzMj7&0s7zFke0YjjD
zMa;;@4eV!2yV3*45XcZBD+DxJQHSV@9)TJ_ZkAy6ud~u*3Ux{Zv@X0BWr^s*P!$#{
zrMPBgr$oXuIx7Sc1j?$kDb(o^&}e84YArF2#7<9z>;TYcXddvAAy9VsnNr&k5RF##
zqL2nTHM!7c&@l*Pihwr@TZ79zQWCj4(?UkhAkd0{@dFtyWQBk}Jt2>y8eK!6tl%?+
zbaC1FIM%;JYr`>w8&iYF3_J#bbO<CJiHpK7BKm+7*Gx-S$lNywv?5>}iG~YpLckEH
zP4Jn*S{Gi4@|<xb8ZKmofJQ6E;_{y8(`V(erCUrcoa1Dr$rS3;2#D5(&I5b36wg@Q
zsgW>^&k6zK2g(XIQ^<It4F}qUfG#XQk|w9wj6iLIvGW$zy3l0Qdcz~oC#X!3;_6#E
zFC4qJT;G_G$GXNY{+;H$Z8B<VVkfD=36h@Z+KM|7oiD-2UkosD1k~F=T^BwbIK%%V
z#`BDbydeJed2{&~wZ=pnICeAocm!G;x(=0iatYNND6YBD5GaY2A<$ml9Df8d1lsG^
zqS5d?Tv=&6(Yt}k5Geh3Nf%vwJX>U&=={ol<g+<7MM(PM9b3W>DD(dHJkefarg>6a
z^XJTqb!<sPpv?Q%_<_tPEOWM`NUE0FaEclN83JWTpt|xPZs21>AVZ)m3DmkbzBcp%
zmOLOuk?C1!>VSoe4V1o9lb&cV`)6L>$1>=_kJA_H91?~=>HFC@5{)A<Jxlh6Q8fH2
z!cyZ%G&WFHMAEwO9k{yM5XcZHD+09^5{;IhgTw1GeCF$I($s+p8yhI|&NS0_GXiDK
zmfc7i0vQ5jMIe2$vXI`JV}?M6K-m$fHe3nvu9vC48T8jCxk3_0V*{n<REi@p{1B>7
zq#je0zIex$Fa%29zs8Yh9Es^!vNw!OO!S`7F(XiVZfP{U1jO5DV6L4JFa%1^iDYtx
zXRqi=Zhb8EG`sZ0JGO)&Q0DzBS{I&xD=$iM^$VF7>)4WpK$-XNVdV$%J9g>VqlpE)
z!(!X<Qb8CEGRA+1>NHdz#J1XRW1-kFnl`;DBj$YCjt$%Ist+#$d8b16DHw^v)cuac
z&I(0)g0vp?yB54tncMMFHi6!9xEy+;iz<o{*>Ly~s8{|4i2Sh~yYe8Z)(yD)AoZl_
zgH(}>9;?xC9g2TmnD=J=R)U9qrh4^8pkDdkhSW3SGivX?3B~88-tp$GN1T5GeA2Ev
z<3%?jGEs^mOZTm^2S+-^6J2o$$Vv&$c<JC&CG)4MceZ_P_yjC#c;=<Dk@Rh#Q7Gqb
zFFhBRr?I5{Y#`VM_96*B@J=>0KG0>1Cwec4n^{<TI%+iZ25LfDcZ-xEP$mQ_zX4>8
z@kH+iD?_041ZtHKT~slM0B_5%>bEm5*0CiGfimx3(P(G^mOV>`&6t^av5qZi2$XsM
z9#(#!%$wCVNkgFY`1u$ChCs#!O3#+vVN@3$57s+|K!!ls5@;>T64APfDWD6bD6$|c
zO&ze1`GlqKRO3iAj>PmV*&9YCq;=2em=P#FxBSz-RhAe>qOpO}vt@S})rPJ>b)6xQ
zAy8HXN_wK}Dy~O$i3B5cZPL_%3Y$+@=ACJ#@n!_doGrVNGz2mP%8Ec59d|5P+YEsW
zfwCk}#qEf$HUu&R%8o#-ejts8uf<`x3_m<#akFaeJ{B@Ybb7#&G0}>Mv}?F{`q~^~
z5{5wOJH#wyn5B&LEZG}I(a=K(|7#qH#s<oYNE)p?70dn95XcZHD*`1w(b4eTxb8Dj
zGIL&=G<BfD#s<o~GtD%9Pa{xW`Pqma-&h!P<}!TdpUt7WyMkp1w1<~Xqv0d4oOp5t
z*WM_>h_}7jT-y=Q+R!zqyk!VvD3KKc8V#*NWtnJgcrD^5SNMNfX)=X6B?3uDVr}_%
z5NovrBd>KzBut~TLcll@vx3bOYDK^h$Z(-e2(%EW4A*|oI1<|gW9KcbFIDC6_2I5)
zwDM9Mccl!EtmwROn3iXYz+si*F55<$a_xtJ@dLFVww*$=AyB92=KbGDtqtF5LR$Af
zuAN3>JV&A|@e)j3hN~;2Waf*VruC+wZAKvJiGHanA80m*t+W}_PNl#&5<69Q@BhYX
zG#tfoR~Sd){>QdcXw+!<3@>}XAyB92?)Gb>H;s=V?vqk9^NIF*jM3at5%37K73F3r
zj@;N$8)@3reh3&xV*6p+p*6=><Mlm5pbp*5?bkSshL@qdaKH(q&z5$jvHLL+d~i*B
zHBX~O0T?hC<O0;Klj54k+v{2Fp;wn*dK3-yT?p78N-(l*=V$mQCaVs`<~A7?d80k*
zkWOdHd12+laRP73@EPrUq@#EAXtcB&((PPSF9DrPVcu^&2c|~DM*|_0ucWJZ{JzA%
zT`t8n({?AXvrBX7l^@2E8&R1q!RlXSrgzU$y0GGl1oQ%2zR*@(sQ#Yffy+cDxx1}@
zt)DgSWCGkQ!y^CKl|Z4}K+1scN-*+#o9mN>f`j5n^n;KZww;V46F^3S&L)<3BVA(!
zG`r(LQV-KT64kFDyb7{x$2MvVwf-u_GiL9RK)v%leNzzblcLBqSzxq75v?s7hFHHs
zqz}kjXf_Ec^z$gkq5O~y^^eGfbDZ51C{zRTbyTXPr25%i2^78y2;<7xySv}kwq{cP
zpb*Hbm`|e3O(!B$qLd*rjSsinM4xVbaJ9g%ys8Z{47dj64y@)KT@0?R<Q6o@koz}g
zOCXJoJqZbX6VdLw=y2GK?XHkvvtDhz*K$T^5yE7Yzo9xEk(ADt!Jub?EW)yv;Kp`;
zvZ2T|s9p&CnDzCu4sQZgR3PrV2gQ--pMBc1%Q58Gr{l=GJHJKxOj!Xr_C*Ng*tw%+
z=(P9Ky%icA-3vGOi&&Bm5&-=+XeA;K;p9$9l(+a)g3~_IX!$uHzX0jK8{KcCdY2T}
zBu2O-fpk9W8-CN;`TF~+96sB09m08tEJoz@9rekxyk@^Fmw2CQKdV<2%H@YWfu0`I
z9j72By1eQ{#Mvl=9{f06C$;syLQ5v1NiF$^Cb>FklEtufx#U=%q1inT_<TaYcqHJ<
zxOxoeB1Cqz6_gml^Ae0i{6Q;PHW;iMQ0d<?Qg|7UdH}r;)+4-|(5=jtU}TCe3YTK(
z&4~3^+*pl&-?qV#ix3@(tN$q_HPyS0KsynrHe8A5k5S1-^kbCf?PWY7e+JdtX~?UQ
zbEh?QBm%YKA{wpuE9f){Mt;{;g6yrlPnh7k6LIwCSk@bK%emb*pqEyjfaBiQa&Sj+
zl0aCfTBvLU-4s8+T>~J=kw|C)o|a%_l24$g#~e$Sz#vq+V_}0e1UMU5fa}f&$-$Bm
z(Dx-+Gr=d2=&uoZ0@lTi?846po0_imKd)&B#KxW$UuY^r<tkJ?qTGkL-od;MF><i1
z%Ml%c%FkfHLlT@6+b06~hyKd{f_$_Ku9kikWuSLv>8|(P|0Fo@)jb*L`@4@1*ficB
zedbs8C0Bojaz5xo6y{zJ<glsnWL)X(bvwvOh)w`Lz_G7J9VMW{L9Re~1hwL$f@f#s
z*c)3<TJ%4QU3=!yZKFjXCkH1ljH^EZy&Gwm&em>S$=6F;I{K&`2xM80OHuVNd=h$f
zjE20=+PJ+EsL7p9jy(>j#G)3Z9?>tNIu}b9;acaTQUUTf>ikwpX8I%GJ`u>0@8Wvo
z(XG37x&#nx)O(3^M|(@%N;Yg=xhMPTuq99&z)1nDbpvrFgy?uwXM<eF`uffEK1HzC
z^u`HX0-TS?EexyvgWuq2<>y*}{29WRfhiKKer&I!T{PUqo56s3q?;lok>AB#1#%U*
zd2J>Tat9)#{m~Ad#LjKRX)Ff02pE9U9pO=8&iyPu@g12IpRVr{f#SB=R9tu8{AKpm
zHwn(EZ|_VZS{s^zEeAeJt3Oio>DCWN!-$?m%>BNMnDtLxIJysZ-lZVlL-i@PHBXUI
z4{!2;_xw6X75p166A{l3BU2?<9k*L{bLrfwd<q&b!LrJ5oyk%>^U0P);{m|6pv`S2
z(E5ho&^M<$UAwt>^T3>@Gf^E4oB>unXaU0eC{F=@WbuI4JrZS1pt|tGD4VeYQ)Ji!
zZ|(0<V}Iz=Xy|3ny&_s0x(Api#WjE4ABr>4p*qQ8{@PyT=JaR%=2z&`V*qaKmx%m3
zFqh`oz2sU0aIGQa=1rGx{q943`m8+ijywfB=Mq#$0JXqFyE~#mpC8kmhTO{#x0sk-
zBO_-1O&6C9M6GMRVZY4;LY4y~ffGTFMOCqM87fh7^lh3r8qvY1btV>tDC_)tqTg&W
z{J))c7FJjBM{qx&*}cPixiZ1@K+B|fqP?L#e~Sd~+j1Z);b#GRuCxmcUC+R>euG7K
zR35~!XW=w%A=fSiDaVm<tzL59hxBP<e{4A)7>lwB*S)IM#%Qg-E-e2Xw)G2Cb8+&1
zC?lqQx?c&T?lL6cC7<$^89YyMmlg|e5Dx2c?T2aZ`X*gJD#Xd@hh?4QzZmMih{z~}
zAEYHvH2egj$D`It(DeNhaPMdE32P3N;p~4E4(54bJ`uJweHG*!Vp50Yi~x5rInIkR
z<dKc>C69v9D3xHBwXU0~=X)r$Ps6eL;>cQTEueS(VmW1wHzP}2zR$+R+jjCdmJIx%
z|M}RTBhc2^RJs)uKy!@1mMt`QIU3jg4oWG4=Ym-58~Yz^ewp3{IoMK&vt=t%Fc}!X
zHv;+oEOH-3Whg?UH(f~kVmt1CVE=Qe1nXjHW%rZ7!6nerAN0h{sl=6Ya01`Qu6NMf
zK8Q8G<<sySZ25D7Kq}Yb>Q{X*t=K{&=W2gs$*cbnjRm^%Vx#Xa7_x2*7E@ac+DJ=g
zv7f{Z*zgw+yxG<#QWUv7F^$h=7M9{j^mThLM3Ym<w#MU-oFU*|gvhHc#`K-3X>&5M
zfwZ<_7{XnM&I9XDxHRm!&)uuBIFA??V6TfFPy*FfoKCYIoGh(cTlsk`cSg$y^G}Kf
zjA7L)0sfW$ZA9)v^<kvp#sq<cYjE`}M7~6mGm$RVC|sEc?oAS$xr-sK-VDr}hKpW}
z%54&?_G~<KN%?8G)(yD2Mv7}D?hgX#;_wep8HuBwe`+}~=LH;h8#!H0#Ev!5J?||!
zby|V|nGq;-J;-I)TtTn;$95iFcN%H$LaD%|^neq{n+%nnqM~)-J8)&b6jwj9pGLR6
zs?k?UbJ>tT0>`=+(Oab`a-S|LKW4klG89Lvu($prL7*mkJOSrxzSmggF3=YcZbxL5
z6h$uH`C+=a>}1sb6-oh?Oi1{NmW9tCrjv1bZNCx7C#8Khu6k=>{Sj+3=$p9mJOO=@
zp^+B5B)RCCAW%$xM9GYYMP!#XGe5)_hT+P^6jw+0c8Y*T!v~E(t+;zB?mqQ>E5(tU
z4+w!4j_ZRR`#H*B@&jk{Ki0>b)ELC}9fZs1y`_u~$xRTbnR0Th9^l>%`ZkXKgn(Uz
ztKY-o+SJpgeHX!z`4?i#-C#Y&u>KQT4NHHiLu_v`^dH`5ZNH2_Pfy4r_tS3JRv{{V
zus8uILiJnT!U(V$)u{v<>O|%^2?DuXD#ejUb|Jq<NXPmus?X9z?~p-p2jrfvLxVuk
zu=f^BZe0>+PZIgl_oZ*2isQ^iWii3(Fm+>&L2|D{HHgcVQWBZFvk^@mAJgb~j=>AC
zxDv<ijkx!q@~9M7|1>fCT3Xg0$GQ@=2I0!}QZgfv`&y$F7x^R<nJq<;E8_&>7GQ%<
zT<@}ccl7DNG3k~vcJ}o8<URJ-T=b(tn(Thq?w4?_p)D~^|Ha|~^LOwA?TJ9qin~F_
zf=*=XhmXmqd7cq%2$bkx&p)#*Cxq(d1Y|s$3!kIQ7H`%3_lPbauc1l?&DrYDwz>w&
zK*oBrFj%_|>-h6=<bH%{Sj@oX7l^l5x$R;JKKfBSOr-gu7AKy!t~Qr0^%Ff^zWwt|
z*-_-m6<}S4GF6Hrzudl<I;ADx?3nGdoz`mR0`KpcK-h@B2)llMlG8veMDswp#g{p@
z8^Wr?5cx7L6+4eW8V!FR;W}KNM`E`Sd}wVtZ}Pz$fwVTf2xY|qTMLUDvK3#%)j2J}
zQ0r(YJfE|sHnF_2FEJg4TK~Y&25i?`2kVP+vcHnv<a|d)&Z^hC@HbGMj9PzZTery^
zv3VddyE`9jTFI(Yl%jPdElUe`g1n0@KV?hPI}`*;ab-Lr1uYB4{aO}mmyly!D}!gO
zjuVKR5P6Pfz2EQrfIk9-TRc=F_e>x;9o%MiW4~lDdgu9Te=cKF2^5cZ<aS&?;Or;#
z$o)$uTg?wDffDD1)n0ryZu1*5eCAGZEE&MDk0Ls^suu-K=OJ#B1ZO_vlgj(7J@-l;
zjq96nPdo-Ib`?mlWf<RxGK*l%bkC4fZx4T?(;H#47kc7<GB)<Kyf_<Q&w{f4<ODnt
zZKSAvE-QOle6nq@?{pNa0asUpwVdGQHNHJEZ|vvE3w#UPUc<jOd7fohwO%Od|BV*=
z=}V~doCIgRoESahJ25Bv&P$s=5YzPjnVs<ws|tUW-TkE$*Lceu{^fhwyY~4Z!de1W
zoeZ9_ITL7gQRr7#asjsfm=7ABKTr#(ew`Bp@@7S^;2emD`#zelzt@GnkUG6hc2ZG*
zyc4_AxGkSXap)_X<lko1C+_d%Y_sHQe3RSi8&c26E!>b#ELX|v*~mA0G$xJeNdXGq
z%cbkaSn5>SUw1p9XMmM7w~{m7$rJMEwxv6kY|FHRcP4=@sOsT|?`{ly;>8E0-q&T7
zg={KlV${^8bf2yiQXfIHmCwL}4f5Hkd$pG`A>_Wu98^c*zEsr69-0VfU8u&N(H@%B
zGqpO@5m0Y6A$CNwA<&`TQ-^r{JV)ZYh;^p~XWVg!*VR<-5JcdBPU8>3_M0lT5dlM>
zHUijLi)&qIG%D{K0(Djfw6WdEkXFwj<S<oAB6qh@rzzfv5J)-_7nJs(`RHvj>cBdp
zIuX_#vZ=<A*de?1z%|Mc=)hs!A)llR#$JGJe_$Mm9kP4dzfpb?ul2pXkk-l|Tk`%c
z=j=XJO8ZyEJmGLgz)P;M4P~ShS1&%C8)E8ya1ii<>RlWzk&?*tgHr|b)WZ=0FVBIO
zaU_0Xq4Fmwj$D2?HpJBVz$2h_VJ~&gW8~Hk5M3PpESqxQZ4Gepw;azOH-Mbj!erId
zOXl>H1Z%Et{m&1u>ay9(zjIqcPW4kPZ(+9Dk2dtKcv1tIf$H%IIq`Q!d^aJZr8ad1
zLt63&KA4oz1~0Z*ifjDTE55E}mHlXPE{VrVxBjWmlAHHS88R)ghuq(p3OAr^&pxIu
zA`ho-9Pl%R@P8Mhn#`XlcxmhIlVH-Ry8TQDFB0*z<TIIr6}U%&54@AoPH*3R*biAv
zUe^&E@Q2hb$66cm!fwBlg2hs7xmAW%uS)1z6fQ%&M5NL;rJcW~G4^<C!inwJ-qVsJ
zs08rhxZ{^FhV}I;5*gGMU3@&2<HhbAmxAphErD&f$r<tF729?F3|B)fSy8;O+wGTK
z&PSVeh;-DtP_4gf7P*^X_0_w~!s0n{!hOKsvCw)sAkRy%`hmm)y&(2Y&S{9_<;iKi
z>T%`2q@>zQd=Rggw~Z&@{M5_KlOnfHf)Q_<Z(PRTt?}lUaI7m*WV{HwL<X|BuJR)h
zYZTTF$*5M**ri5B{_ewsz9r>f!L`REp6Mk&5Up(uqm4ha)MiP+NPkma>m}YcV)sv}
z$3FNwTEQcGGJ~3z*hzAq@>1m`o>?2Z5Me|-z25fAv1YQY|Kis4F8*_CLsf`;Gucjk
znSeV-h9r|HXl<wj{C)JFNyu6HD4X(@rA9JpUHC_UmuxD9w7F9#>i2pg@^X3EQ8e3E
zq4ZAZQY%XLz+*dXdaMhV;xYnB(PhhR)E@uZ4)w3An1VWQviOAQ-v9p}9;{^q#`(bk
P00000NkvXXu0mjfn5tJ?

literal 0
HcmV?d00001

diff --git a/static/images/ydd/img6.png b/otherPages/authentication/static/list/special-pet-active.png
similarity index 100%
rename from static/images/ydd/img6.png
rename to otherPages/authentication/static/list/special-pet-active.png
diff --git a/static/images/ydd/img4.png b/otherPages/authentication/static/list/special-pet.png
similarity index 100%
rename from static/images/ydd/img4.png
rename to otherPages/authentication/static/list/special-pet.png
diff --git a/pages.json b/pages.json
index b9749f3..6d32185 100644
--- a/pages.json
+++ b/pages.json
@@ -65,7 +65,17 @@
 				"style": {
 					"navigationBarTitleText": "基础考核"
 				}
-			}, {
+			}, 
+			
+			{
+				"path": "training/index",
+				"style": {
+					"navigationBarTitleText": "培训考核"
+				}
+			}, 
+			
+			
+			{
 				"path": "examination/end",
 				"style": {
 					"navigationBarTitleText": "伴宠师认证"
@@ -100,11 +110,6 @@
 				"style": {
 					"navigationBarTitleText": "伴宠师认证"
 				}
-			}, {
-				"path": "training/index",
-				"style": {
-					"navigationBarTitleText": "培训考核"
-				}
 			}, {
 				"path": "training/detail",
 				"style": {
diff --git a/project.config.json b/project.config.json
index 0d69ed6..8c7aa2f 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,5 +1,5 @@
 {
-  "appid": "wx90d494bba15f99c3",
+  "appid": "wx01f0f43759922fda",
   "compileType": "miniprogram",
   "libVersion": "3.7.8",
   "packOptions": {
diff --git a/static/images/ydd/img3.png b/static/images/ydd/img3.png
deleted file mode 100644
index 185936ca9e72c04002209f9d26463f9ca93e8801..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6350
zcmd6s_aj^H+sDlsZ4s+#HwYiQMyc9j#H>|YsG@2YMG#HJjuCrniBVh4s#UvY#faLY
zrLk$0T7A;*U-A5K&i%`IU-xxi=N{+vKCzDtwQtk1(~^*o+=l3YO^9s=@miw3LA>wt
z`Mn@Eq<$va>LfMeoOluvwipOl%`C`%&(7V4WhTQupMe~yT>$0=zSVllOO3R6!_WV*
z#NOTiF#7rkk@Oz>p;R<n-u#!7?)GfJF#A=pc}9l7_>4(-xp|_3{Wfbbn+|U>1tovX
zYqT7sPf?OL88cYhBrTXfwdG&f5Lmdh<ZfP4li3h*Ftc(#t{hU^@!OicAN~9HZ`Aem
z^+`_YRd&p9fL&p=+q@`nIPO$5e4JWG%ONJFE%s-7&5l@G&0i%!!LpL7s$J_UU)fLe
z0d_`}m6Z#585zIt0CPmFg7*sm43XV#!1JW-?d?+;1CE4QH!~~_hpXi+>H<uf80Yw?
zpk5DBb7sl7VK;||hij`h40*#eG&B-wcK&LBrxc&0L_1M{`FxD08VzP<W=_ytNqk{p
zVOKZoa4qgRukwFRepJ!o)ugul<Js}IY<_+|fAh=<<Ne}=wY;KYduGgW@qcpev!XpK
zquJ8`@$p4qu~-uVouVk;;Ulu*;$r{3d0BQgwzvEHUfX+n3A72NZXG$L)yu8E8%fU{
zlDWBa5D3I8pm3A2Y{0geu(<exq46H-aumtX%C~QjObKYg+tQjHs;Q|d3y;NC-#OlY
zxpgs2+RSEr`}WPu+FCaiWMJ~g&Pq<p;TB?T%~8Q;mE`2~RGaTQwW+DeM%E736crW4
z1OGKE8sm|ko~|ikQS+=v`dw%=NzBUfvSFsU9edfQnjJe?Sy?&6p}W7GcT=a8mDSy`
ztoyxz5~H-zWU3^3`H6{%G!7^fstQXi^tI_!V|db~jEc&N<!qfK8C=WZ@AZ}cS`X!p
z$R&&P)hj!kJD<wufq>t;-{5fQY(C(v-`4o#T5oi<US9a~larG(TtB+7%Bmr%uGH0$
z;u6*U^(({Pw}!!U+Gy2tHDC_+ABeNFKuKBI#h);%K&{tx@0RMFqFG`|lkHos-2(z-
zH3q0D$PmPl(Hwln&?DXc2<$RAV5Q~Mqe)Vg{XtuIo<tGK4D*Zf@;GxI7<dpqRKc?q
zt~I-vu%`sVV>LBWxB0)?VtnUfa&ovsYJ8hvZRfeLL7{SfLC`wQ;Pc^aTs_(1*Gy_1
zL8Z$g;=E-~&&*_6EMVwUY5%jCOR*BJsY&VhV7V<oWXW$rsqw{(u(m2uG`YGsg!?D@
zihwecD;*E<HTtZn!~R~KCKRuh6~N*^Mg{tXp~o~~7ke#@ulB4r{thzsT~}Ema^sKB
zPntBX{<KmDsl!B}%fVY*Z9zxCrO;nv{)ek-Fv6s^+j!o?X&lZ~)H83mJ^0tpFM@?K
zIV0P+_u`A=h5ux#e!q9EU^~?-y}#r<=fNWxV$#<aQ${K!#o9^OjU*LA(^CD|*mc*!
zFc;ATeeB3Cu5j~Nbw2MZ4c?a!k9f5=?;PY>5VHT!i9CL6cc-??FmO3ou-c|Yyrz=}
zezqo$9od$v0WNm`Z;UZlf3^xaa%WOf7!~|~GALah_BKAB1Uh+!pKP1Yw+A;Aw-&Ul
zz!we=70*^92JUESb#*p_L=LD)@faRXPMIMq8ymgg;9$afyaYQpdywC1{b#ANl9K)>
z-?j?F;i7HQDTEK_0Z4YaV_7mR#9MQ#<8-+gjRwGW>jzOKv=3Um+mE7r)hOX1rgh^g
zew(+xp_eP+VV-tRl!eI(QkDr5P8smE$UCTBVT>CIo(J~xUT=fba3&NE@$~de)RCx!
zZt6<{4p9UjiKn;2FVB3*A$~UkHO?*UgCpbO;(jiN9B?&6Rly_Nyx=1Ls-!mRxzG&Q
z7xbE|Lo|D@7)~huLIHACqX;(59`}Ef%YTd<+Rl6r@Swn?F7t0LcZA@tFAfCx<9bkk
z2~$R<j*gB!n9LdPy0J0utuOjXX*Z#vN0du}D`AbHe_krQ+Rb7hRyflQ5K5t#jrV1L
z6u5tY-`&&krfT~5`|k-3iZ98uFRG{z-k_K6K*1xtU&1x;m=<*pZCK?9Hk8gdONTDL
z{NDhBQ3U&w5oQ{0vVv6Z$+VaXR13OE{c1#_i=ka^Q{Vf__DR=g>4#nDEsVE^2d1>N
z)b~12&_zD%TxJbCyFDRSm_Ad>wA7l=#gJ?W`%bGpemFX+-_v#(L9fia7}R5}WWDM1
zEJJo7_e+V-8R2M<$JD~&j?%?$!$6a|)z$e(Xq6}M-$IBv-~V)wICWdDbiearzx;fE
zp=BawCKlBC>?O`F@Gj4nZ8-qLpS$7rc=HJ{)t|@S6Za=JX?bx3??t^GJfzXv(^Ixc
z!ayyO2`RKX(e5fz2@TIqYBHc8P9h`lfAA<kax6)zJ*aK5C52iNpDuG#M1YAD)S>VH
z(OUrEfE96LeWD8@(}!jMe7T|v?8aDNMXS>EDY6JslRrAs!LK2;7%R*FvWZ&fqLDC>
zf59LPbtY0o?FcyY;t3-$Sc;2d$upuhGgkbxnx7a<V5~>?3sEb<WVdevAqLaUiA+!V
z|DFiTHb;M%wwBiO?dkW;C!NeD78Sz!u=j_hoqo(M8jkov`1zN|HzK!>kB^^E7HP_O
z&NohrWRcy@BK$|9guZ7icRKyv6giAf6*MX(ZVm-5qgjBK%HC-DsgHhJphogP-XDLk
z7SB7)At49k@x?&|95mcBO(21pfwfO|1Z54Sj4U_K#2FrP4(A#cDlbt9#h9WY5_Ee1
zDZLwpX=@Ks^yEe$&NMYOjR%!|R=eju3>ZE%gF-t)KQb?w@1;R%E1a*t-jtSg*|q!-
zbo4Yw+I74YL_8!*mp%nPf;}>OI(S1)v<G7`hjks#d&j4p*f+y4gHv1FsrlqpwMVaV
zsj6~)=CtTKNs>OdHBop_?#aM@AJ5VRT#WzpY7gk)kWcLb8$By+Y;I=!O=ifiqEe`<
zr<X5t8_WUfD011|-UePiOmA$I5tfjUa|uc2!UPIuXJ?xk8?QBfJXj!xl6hCNGrhRD
z8<ZgjCG9+=yvfQ|Ge+Ef+h7gD!@9agMu8_ND2FtjrP0>ND9QKj_a{Dcjj)p!^IhR8
zcC9|2XEuVwMWfC2VHVSerS(h}#rYu1QU|vPB?O06oBw|-%*?I9eJ!5Zgt%<4prAR+
zdEQW7z-P$bpI=*cD(oP7y3}P^rSHmLmzE5o>9|rJ>7*^YP81mQ_xBeh<;Ia_6W*&T
z4P>o^opR+Xh0OX@Gfa>l7_lKCwOQ%DadA`AW<xo$?m{9WA}ksq3ZT?w(^e<?sEG3X
zM}ejKd^@BT!^~(!$y9r(Zm+iJT)_T-8BLM+THCF2j|q$sOK%Y>WWA3@0e%^zE31yW
zj$;v_7Hn5z0d=Tn?CtLA4=o9uv$%}qXzFE%0+y<!uI}U0?^7Dv*l^gj2N}~OFt|cZ
zOr*qLn$q-B2z|!fAt@>sf3-WOCZESBU|H<sr{K4#zab@G!w$6l1|uKwQtVq_^y$4V
z6S!}y{@D64aTGBEnjv1QK}c3!4|$Us`;HfjeJ?jyHKCR}5oc#WhYl6zVdmknu@mQZ
zx>S1r)`@lbQ(&#6r{tp*;;CtTaX~!L@VVZd04dg(B;P}U!+1$NOFgrRKkrxlv_<&E
z-hjS`ATZM;W-Yo>`gk*={4{xzKGpt41q~tgD>;%khSB!-fXlR@wY4>8?Oy)Re}{ih
zA<w_W(!m!$ozM(-S$$ZHF%G@){`_zTPzUhIOF#5N?C{;YcmI7u@ZC={r{h-C>FDS%
zZ1Y`=f*i03dp!ppUY)K?;it+X$;iBKx<GB|5L7pEe>e>$0v>!QiiAk8Pcjf(GvP*k
zmA(BjDri@dCmmS?peV}+WglOPJ35!dMc!pC9tqn3%8Mf}%(DpaCR^H*C;#n(0Bl)=
z*te|fuB+<c8xdfMh)NQ!RC`L1GcZ-v2D;W{6J+{;d5*tVX*+X7aJMXTj5_xk-G9q!
z2>j_k(<24A9#0R(h*VFql5ZSjPrJ`tz6l%Z=~3s~UpDH&oX%NO?`b0W=;AKL;T_gP
znA7Co7)Po#KBsSJ{{RPv?tpy={Y;_)^RYd!{Pr3hoC(yS&8h*>n@;G__oiL{3OG$X
zQKBmYpW^|qUc;TKy`GBMG>^8FJj^CYSvumUtmSBtU|OZ``6%YT{yfECEO`PW4_W4b
z_ouxFP**(%te{u8wvpDSf@ogJv!-I2VJPry)N|HRdzgQc8fu0V;rrXMLag898(#4Y
znTUvp4Xw|&`KqG#F6YmjRY|O&&_eKDUSPt>Bi#%6_clB2xap>6SiL^wC%zQV1iRbV
zcAOrmjXugy^b+@t59R7xcY39*wZTi1YM&yTZ%g|b0-7DP6kMQDXG(4+PbbS~wbT2Z
z{#gI+dyPX^i>!y=?wkBkOtmLF_wqBzasOdS(TiZ6y%1{URk+8Dg*|h1<p_L%mg4^@
z>zqw^14&BQDNqWrofx*1aGDKNmp7xQ_ycI!aKT47$7NTLkBFSj)!U!yjiQ81@8dP^
z{n1vLYX!BD_P^X3;P95Y&I3KB!~@1(k4eEveYhRA{vfs}qa7XZfI3uf@S6-v%^%LG
z0%JsGtyMDS53g58UjOY+8A2V=*r1<1LS+%&=p+eHNu|Z2Vh2qq8kFhk^Tsb{ak1?_
z+|9r*`Y^Tc%{!oMX9LBVRa~K*cfnC~Q!7V(>EGo#$A}%}MbuVwv*Ogvx)ci*()$a!
z+^nMJdCwS|XEB<eDT7}0i0Ys7S10|r6<7SwAUyxO&j$D4F%^`I)8}&wodjxT@1yrh
zr?2lty*e*=yYwaW-_uhwGn!|nYKM9x>l-7lp`@2<F02n4OOYj6)}kSj_*4gx(BrHh
z<~Ql$Pjt^TyTfKBZ>B2K?2PF2XCf66x%+F?oSmI{dv9`*s)F@lWja>#jv3mUP_+0k
zg}LvQrDYud0%<QM&>(w-=dd@D{*y(orkCwcx=LgeLH=Ez(I+N3sG=0_+0BM_sNc+L
z_fBc9SKMh1;!2SjqwU7=Jq|2$4?dqN#>Ch5`VDTEHbh>16_Ui}j~SJAnoPaj*5mA+
zRukL4x+m+F%0*wV^y9~mFRwNhw#bcOY59Yr9<-NpS$j+@NW%K_l>^32AEat3cR~8*
z=BBT^cb;XBbLMlBJ1^>hMhPndqifU%P=}rV=zNnqm)&d~BL_OoQkYV$hcl7kId*}C
zS<gSCK|K9Z|5`Gdk0OIG=ToHW)5w4bij3SF5^ekaLbyw&wZQVplMG!JlLxOHAV~}A
zF_I{dP6s+ObBosBmJ~c1`j}$hX4kVv2q6$w^>YyH0yF!iW$rCOk?U#8iq1bK_ZoQ~
z;L;H^XqE`D#16K7`Toivsf4jz^#g<&xVn1l{GKA)i9K3H+kcoo)hG6Hy(FcoXn>9%
z?^L}-x;UIJ;^e~G@Mh-+7DU9cp->n58;Av#vM=)HtYYv=Uf}i>IRwV6*e&4s=<|(n
z1ADEsFKVUawG=JyR6~D>l0u(ezKpH0eWNHpRKWRwh98gqO-A#0uWv7h`;O)!zd55C
z(4$dLPjApARJ1x7to!Ut!%`xRB870|;?ltOhUsPLvFfk_Q#>7_TLNNkp3cNZHUmn=
zB&Cb7&H9;g-U`(B)ets+diCb%H_!)rb2cS;1iz9xrKH9J%_4$@g+;5}SF!%lOu}hi
z`NVw=KGpG2wb<KYSXfMoB+Q2l0?X?g__T`1OEj!_A&=K%Cfz%)ALz0<WjiGBQu0>h
zu3C&IxXYrr^SaU8;+_9ERGeOo*^E3k{fzqhsJXehH7t0N<nFDyBV<;lWpV)9eHmhj
zmZ=*+fpKLvY)(F8+OW}=L{vbzx^MW2`Vqke#H=XI!<wEvgO>7TzgH+=60EWMSuLH>
z!@v3-*2_C!O)sgpP7<=JbKqZ^BqOyLA><jW?}!dCHr`}h`yx#Jn<sG5S9>vpr2c7Q
zQ3sXbYg{d~wnqe3s<Em=|DBzKgQ@0SoHN;j#4{G1$Z+M1ANfe5RlSwz>F?WDy|3bh
ziN)LMh}9I8&Tq<fPO&gen~LX|i*Aj@#V$$&oru5Z6imh#xmdj^p<4{1{;duPN$+#p
zrfbQ@Wr$j(_>fYkANp44@j?nm5h)N+vtJs>V%_yLf|qGD9~Ip>T|DvC>EtHZ7{<nA
zUx{Qx<G}*~$0*a6K)w4Z#t&IM)_spTSc%iXu^lWDkrm9X$#WXd%S`sw=kX6P!`}lL
zc`=VKg=BiLmL^*@e(7R~YYuLP^pu8m$=l+3Wj_KJkw(b9P7enN{d(KU)3>GD+cT93
zl22Pj%o$svbp(wHWKu>I(9f709^Ta`c|cry3lZ#nwcV-cp<1voDvnp?r+btjc>6Wd
zOh^9**he)opu_y|p!MrI=50f&ubCUub1eBY_ka$|?ukN`mGYGw)ajsm?>goc9$SKR
zk3zpGx%=h^Sagz>miGD4djE!DWe3~{y+K((7z&BFI{~@XhUYr6*$-ymv0A8d8(LUc
zNYGseQs}AJHt5T66;X46PXIw!a-r5k)z?AGw|@295PwQEJz{$1QsF>y>?rBR60cun
z)|4Mv%N1-%nHfV>o^`Z3fHG&kZH(eg;z@1PsuYNn5bx|RqUaK84c(ZI;D2E|c}3j%
zNa%7O_2n+ueUMDr@Ffj-{#-|97JJcPf2FsXJZ@;U%TqUS+JKBBNHQ;?TkV+l6y61&
z6|a9zV@lDC&tT3EXX3E7RXl1yCK4oBU0|HcmcNFwPBoX7l}!*NK4R;jEOYRI(IRNr
zgp{L_?j669sw$blqLjKrHhxz6*IG<xsMx}x<wS1-8GXDtc==k2{@__x((bi}9*oIS
zG%%6#;Zr1|HVAPXzrdKQEBer<j@6(J5xpgBrB-CI%7l!l_)5fb^8LJZr1Z<?zB{Cj
zZ9c&jphFC=%Z;5K%NfR__>9pG5>$kHntc7qC)_~ey;OVI2Mx+tA`I$9XHh-AO@zT0
ztd3zAJ|Ya#-KT%cPK3c3(VlZ1Z6XYEJ>^!FCBk5Z74ig~NCZiRKE>BBh-7KrK)u7q
zMb!Go1e44VjjBo)z^t|cQHy8zMN)B(NTp-Isw97+7JF}#)J%g&r8%0GJb0qEL}Qe^
zJc<}hHoorvV<L!hOl@W5h2~Uam5wtJ9B4``E!jv__+GDnGcYjNuvf#K+^eps*>5d%
ziwCM$wRq(lr^ZGC4yDP2s#-!$y>>)6sqlerInCn7sYEA9SX7ko>*B*ciX>kpyg=d6
zqiUVTe~w`-V6saKo>Ew7R9-&TLw$CaG`DB2_G#%#xtn#w$&bfx?>KW>5&H#7N=mA7
zad9!3;bf|H-90?=WTd2Cs!ugOM2kI^ztcyrt7NRgo)}>GKex0vhESrHS;duCQ&ZDv
z+}rg)Mn<t_=lqF#{O+!YQ+98k(XCMUa0rEJkf{6l#YOS$YfA%zv6WlcowkD6uV26F
zf-9@U8a{j|Z*9%WR9Id}()N$-UR`}#@0%di8?jM6Ha5mWw1)1=>d?CpQ;}0pm^TC)
zFFl~7q>R$0a-No!k`fXV8!ORW%mXmQcmMn;WcTS+LLK~If4_8j+5QvhIFqpzvB$eI
zY<yQdBYCuTxSd!b(<;~^2Vb%jMGdB`%)6?hg57T}iBD;IzBBCNys@#-C{{?t`NeTJ
z>NOh$Ox9q*%+79!@!JvwcB7YQUx^Kkj$V4(;VS!3V;z!Y%fQ22_hS(|oE&a?I<GE~
zGo9d4+}73>J}a}=74wtT+kA794S@ul*%M9Q%9@(%(VFNi%%BEO7{M53XgIE5Fm(-?
zYCLJHnV6OFWCbMLG|{uvgeL=ZI1%@N+aREaSs>9pzV?PfSN5s6gB<vuWd5ZJ+>`>=
UU+<<7e^8J>G!4Nu>JD%I51ghpx&QzG

diff --git a/utils/pageList.js b/utils/pageList.js
new file mode 100644
index 0000000..ba45618
--- /dev/null
+++ b/utils/pageList.js
@@ -0,0 +1,55 @@
+import { ref, reactive } from 'vue'
+
+export const usePageList = (apiFun, defaultQueryParams) => {
+
+  const queryParams = reactive({
+    pageNo: 1,
+    pageSize: 10,
+    ...defaultQueryParams
+  })
+
+  const list = ref([])
+  const total = ref(0)
+
+  const fetchData = async () => {
+    try {
+      const res = await apiFun(queryParams)
+
+      if (res.code === 200) {
+        return res.data
+      }
+
+      return { list: [], total: 0 }
+    } catch (err) {
+      return { list: [], total: 0 }
+    }
+  }
+
+  const getData = async () => {
+    queryParams.pageNo = 1
+    const { list: _list, total: _total } = await fetchData()
+
+    list.value = _list
+    total.value = _total
+  }
+
+  const getMore = async () => {
+    if (list.value.length >= total.value) {
+      return
+    }
+
+    queryParams.pageNo++
+    const { list: _list } = await fetchData()
+
+    list.value = list.value.concat(_list)
+  }
+
+  return {
+    queryParams,
+    list,
+    total,
+    getData,
+    getMore,
+  }
+
+}