diff --git a/api/animal.js b/api/animal.js
index 6655a2d..0f56c4c 100644
--- a/api/animal.js
+++ b/api/animal.js
@@ -17,4 +17,9 @@ export const animalPicListAPI = (data) => syhttp.get('/AnimalBreed/animalPicList
 // 上传动物图片
 export const addAnimalPicAPI = (data) => syhttp.post('/AnimalBreed/addAnimalPic', data)
 // 更新动物饲养状态
-export const animalStatusAPI = (data) => syhttp.post('/AnimalBreed/animalStatus', data)
\ No newline at end of file
+export const animalStatusAPI = (data) => syhttp.post('/AnimalBreed/animalStatus', data)
+// 动物历史养殖记录列表
+export const animalChangeListAPI = (data) => syhttp.get('/AnimalBreed/animalChangeList', data)
+// 标记为出栏
+// 
+export const animalSellAPI = (data) => syhttp.post('/AnimalBreed/animalSell', data)
\ No newline at end of file
diff --git a/api/chick.js b/api/chick.js
index 34634a0..a723da0 100644
--- a/api/chick.js
+++ b/api/chick.js
@@ -11,7 +11,7 @@ export const addAnimalAPI = (data) => syhttp.post('/PoultryBreed/addPoultry', da
 // 操作列表
 export const actionsAPI = (data) => syhttp.get('/user/actions', data)
 // 操作列表
-export const animalInfoAPI = (data) => syhttp.get('/AnimalBreed/animalInfo', data)
+export const animalInfoAPI = (data) => syhttp.get('/PoultryBreed/poultryInfo', data)
 // 图片列表
 export const animalPicListAPI = (data) => syhttp.get('/PoultryBreed/poultryPicList', data)
 // 上传动物图片
diff --git a/components/animal/detailCard.vue b/components/animal/detailCard.vue
new file mode 100644
index 0000000..fd8b413
--- /dev/null
+++ b/components/animal/detailCard.vue
@@ -0,0 +1,184 @@
+<template>
+	<view class="" v-if="props.showImg">
+		<view class="" v-if="animal_detail?.pic_detail?.pic">
+			<imgCard :imgUrl='animal_detail.pic_detail.pic'></imgCard>
+		</view>
+		<view class="bad-info">
+			<view class="" style="display: flex;align-items: center;">
+				<u--image src="/static/img/sj.png')" style="margin: 0 5rpx;" width="28.04rpx"
+					height="28.04rpx"></u--image>
+				<text>刷新时间:{{dateFn()}}</text>
+			</view>
+			<view style="display: flex;" @click="navgo(`/pages/feedIng/histroyFeed?id=${props.id}`)">
+				查看历史条件 <u--image src="/static/img/CKGD.png" style="margin-left: 5rpx;" width="31.54rpx"
+					height="31.54rpx"></u--image>
+			</view>
+		</view>
+		<view class="up-plant-btn" @click="updateImgFn">
+			上传新的种植情况
+		</view>
+	</view>
+	<view class="card">
+		<view class="tit">
+
+			<view class="">
+				溯源码: {{animal_detail.animal_code}}
+			</view>
+		</view>
+		<view class="card-li">
+			<view class="">
+				养殖品种: {{animal_detail.animal_kind}}
+			</view>
+			<view class="">
+				年龄: {{animal_detail.animal_age}}
+			</view>
+		</view>
+		<view class="card-li">
+			<view class="">
+				养殖类型: {{animal_detail.animal_breed}}
+			</view>
+			<view class="">
+				体重:{{animal_detail.animal_weight}}
+			</view>
+		</view>
+	</view>
+
+	<view class="card">
+		<view class="card-li">
+			<view class="" style="display: flex;align-items: center;">
+				<u--image src="/static/img/GG.png" style="margin: 0 21rpx;" width="80rpx" height="80rpx"></u--image>
+				当前养殖状态
+			</view>
+			<view class="" style="color: #00A15E;" v-if='animal_detail.animal_status==1'>
+				健康
+			</view>
+			<view class="" style="color: #FFD736;" v-if='animal_detail.animal_status==2'>
+				怀孕中
+			</view>
+			<view class="" style="color: #3274F9;" v-if='animal_detail.animal_status==4'>
+				可出栏
+			</view>
+			<view class="" style="color: #F84221;" v-if='animal_detail.animal_status==3'>
+				生病隔离中
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import imgCard from "@/components/imgCard.vue"
+	import uplodeImg from "@/utils/uplodeImg.js"
+	import {
+		animalInfoAPI,
+		addAnimalPicAPI
+	} from "@/api/animal.js"
+	import {
+		ref,
+		reactive,
+		watch
+	} from "vue"
+	const dateFn = () => {
+		var today = new Date();
+
+		// 获取年、月、日
+		var year = today.getFullYear();
+		var month = today.getMonth() + 1; // 月份从0开始，需要加1
+		var day = today.getDate();
+
+		// 构建日期字符串
+		var dateStr = year + '-' + month + '-' + day;
+		return dateStr
+		// 输出日期字符串
+	}
+	const navgo = (url) => {
+		uni.navigateTo({
+			url
+		})
+	}
+	// 详情猪
+	const objFn = (res, data) => {
+		for (let key in res) {
+			data[key] = res[key]
+		}
+	}
+
+	const animal_detail = reactive({})
+	const props = defineProps({
+		id: String,
+		showImg: Boolean
+	})
+	watch(props, (newValue, oldVlaue) => {
+		if (props?.id) {
+			animalInfoAPI({
+				animal_id: Number(props.id)
+			}).then(res => {
+				objFn(res.data, animal_detail)
+			})
+		}
+	}, {
+		// 页面加载会先执行一次
+		immediate: true
+	})
+	const updateImgFn = () => {
+		uplodeImg().then(res => {
+			animal_detail.pic_detail.pic = res.data.image
+			// img.value = res.data.image
+			addAnimalPicAPI({
+				animal_id: Number(props.id),
+				pic: res.data.image
+			})
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.card {
+		margin-bottom: 20rpx;
+
+		.tit {
+			display: flex;
+			justify-content: space-between;
+			padding-bottom: 20rpx;
+			border-bottom: 1px solid #EBF1EF;
+		}
+
+		.card-li {
+			margin-top: 20rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+	}
+
+	.bad-info {
+		display: flex;
+		// background-color: red;
+		justify-content: space-between;
+		align-items: center;
+		margin: 20rpx 0;
+		color: #737373;
+		width: 693.93rpx;
+		font-size: 26.29rpx;
+
+		.tit-b {
+			color: red;
+		}
+
+
+	}
+
+	.up-plant-btn {
+		width: 371.5rpx;
+		height: 66.59rpx;
+		color: #00A15E;
+		margin: 40rpx auto;
+		border: 1px solid #00A15E;
+		font-weight: bold;
+		border-radius: 42.06rpx 42.06rpx 42.06rpx 42.06rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+	}
+</style>
\ No newline at end of file
diff --git a/components/animal/farmersCard.vue b/components/animal/farmersCard.vue
new file mode 100644
index 0000000..712b88a
--- /dev/null
+++ b/components/animal/farmersCard.vue
@@ -0,0 +1,79 @@
+<template>
+	<view class="card" v-if="userInfo.animal_detail">
+		<!-- {{userInfo.animal_detail.total_count}} -->
+		<view class="tit">
+			<view class="">
+				农户名称: {{userInfo.name}}
+			</view>
+		</view>
+		<view class="card-li">
+			<view class="">
+				种养殖类型: 养殖户
+			</view>
+			<view class="">
+				养殖头数: {{userInfo.animal_detail.total_count}}头
+			</view>
+		</view>
+		<view class="card-li">
+			<view class="">
+				土地面积:{{userInfo.total_land_area}}亩
+			</view>
+			<view class="">
+				公: {{userInfo.animal_detail.male_count}}头
+			</view>
+		</view>
+		<view class="card-li">
+			<view class="">
+				养殖种类: {{userInfo.animal_detail.kind[0]}},{{userInfo.animal_detail.kind[1]}}
+			</view>
+			<view class="">
+				母: {{userInfo.animal_detail.maternal_count}}头
+			</view>
+		</view>
+		<view class="card-li">
+			<view class="">
+				具体种类: {{userInfo.animal_detail.breed[0]}}
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		watch
+	} from "vue";
+	import {
+		userInfoAPI
+	} from "@/api/plant.js"
+
+	const userInfo = reactive({})
+	const objFn = (res, data) => {
+		for (let key in res) {
+			data[key] = res[key]
+		}
+	}
+	userInfoAPI({
+		user_id: 307
+	}).then(res => {
+		objFn(res.data, userInfo)
+	})
+</script>
+
+<style lang="scss" scoped>
+	.card {
+		.tit {
+			display: flex;
+			justify-content: space-between;
+			padding-bottom: 20rpx;
+			border-bottom: 1px solid #EBF1EF;
+		}
+
+		.card-li {
+			margin-top: 20rpx;
+			display: flex;
+			justify-content: space-between;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/aquatic/pondCard.vue b/components/aquatic/pondCard.vue
new file mode 100644
index 0000000..75614ba
--- /dev/null
+++ b/components/aquatic/pondCard.vue
@@ -0,0 +1,114 @@
+<template>
+	<view class="card">
+		<view class="tit">
+			<view class="">
+				农户名称: ???
+			</view>
+			<view class="">
+				<!-- {{headData}} -->
+				溯源码: {{headData.source_code}}
+			</view>
+		</view>
+
+		<view class="card-li">
+			<view class="">
+				种养殖类型: 养殖户
+			</view>
+			<view class="">
+				养殖数量: {{headData.total_num}}
+			</view>
+		</view>
+		<view class="card-li">
+			<view class="">
+				土地面积: 20亩
+			</view>
+			<view class="">
+				草鱼鱼苗: 的划分等级
+			</view>
+		</view>
+		<view class="card-li" v-if="headData.kind">
+			<view class="">
+				养殖种类: {{headData.kind[0]}},{{headData.kind[1]}},{{headData.kind[2]}}
+			</view>
+			<view class="">
+				鲫鱼鱼苗: 的划分等级
+			</view>
+		</view>
+		<view class="card-li" v-if="headData.breed">
+			<view class="">
+				<!-- {{}} -->
+				具体种类: {{headData.breed[0]}},{{headData.breed[1]}},{{headData.breed[2]}}
+			</view>
+		</view>
+		<view class="add-btn" v-if="props.showBtn" @click="navgo(`/pages/aquatic/addPond?pond_id=${props.id}`)">
+			添加水产养殖
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive,
+		watch
+	} from "vue"
+	import {
+		pondInfoAPI,
+
+	} from "@/api/aquatic.js"
+	const props = defineProps({
+		id: String,
+		showBtn: Boolean
+	})
+	const headData = reactive({})
+	watch(props, (newValue, oldVlaue) => {
+		// console.log(newValue, oldVlaue)
+		if (props?.id) {
+			pondInfoAPI({
+				user_id: 307,
+				pond_id: props.id
+			}).then(res => {
+				for (let key in res.data) {
+					headData[key] = (res.data)[key]
+				}
+			})
+		}
+	}, {
+		immediate: true
+	})
+	const navgo = (url) => {
+		uni.navigateTo({
+			url
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.card {
+		.tit {
+			display: flex;
+			justify-content: space-between;
+			padding-bottom: 20rpx;
+			border-bottom: 1px solid #EBF1EF;
+		}
+
+		.card-li {
+			margin-top: 20rpx;
+			display: flex;
+			justify-content: space-between;
+		}
+	}
+
+	.add-btn {
+		margin: 0 auto;
+		width: 220.79rpx;
+		height: 57.83rpx;
+		color: #00A15E;
+		border: 1px solid #00A15E;
+		border-radius: 50rpx;
+		display: flex;
+		justify-content: center;
+		line-height: 57rpx;
+		font-size: 26rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/components/index/chick.vue b/components/index/chick.vue
index 7d2c187..e4d0f0a 100644
--- a/components/index/chick.vue
+++ b/components/index/chick.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="card">
+		<!-- <view class="card">
 			<view class="tit">
 				<view class="">
 					农户名称: {{userInfo.name}}
@@ -36,7 +36,8 @@
 				</view>
 
 			</view>
-		</view>
+		</view> -->
+		<farmersCard></farmersCard>
 		<view class="circumstance">
 			<view class="card-tit">
 				<view class="">
@@ -90,7 +91,7 @@
 				<view class="">
 					{{index}}
 				</view>
-				<view class="updata-btn" @click="navgo('/pages/growRecord/index')">
+				<view class="updata-btn" @click="navgo('/pages/growRecord/index?type=2')">
 					更新{{index.slice(0,-2)}}
 				</view>
 			</view>
@@ -158,6 +159,7 @@
 		reactive
 	} from "vue"
 	import myTable from "@/components/myTable/index.vue"
+	import farmersCard from "@/components/poultry/farmersCard.vue"
 	import {
 		onLoad
 	} from "@dcloudio/uni-app"
diff --git a/components/index/cultivation.vue b/components/index/cultivation.vue
index e57f98a..5af203a 100644
--- a/components/index/cultivation.vue
+++ b/components/index/cultivation.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="card">
+		<!-- <view class="card">
 			<view class="tit">
 				<view class="">
 					农户名称: {{userInfo.name}}
@@ -36,7 +36,8 @@
 				</view>
 
 			</view>
-		</view>
+		</view> -->
+		<farmersCard></farmersCard>
 		<view class="circumstance">
 			<view class="card-tit">
 				<view class="">
@@ -87,11 +88,12 @@
 				<view class="">
 					{{index}}
 				</view>
-				<view class="updata-btn" @click="navgo('/pages/growRecord/index')">
+				<view class="updata-btn" @click="navgo('/pages/growRecord/index?type=3')">
 					更新{{index.slice(0,-2)}}
 				</view>
 			</view>
-			<myTable :tit='`查看${index.slice(0,-2)}`' :dataList="item.action_record" route='/pages/feedIng/allRecording'>
+			<myTable :tit='`查看${index.slice(0,-2)}`' :dataList="item.action_record"
+				route='/pages/feedIng/allRecordTable'>>
 			</myTable>
 		</view>
 
@@ -151,6 +153,7 @@
 		animalEnvDataAPI,
 		actionsAPI
 	} from "@/api/animal.js"
+	import farmersCard from "@/components/animal/farmersCard.vue"
 	const props = defineProps({
 		userInfo: Object
 	})
diff --git a/components/index/fishing.vue b/components/index/fishing.vue
index 14aa0ac..907a9a0 100644
--- a/components/index/fishing.vue
+++ b/components/index/fishing.vue
@@ -10,7 +10,10 @@
 					农户名称: {{userInfo.name}}
 				</view>
 				<view class="card-li">
-					种养殖类型: 种植户
+					种养殖类型: 养殖户
+				</view>
+				<view class="card-li">
+					<!-- 养殖种类: {{userInfo.}} -->
 				</view>
 				<view class="card-li">
 					土地面积: {{userInfo.total_land_area}}亩
diff --git a/components/myTable/index.vue b/components/myTable/index.vue
index 18a16f0..0859555 100644
--- a/components/myTable/index.vue
+++ b/components/myTable/index.vue
@@ -46,11 +46,18 @@
 	}
 
 	const objFn = (obj) => {
-		for (const [key, value] of Object.entries(JSON.parse(obj))) {
-			return (`${key}: ${value}`);
+		if (typeof(obj) == 'object') {
+			for (const [key, value] of Object.entries((obj))) {
+				return (`${key}: ${value}`);
+			}
+		} else {
+			for (const [key, value] of Object.entries(JSON.parse(obj))) {
+				return (`${key}: ${value}`);
+			}
 		}
 
 
+
 	}
 </script>
 
diff --git a/components/plant/landInfo.vue b/components/plant/landInfo.vue
index bc165de..eb03505 100644
--- a/components/plant/landInfo.vue
+++ b/components/plant/landInfo.vue
@@ -74,7 +74,6 @@
 			})
 		}
 	}, {
-		// 页面加载会先执行一次
 		immediate: true
 	})
 </script>
diff --git a/components/poultry/detailCard.vue b/components/poultry/detailCard.vue
new file mode 100644
index 0000000..92eace6
--- /dev/null
+++ b/components/poultry/detailCard.vue
@@ -0,0 +1,185 @@
+<template>
+	<view class="" v-if="props.showImg">
+		<view class="" v-if="animal_detail?.pic_detail?.pic">
+			<imgCard :imgUrl='animal_detail.pic_detail.pic'></imgCard>
+		</view>
+		<view class="bad-info">
+			<view class="" style="display: flex;align-items: center;">
+				<u--image src="/static/img/sj.png')" style="margin: 0 5rpx;" width="28.04rpx"
+					height="28.04rpx"></u--image>
+				<text>刷新时间:{{dateFn()}}</text>
+			</view>
+			<view style="display: flex;" @click="navgo(`/pages/feedIng/histroyFeed?id=${props.id}`)">
+				查看历史条件 <u--image src="/static/img/CKGD.png" style="margin-left: 5rpx;" width="31.54rpx"
+					height="31.54rpx"></u--image>
+			</view>
+		</view>
+		<view class="up-plant-btn" @click="updateImgFn">
+			上传新的种植情况
+		</view>
+	</view>
+	<view class="card">
+		<view class="tit">
+
+			<view class="">
+				溯源码: {{animal_detail.code}}
+			</view>
+		</view>
+		<view class="card-li">
+			<view class="">
+				养殖品种: {{animal_detail.kind}}
+			</view>
+			<view class="">
+				年龄: {{animal_detail.age}}
+			</view>
+		</view>
+		<view class="card-li">
+			<view class="">
+				养殖类型: {{animal_detail.breed}}
+			</view>
+			<view class="">
+				体重:{{animal_detail.weight}}
+			</view>
+		</view>
+	</view>
+
+	<view class="card">
+		<view class="card-li">
+			<view class="" style="display: flex;align-items: center;">
+				<u--image src="/static/img/GG.png" style="margin: 0 21rpx;" width="80rpx" height="80rpx"></u--image>
+				当前养殖状态
+			</view>
+			<view class="" style="color: #00A15E;" v-if='animal_detail.status==1'>
+				健康
+			</view>
+			<view class="" style="color: #FFD736;" v-if='animal_detail.status==2'>
+				怀孕中
+			</view>
+			<view class="" style="color: #3274F9;" v-if='animal_detail.status==4'>
+				可出栏
+			</view>
+			<view class="" style="color: #F84221;" v-if='animal_detail.status==3'>
+				生病隔离中
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script setup>
+	import imgCard from "@/components/imgCard.vue"
+	import uplodeImg from "@/utils/uplodeImg.js"
+	import {
+		animalInfoAPI,
+		addAnimalPicAPI
+	} from "@/api/chick.js"
+	import {
+		ref,
+		reactive,
+		watch
+	} from "vue"
+	const dateFn = () => {
+		var today = new Date();
+
+		// 获取年、月、日
+		var year = today.getFullYear();
+		var month = today.getMonth() + 1; // 月份从0开始，需要加1
+		var day = today.getDate();
+
+		// 构建日期字符串
+		var dateStr = year + '-' + month + '-' + day;
+		return dateStr
+		// 输出日期字符串
+	}
+	const navgo = (url) => {
+		uni.navigateTo({
+			url
+		})
+	}
+	// 详情猪
+	const objFn = (res, data) => {
+		for (let key in res) {
+			data[key] = res[key]
+		}
+	}
+
+	const animal_detail = reactive({})
+	const props = defineProps({
+		id: String,
+		showImg: Boolean
+	})
+	watch(props, (newValue, oldVlaue) => {
+		console.log("dfhsdfgsdjk")
+		if (props?.id) {
+			animalInfoAPI({
+				poultry_id: Number(props.id)
+			}).then(res => {
+				objFn(res.data, animal_detail)
+			})
+		}
+	}, {
+		// 页面加载会先执行一次
+		immediate: true
+	})
+	const updateImgFn = () => {
+		uplodeImg().then(res => {
+			animal_detail.pic_detail.pic = res.data.image
+			// img.value = res.data.image
+			addAnimalPicAPI({
+				poultry_id: Number(props.id),
+				pic: res.data.image
+			})
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.card {
+		margin-bottom: 20rpx;
+
+		.tit {
+			display: flex;
+			justify-content: space-between;
+			padding-bottom: 20rpx;
+			border-bottom: 1px solid #EBF1EF;
+		}
+
+		.card-li {
+			margin-top: 20rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+		}
+	}
+
+	.bad-info {
+		display: flex;
+		// background-color: red;
+		justify-content: space-between;
+		align-items: center;
+		margin: 20rpx 0;
+		color: #737373;
+		width: 693.93rpx;
+		font-size: 26.29rpx;
+
+		.tit-b {
+			color: red;
+		}
+
+
+	}
+
+	.up-plant-btn {
+		width: 371.5rpx;
+		height: 66.59rpx;
+		color: #00A15E;
+		margin: 40rpx auto;
+		border: 1px solid #00A15E;
+		font-weight: bold;
+		border-radius: 42.06rpx 42.06rpx 42.06rpx 42.06rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+	}
+</style>
\ No newline at end of file
diff --git a/components/poultry/farmersCard.vue b/components/poultry/farmersCard.vue
new file mode 100644
index 0000000..e87c012
--- /dev/null
+++ b/components/poultry/farmersCard.vue
@@ -0,0 +1,80 @@
+<template>
+	<!-- {{userInfo.poultry_detail}} -->
+	<view class="card" v-if="userInfo.poultry_detail">
+		<!-- {{userInfo.animal_detail.total_count}} -->
+		<view class="tit">
+			<view class="">
+				农户名称: {{userInfo.name}}
+			</view>
+		</view>
+		<view class="card-li">
+			<view class="">
+				种养殖类型: 养殖户
+			</view>
+			<view class="">
+				养殖头数: {{userInfo.poultry_detail.total_count}}头
+			</view>
+		</view>
+		<view class="card-li">
+			<view class="">
+				土地面积:{{userInfo.total_land_area}}亩
+			</view>
+			<view class="">
+				公: {{userInfo.poultry_detail.male_count}}头
+			</view>
+		</view>
+		<view class="card-li">
+			<view class="">
+				养殖种类: {{userInfo.poultry_detail.kind[0]}},{{userInfo.poultry_detail.kind[1]}}
+			</view>
+			<view class="">
+				母: {{userInfo.poultry_detail.maternal_count}}头
+			</view>
+		</view>
+		<view class="card-li">
+			<view class="">
+				具体种类: {{userInfo.poultry_detail.breed[0]}}
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		reactive,
+		watch
+	} from "vue";
+	import {
+		userInfoAPI
+	} from "@/api/plant.js"
+
+	const userInfo = reactive({})
+	const objFn = (res, data) => {
+		for (let key in res) {
+			data[key] = res[key]
+		}
+	}
+	userInfoAPI({
+		user_id: 307
+	}).then(res => {
+		objFn(res.data, userInfo)
+	})
+</script>
+
+<style lang="scss" scoped>
+	.card {
+		.tit {
+			display: flex;
+			justify-content: space-between;
+			padding-bottom: 20rpx;
+			border-bottom: 1px solid #EBF1EF;
+		}
+
+		.card-li {
+			margin-top: 20rpx;
+			display: flex;
+			justify-content: space-between;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/node_modules/.vite/deps/_metadata.json b/node_modules/.vite/deps/_metadata.json
index 33a3dee..b604ee4 100644
--- a/node_modules/.vite/deps/_metadata.json
+++ b/node_modules/.vite/deps/_metadata.json
@@ -1,11 +1,11 @@
 {
-  "hash": "a1d62a80",
-  "browserHash": "90e08141",
+  "hash": "25035236",
+  "browserHash": "1466e902",
   "optimized": {
     "uview-plus": {
       "src": "../../uview-plus/index.js",
       "file": "uview-plus.js",
-      "fileHash": "b7892bb7",
+      "fileHash": "a0f19e5d",
       "needsInterop": false
     }
   },
diff --git a/pages.json b/pages.json
index da6e15b..6d0e16a 100644
--- a/pages.json
+++ b/pages.json
@@ -113,6 +113,14 @@
 				"navigationBarBackgroundColor": "#F4F4F4",
 				"navigationBarTextStyle": "black"
 			}
+		}, {
+			"path": "pages/feedIng/allRecordTable",
+			"style": {
+				"navigationBarTitleText": "记录列表",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#F4F4F4",
+				"navigationBarTextStyle": "black"
+			}
 		}, {
 			"path": "pages/feedIng/allFeed",
 			"style": {
diff --git a/pages/aquatic/detail.vue b/pages/aquatic/detail.vue
index 68d285d..64e5287 100644
--- a/pages/aquatic/detail.vue
+++ b/pages/aquatic/detail.vue
@@ -14,62 +14,13 @@
 		<view class="up-plant-btn" @click="updateImgFn">
 			上传新的种植情况
 		</view>
-		<view class="card">
-			<view class="tit">
-				<view class="">
-					农户名称: 1号土地
-				</view>
-				<view class="">
-					溯源码: 1号土地
-				</view>
-			</view>
-			<view class="card-li">
-				<view class="">
-					农户名称: 土豆
-				</view>
-				<view class="">
-					溯源码: 的划分等级
-				</view>
-			</view>
-			<view class="card-li">
-				<view class="">
-					种养殖类别: 20亩
-				</view>
-				<view class="">
-					养殖数量: 的划分等级
-				</view>
-			</view>
-			<view class="card-li">
-				<view class="">
-					土地面积: 20亩
-				</view>
-				<view class="">
-					草鱼鱼苗: 的划分等级
-				</view>
-			</view>
-			<view class="card-li">
-				<view class="">
-					养殖种类: 20亩
-				</view>
-				<view class="">
-					鲫鱼鱼苗: 的划分等级
-				</view>
-			</view>
-			<view class="card-li">
-				<view class="">
-					具体种类: 20亩
-				</view>
-			</view>
-			<view class="add-btn" @click="navgo(`/pages/aquatic/addPond?pond_id=${pond_id}`)">
-				添加水产养殖
-			</view>
-		</view>
+		<pondCard :id='pond_id' :showBtn="true"></pondCard>
 		<view class="circumstance" v-for="(item,index) in actionList" :key="index">
 			<view class="card-tit">
 				<view class="">
 					{{index}}
 				</view>
-				<view class="updata-btn" @click="navgo('/pages/growRecord/index')">
+				<view class="updata-btn" @click="navgo('/pages/growRecord/index?type=4')">
 					更新{{index.slice(0,-2)}}
 				</view>
 			</view>
@@ -157,6 +108,7 @@
 	} from "@/api/aquatic.js"
 	import myTable from "@/components/myTable/index.vue"
 	import imgCard from "@/components/imgCard.vue"
+	import pondCard from "@/components/aquatic/pondCard.vue"
 	import {
 		onLoad
 	} from "@dcloudio/uni-app"
diff --git a/pages/aquatic/imgList.vue b/pages/aquatic/imgList.vue
index 7686aee..04423e0 100644
--- a/pages/aquatic/imgList.vue
+++ b/pages/aquatic/imgList.vue
@@ -44,8 +44,8 @@
 			</view>
 
 		</view> -->
-		<landInfo :pond_id='pond_id'></landInfo>
-
+		<!-- <landInfo :pond_id='pond_id'></landInfo> -->
+		<pondCard :id='pond_id'></pondCard>
 		<!-- <view class="status">
 			<view class="" style="margin-bottom: 30rpx;">
 				今日种植状态
@@ -77,8 +77,9 @@
 </template>
 
 <script setup>
-	import landInfo from "@/components/plant/landInfo.vue"
+	// import landInfo from "@/components/plant/landInfo.vue"
 	import imgCard from "@/components/imgCard.vue"
+	import pondCard from "@/components/aquatic/pondCard.vue"
 	import {
 		fishPicListAPI,
 		addFishPicAPI
diff --git a/pages/detail/plant.vue b/pages/detail/plant.vue
index 7bd2125..019713f 100644
--- a/pages/detail/plant.vue
+++ b/pages/detail/plant.vue
@@ -22,17 +22,18 @@
 		<landInfo :land_id='landDeatil.land_id'></landInfo>
 		<!-- 生长记录 -->
 
-		<!-- 	<view class="grow-record-tit">
+		<view class="grow-record-tit">
 			<view class="">
 				生长记录操作
 			</view>
-			<view class="updata-btn" @tap="navgo(`/pages/growRecord/index?land_id=${landDeatil.land_id}`)">
+			<view class="updata-btn" @tap="navgo(`/pages/growRecord/index?land_id=${landDeatil.land_id}&type=1`)">
 				更新生长记录
 			</view>
 		</view>
-		<myTable tit='查看历史记录' :dataList="tableDate" route='/pages/records/index'></myTable> -->
+		<myTable tit='查看历史记录' :dataList="tableDate" :route='`/pages/records/index?land_id=${landDeatil.land_id}`'>
+		</myTable>
 
-		<view class="circumstance" v-for="(item,index) in actionList" :key="index">
+		<!-- <view class="circumstance" v-for="(item,index) in tableDate" :key="index">
 			<view class="card-tit">
 				<view class="">
 					{{index}}
@@ -43,7 +44,7 @@
 			</view>
 			<myTable :tit='`查看${index.slice(0,-2)}`' :dataList="item.action_record" route='/pages/feedIng/allRecording'>
 			</myTable>
-		</view>
+		</view> -->
 
 		<view class="data">
 			<view class="tit">
@@ -293,14 +294,13 @@
 		}
 
 	}
-	const actionList = reactive({})
-	actionsAPI({
-		type: 1
-	}).then(res => {
-		for (let key in res.data) {
-			actionList[key] = (res.data)[key]
-		}
-	})
+	// actionsAPI({
+	// 	type: 1
+	// }).then(res => {
+	// 	for (let key in res.data) {
+	// 		actionList[key] = (res.data)[key]
+	// 	}
+	// })
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/feedIng/SingleDetail.vue b/pages/feedIng/SingleDetail.vue
index 5808bcc..5ef681a 100644
--- a/pages/feedIng/SingleDetail.vue
+++ b/pages/feedIng/SingleDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<imgCard></imgCard>
+		<!-- <imgCard></imgCard>
 
 		<view class="bad-info">
 			<view class="" style="display: flex;align-items: center;">
@@ -13,10 +13,9 @@
 			</view>
 		</view>
 		<view class="up-plant-btn" @click="updateImgFn">
-
 			上传新的种植情况
-		</view>
-		<view class="card">
+		</view> -->
+		<!-- <view class="card">
 			<view class="tit">
 				<view class="">
 					编号: 52656
@@ -41,9 +40,9 @@
 					体重: 45kg
 				</view>
 			</view>
-		</view>
+		</view> -->
 
-		<view class="card">
+		<!-- <view class="card">
 			<view class="card-li">
 				<view class="" style="display: flex;align-items: center;">
 					<u--image src="/static/img/GG.png" style="margin: 0 21rpx;" width="80rpx" height="80rpx"></u--image>
@@ -54,7 +53,8 @@
 				</view>
 			</view>
 
-		</view>
+		</view> -->
+		<detailCard :id="animal_id" :showImg='true'></detailCard>
 		<view class="">
 			<view class="" style="margin-bottom: 20rpx;">
 				饲养记录
@@ -67,6 +67,7 @@
 <script setup>
 	import myTable from "@/components/myTable/index.vue"
 	import imgCard from "@/components/imgCard.vue"
+	import detailCard from "@/components/animal/detailCard.vue"
 	import {
 		ref
 	} from "vue"
diff --git a/pages/feedIng/allRecordTable.vue b/pages/feedIng/allRecordTable.vue
new file mode 100644
index 0000000..ca157d5
--- /dev/null
+++ b/pages/feedIng/allRecordTable.vue
@@ -0,0 +1,84 @@
+<template>
+	<view class="content">
+		<farmersCard></farmersCard>
+		<view class="circumstance" v-for="(item,index) in actionList" :key="index">
+			<view class="card-tit">
+				<view class="">
+					{{index}}
+				</view>
+				<view class="updata-btn" @click="navgo('/pages/growRecord/index')">
+					更新{{index.slice(0,-2)}}
+				</view>
+			</view>
+			<myTable :dataList="item.action_record">>
+			</myTable>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import farmersCard from "@/components/animal/farmersCard.vue"
+	import {
+		ref,
+		reactive
+	} from "vue"
+	import myTable from "@/components/myTable/index.vue"
+	import {
+
+		actionsAPI
+	} from "@/api/animal.js"
+	const actionList = reactive({})
+	actionsAPI({
+		type: 3
+	}).then(res => {
+		for (let key in res.data) {
+			actionList[key] = (res.data)[key]
+		}
+	})
+	const navgo = (url) => {
+		uni.navigateTo({
+			url
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.circumstance {
+		width: 693.93rpx;
+		margin: 0 auto;
+		margin-bottom: 43rpx;
+
+		.card-tit {
+			display: flex;
+			justify-content: space-between;
+			margin-bottom: 28rpx;
+		}
+
+		.updata-btn {
+			font-size: 26.29rpx;
+			// width: 192.76rpx;
+			padding: 0 30rpx;
+			height: 57.83rpx;
+			border: 1px solid #00A15E;
+			color: #00A15E;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-radius: 31.54rpx 31.54rpx 31.54rpx 31.54rpx;
+		}
+
+		.check {
+			font-size: 29.79rpx;
+			text-align: center;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
+
+		.tab {
+
+			height: 500rpx;
+			background-color: red;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/feedIng/allRecording.vue b/pages/feedIng/allRecording.vue
index 30d1cef..7d331d1 100644
--- a/pages/feedIng/allRecording.vue
+++ b/pages/feedIng/allRecording.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="card">
+		<!-- <view class="card">
 			<view class="tit">
 				<view class="">
 					农户名称: 1号土地
@@ -38,8 +38,8 @@
 					幼崽: 的划分等级
 				</view>
 			</view>
-		</view>
-
+		</view> -->
+		<detailCard :id='id'></detailCard>
 		<view class="" style="margin-bottom: 20rpx;">
 			饲养记录
 		</view>
@@ -50,6 +50,17 @@
 
 <script setup>
 	import myTable from "@/components/myTable/index.vue"
+	import {
+		onLoad
+	} from "@dcloudio/uni-app"
+	import detailCard from "@/components/animal/detailCard.vue"
+	import {
+		ref
+	} from "vue"
+	const id = ref(0)
+	onLoad((option) => {
+		id.value = option.id
+	})
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/feedIng/feedDetail.vue b/pages/feedIng/feedDetail.vue
index cdf5da2..1cc45c6 100644
--- a/pages/feedIng/feedDetail.vue
+++ b/pages/feedIng/feedDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content" @click.capture="selectAct=false">
-		<view class="card">
+		<!-- <view class="card">
 			<view class="tit">
 				<view class="">
 					农户名称: 1号土地
@@ -38,8 +38,8 @@
 					幼崽: 的划分等级
 				</view>
 			</view>
-		</view>
-
+		</view> -->
+		<farmersCard></farmersCard>
 		<!-- <view class="serch">
 			<u-search bgColor='white' height='63.08rpx' :show-action="false" actionText="搜索"
 				:animation="true"></u-search>
@@ -106,7 +106,8 @@
 					更新{{index.slice(0,-2)}}
 				</view>
 			</view>
-			<myTable :tit='`查看${index.slice(0,-2)}`' :dataList="item.action_record" route='/pages/feedIng/allRecording'>
+			<myTable :tit='`查看${index.slice(0,-2)}`' :dataList="item.action_record"
+				:route='`/pages/feedIng/allRecording?id=${animal_id}`'>
 			</myTable>
 		</view>
 		<view class="ripe-btn" @tap="outBar">
@@ -117,6 +118,7 @@
 </template>
 
 <script setup>
+	import farmersCard from "@/components/animal/farmersCard.vue"
 	import imgCard from "@/components/imgCard.vue"
 	import myTable from "@/components/myTable/index.vue"
 	import {
@@ -128,7 +130,10 @@
 	} from "vue"
 	import {
 		animalInfoAPI,
-		animalStatusAPI
+		animalStatusAPI,
+		animalChangeListAPI,
+		animalSellAPI
+
 	} from "@/api/animal.js"
 	import {
 		actionsAPI
@@ -136,6 +141,7 @@
 	const selectList = reactive([
 		"健康", "怀孕中", "生病隔离中", "可出栏"
 	])
+	const actionList = reactive({})
 	const value = ref("")
 	const selectAct = ref(false)
 	const selectFoucsFn = (e) => {
@@ -162,6 +168,15 @@
 			value.value = selectList[baseData.animal_status - 1]
 			indexs.value = baseData.animal_status - 1
 		})
+		animalChangeListAPI({
+			animal_id: animal_id.value
+		}).then(res => {
+			console.log(res.data)
+			return
+			for (let key in res.data) {
+				actionList[key] = (res.data)[key]
+			}
+		})
 	})
 	const navgo = (url) => {
 		uni.navigateTo({
@@ -184,8 +199,7 @@
 		})
 	}
 	const outBar = () => {
-		animalStatusAPI({
-			status: 4,
+		animalSellAPI({
 			animal_id: animal_id.value,
 		}).then(res => {
 			uni.showToast({
@@ -199,14 +213,13 @@
 			}, 2000)
 		})
 	}
-	const actionList = reactive({})
-	actionsAPI({
-		type: 3
-	}).then(res => {
-		for (let key in res.data) {
-			actionList[key] = (res.data)[key]
-		}
-	})
+	// animalChangeListAPI({
+	// 	animal_id: animal_id
+	// }).then(res => {
+	// 	for (let key in res.data) {
+	// 		actionList[key] = (res.data)[key]
+	// 	}
+	// })
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/feedIng/feedList.vue b/pages/feedIng/feedList.vue
index 7fd6faf..74a8972 100644
--- a/pages/feedIng/feedList.vue
+++ b/pages/feedIng/feedList.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="card">
+		<!-- <view class="card">
 			<view class="tit">
 				<view class="">
 					农户名称: 1号土地
@@ -38,8 +38,9 @@
 					幼崽: 的划分等级
 				</view>
 			</view>
-		</view>
-
+			
+		</view> -->
+		<farmersCard></farmersCard>
 		<view class="serch">
 			<u-search bgColor='white' v-model="query" height='63.08rpx' :show-action="false" actionText="搜索"
 				:animation="true"></u-search>
@@ -89,6 +90,7 @@
 	import {
 		animalListAPI,
 	} from "@/api/animal.js"
+	import farmersCard from "@/components/animal/farmersCard.vue"
 	import {
 		reactive,
 		ref
diff --git a/pages/feedIng/histroyFeed.vue b/pages/feedIng/histroyFeed.vue
index 48c3de7..ba6473d 100644
--- a/pages/feedIng/histroyFeed.vue
+++ b/pages/feedIng/histroyFeed.vue
@@ -1,28 +1,26 @@
 <template>
 	<view class="content">
-		<view class="card">
+		<!-- <view class="card">
 			<view class="tit">
+
 				<view class="">
-					编号: 52656
-				</view>
-				<view class="">
-					溯源码: 52656
+					溯源码: {{animal_detail.animal_code}}
 				</view>
 			</view>
 			<view class="card-li">
 				<view class="">
-					养殖品种: 土豆
+					养殖品种: {{animal_detail.animal_kind}}
 				</view>
 				<view class="">
-					年龄: 的划分等级
+					年龄: {{animal_detail.animal_age}}
 				</view>
 			</view>
 			<view class="card-li">
 				<view class="">
-					养殖类型: 20亩
+					养殖类型: {{animal_detail.animal_breed}}
 				</view>
 				<view class="">
-					体重: 45kg
+					体重:{{animal_detail.animal_weight}}
 				</view>
 			</view>
 		</view>
@@ -33,13 +31,22 @@
 					<u--image src="/static/img/GG.png" style="margin: 0 21rpx;" width="80rpx" height="80rpx"></u--image>
 					当前养殖状态
 				</view>
-				<view class="" style="color: green;">
+				<view class="" style="color: #00A15E;" v-if='animal_detail.animal_status==1'>
 					健康
 				</view>
+				<view class="" style="color: #FFD736;" v-if='animal_detail.animal_status==2'>
+					怀孕中
+				</view>
+				<view class="" style="color: #3274F9;" v-if='animal_detail.animal_status==4'>
+					可出栏
+				</view>
+				<view class="" style="color: #F84221;" v-if='animal_detail.animal_status==3'>
+					生病隔离中
+				</view>
 			</view>
 
-		</view>
-
+		</view> -->
+		<detailCard :id='animal_id'></detailCard>
 		<view class="">
 			<view class="">
 				养殖情况
@@ -60,7 +67,8 @@
 	import uplodeImg from "@/utils/uplodeImg.js"
 	import {
 		animalPicListAPI,
-		addAnimalPicAPI
+		addAnimalPicAPI,
+		animalInfoAPI
 	} from "@/api/animal.js"
 	import {
 		onLoad
@@ -69,6 +77,7 @@
 		reactive,
 		ref
 	} from "vue";
+	import detailCard from "@/components/animal/detailCard.vue"
 	const img = ref("")
 	const updateImgFn = () => {
 		uplodeImg().then(res => {
diff --git a/pages/growRecord/index.vue b/pages/growRecord/index.vue
index b16097d..b732e09 100644
--- a/pages/growRecord/index.vue
+++ b/pages/growRecord/index.vue
@@ -1,136 +1,214 @@
 <template>
-	<view class="cont">
+	<view :class="{popupShow:showPop}">
+		<view class="cont">
 
-		<!-- <view class="card">
-			<view class="tit">
-				<view class="">
-					1号土地
-				</view>
-				<view class="">
-					溯源码: 12302
-				</view>
-			</view>
-			<view class="card-li">
-				<view class="">
-					当前种植: 土豆
-				</view>
-				<view class="">
-					种植品牌: 的划分等级
-				</view>
-			</view>
-			<view class="card-li">
-				<view class="">
-					土地面积: 20亩
-				</view>
-				<view class="">
-					种子品牌: 的划分等级
-				</view>
-			</view>
-			<view class="card-li">
-				<view class="">
-					播种时间: 2020.12.01
-				</view>
-
-			</view>
-		</view> -->
-		<landInfo :land_id='land_id'></landInfo>
-
-		<view class="operate">
-			<view class="tit">
-				操作选择
-			</view>
-			<view class="card">
-				<view class="operate-li" @click="showPop=true">
-					胶水
-				</view>
-				<view class="operate-li" @tap="navgo('')">
-					喂食
-				</view>
-				<view class="operate-li" @tap="navgo('/pages/feedIng/vaccineInfo')">
-					注射疫苗
-				</view>
-				<view class="operate-li">
-					胶水dassdd
-				</view>
-				<view class="operate-li">
-					胶水
-				</view>
-				<view class="operate-li">
-					胶水
-				</view>
-			</view>
-		</view>
-		<view class="fertilize">
-			<view class="card">
-				<view class="fertilize-tit">
+			<!-- <view class="card">
+				<view class="tit">
 					<view class="">
-						施肥
+						1号土地
 					</view>
-					<view class="fertilize-tit-r">
-						<view class="" style="color: red;" @tap="showModal=true">
-							删除
+					<view class="">
+						溯源码: 12302
+					</view>
+				</view>
+				<view class="card-li">
+					<view class="">
+						当前种植: 土豆
+					</view>
+					<view class="">
+						种植品牌: 的划分等级
+					</view>
+				</view>
+				<view class="card-li">
+					<view class="">
+						土地面积: 20亩
+					</view>
+					<view class="">
+						种子品牌: 的划分等级
+					</view>
+				</view>
+				<view class="card-li">
+					<view class="">
+						播种时间: 2020.12.01
+					</view>
+		
+				</view>
+			</view> -->
+			<landInfo :land_id='land_id'></landInfo>
+
+			<view class="operate" v-for="(item,index) in actionData" :key="index">
+
+				<view class="tit">
+					{{index}}
+				</view>
+				<view class="card">
+					<view class="operate-li" style="margin: 20rpx 0;margin-right: 20rpx;" @click="showPopFn(items.id)"
+						v-for="items,indexs in item.actions" :key='indexs'>
+						{{items.name}}
+					</view>
+
+					<!-- <view class="operate-li" @tap="navgo('')">
+						喂食
+					</view>
+					<view class="operate-li" @tap="navgo('/pages/feedIng/vaccineInfo')">
+						注射疫苗
+					</view>
+					<view class="operate-li">
+						胶水dassdd
+					</view>
+					<view class="operate-li">
+						胶水
+					</view>
+					<view class="operate-li">
+						胶水
+					</view> -->
+				</view>
+				<view class="">
+
+				</view>
+			</view>
+			<view class="fertilize">
+				<view class="card">
+					<view class="fertilize-tit">
+						<view class="">
+							施肥
 						</view>
-						<view style="margin-left: 40rpx;color: #00A15E;">
-							编辑
+						<view class="fertilize-tit-r">
+							<view class="" style="color: red;" @tap="showModal=true">
+								删除
+							</view>
+							<view style="margin-left: 40rpx;color: #00A15E;">
+								编辑
+							</view>
+						</view>
+
+					</view>
+					<view class="fertilize-li">
+						<view class="">
+							肥料类型: 地生上的飞机
+						</view>
+						<view class="">
+							肥料品牌: 地生上的
 						</view>
 					</view>
-
-				</view>
-				<view class="fertilize-li">
-					<view class="">
-						肥料类型: 地生上的飞机
-					</view>
-					<view class="">
-						肥料品牌: 地生上的
-					</view>
-				</view>
-				<view class="fertilize-li">
-					<view class="">
-						兑水浓度: 地生上的飞机
-					</view>
-					<view class="">
-						备注: 地生上的
+					<view class="fertilize-li">
+						<view class="">
+							兑水浓度: 地生上的飞机
+						</view>
+						<view class="">
+							备注: 地生上的
+						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+
+		<view class="ripe-btn">
+			完成今日操作
+		</view>
+		<!-- 组件 -->
+		<view class="">
+			<u-popup :show="showPop" :round="10" :closeable='true' @close="showPop=false" @open="showPop=true">
+				<scroll-view scroll-y style="max-height: 90vh;">
+					<!-- 滚动内容 -->
+					<view class="pop-content" v-for="item,index in popList" :key='index'>
+						<!-- 文本框 -->
+						<view class="" v-if="item.type==1">
+							<view class="">
+								{{item.title}}
+							</view>
+							<view class="pop-li">
+								<up-input placeholder="请输入" border="surround" v-model="formData.value"
+									@change="change"></up-input>
+							</view>
+						</view>
+						<!-- 下拉框 -->
+						<view class="" v-if="item.type==4">
+							<view class="">
+								{{item.title}}
+							</view>
+							<view class="pop-li">
+								<up-input readonly placeholder="点击选择" border="surround" v-model="formData.value"
+									@click="showPicker=true"></up-input>
+							</view>
+						</view>
+						<!-- 上传图片 -->
+						<view class="" v-if="item.type==2">
+							<view class="">
+								{{item.title}}
+							</view>
+							<view class="pop-li">
+								<view class="code-img">
+									<view class="carime-icon" @click="updateImgFn">
+										<u--image src="/static/img/DJSC.png" width="91.12rpx"
+											height="91.12rpx"></u--image>
+										<view class="">
+											点击上传图片
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<!-- 搜索框 -->
+						<view class="" v-if="item.type==3">
+							<view class="">
+								{{item.title}}
+							</view>
+							<view class="pop-li">
+								<up-input placeholder="请输入品种" border="surround" v-model="formData.value"></up-input>
+							</view>
+
+							<view style="margin-bottom: 20rpx;" v-for="item in [1]" :key="item">
+								<u-swipe-action>
+									<u-swipe-action-item :options="options1"
+										style="border-radius: 20rpx;border: 1px solid #C7C6CD;">
+										<view class="" style="padding: 20rpx 30rpx;">
+											<view class="swipe-action-tit">
+												<view class="">
+													编号: 123456
+												</view>
+												<view class="" style="color: #00A15E;" v-if="true">
+													健康
+												</view>
+												<view class="" style="color: #FFD736;" v-if="0">
+													怀孕中
+												</view>
+												<view class="" style="color: #3274F9;" v-if="0">
+													可出栏
+												</view>
+
+											</view>
+											<view class="swipe-action-li">
+												<view class="">
+													养殖品种:黑山猪
+												</view>
+												<view class="">
+													年龄: 5年
+												</view>
+												<view class="">
+													体重: 150kg
+												</view>
+											</view>
+										</view>
+
+									</u-swipe-action-item>
+								</u-swipe-action>
+							</view>
+						</view>
+					</view>
+
+					<view class="pop-confirm" @tap="confirm">
+						确认
+					</view>
+				</scroll-view>
+			</u-popup>
+		</view>
+		<!-- 组件 -->
+		<u-picker :show="showPicker" :columns="columns" @confirm="confirmFn"></u-picker>
+		<u-modal :show="showModal" :showCancelButton='true' :closeOnClickOverlay="true" @close="showModal=false"
+			content='确认删除吗?' @confirm="delFn" @cancel="showModal=false"></u-modal>
 	</view>
 
-	<view class="ripe-btn">
-		完成今日操作
-	</view>
-	<!-- 组件 -->
-	<view class="">
-		<u-popup :show="showPop" :round="10" :closeable='true' @close="showPop=false" @open="showPop=true">
-			<view class="pop-content">
-				<view class="pop-tit">
-					添加肥料相关信息
-				</view>
-				<view class="">
-					肥料类型
-				</view>
-				<view class="pop-li">
-					<up-input placeholder="请输入品种" border="surround" v-model="formData.value"
-						@change="change"></up-input>
-				</view>
-				<view class="">
-					兑水浓度
-				</view>
-				<view class="pop-li">
-					<up-input placeholder="请输入品种" border="surround" v-model="formData.value"
-						@change="change"></up-input>
-				</view>
-
-				<view class="pop-confirm" @tap="confirm">
-					确认
-				</view>
-			</view>
-		</u-popup>
-	</view>
-	<!-- 组件 -->
-
-	<u-modal :show="showModal" :showCancelButton='true' :closeOnClickOverlay="true" @close="showModal=false"
-		content='确认删除吗?' @confirm="delFn" @cancel="showModal=false"></u-modal>
 </template>
 
 <script setup>
@@ -140,14 +218,35 @@
 	} from "vue"
 	import landInfo from "@/components/plant/landInfo.vue"
 	import {
-		landCropRecordInfoAPI
+		actionsListAPI,
+		actionsDetailAPI
 	} from "@/api/plant.js"
 	import {
 		onLoad
 	} from "@dcloudio/uni-app"
+	const options1 = reactive([{
+		text: '删除'
+	}])
+	const showPicker = ref(false)
+	const columns = reactive([
+		['中国', '美国', '日本']
+	], )
+	const confirmFn = (e) => {
+		showPicker.value = false
+		console.log(e.value)
+	}
 	const land_id = ref(0)
+	const type = ref(0)
+	const actionData = reactive({})
 	onLoad((options) => {
 		land_id.value = options.land_id
+		actionsListAPI({
+			type: options.type
+		}).then(res => {
+			for (let key in res.data) {
+				actionData[key] = res.data[key]
+			}
+		})
 	})
 	const showPop = ref(false)
 	const formData = reactive({
@@ -174,6 +273,24 @@
 			duration: 1000
 		})
 	}
+	const popList = reactive([])
+	const showPopFn = (id) => {
+		popList.splice(0, popList.length)
+		showPop.value = true
+		columns[0].splice(0, columns[0].length)
+		actionsDetailAPI({
+			action_id: id
+		}).then(res => {
+			res.data.forEach(item => {
+				popList.push(item)
+				if (item.type == 4) {
+					columns[0] = Array.from(item.options)
+					console.log(columns[0])
+				}
+			})
+			// console.log(popList)
+		})
+	}
 </script>
 
 <style lang="scss" scoped>
@@ -186,7 +303,6 @@
 	.card {
 		.tit {
 			display: flex;
-			justify-content: space-between;
 			padding-bottom: 20rpx;
 			border-bottom: 1px solid #EBF1EF;
 		}
@@ -194,7 +310,6 @@
 		.card-li {
 			margin-top: 20rpx;
 			display: flex;
-			justify-content: space-between;
 		}
 	}
 
@@ -209,7 +324,6 @@
 		.card {
 			display: flex;
 			flex-wrap: wrap;
-			justify-content: space-between;
 
 			.operate-li {
 				font-size: 29.79rpx;
@@ -263,6 +377,7 @@
 
 	.pop-content {
 		padding: 20rpx;
+		padding-bottom: 0;
 
 		.pop-tit {
 			margin-bottom: 20rpx;
@@ -271,19 +386,56 @@
 
 		.pop-li {
 			margin: 20rpx 0;
-			margin-bottom: 40rpx;
+			// margin-bottom: 40rpx;
 		}
+	}
 
-		.pop-confirm {
-			width: 693.93rpx;
-			height: 84.11rpx;
-			background: linear-gradient(to right, #00A15E, #4CC593);
-			color: white;
-			border-radius: 42.06rpx 42.06rpx 42.06rpx 42.06rpx;
-			text-align: center;
-			line-height: 84rpx;
-			margin-top: 70rpx;
+	.pop-confirm {
+		width: 693.93rpx;
+		height: 84.11rpx;
+		background: linear-gradient(to right, #00A15E, #4CC593);
+		color: white;
+		border-radius: 42.06rpx 42.06rpx 42.06rpx 42.06rpx;
+		text-align: center;
+		line-height: 84rpx;
+		margin-top: 70rpx;
+		margin: 0 auto;
+	}
+
+	.code-img {
+		background-color: #F4F4F4;
+		height: 196.26rpx;
+		position: relative;
+
+		.carime-icon {
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate(-50%, -50%);
+			display: flex;
+			flex-direction: column;
+			align-items: center;
 		}
 
 	}
+
+	.swipe-action-tit {
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1px solid #F4F4F4;
+		padding-bottom: 20rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.swipe-action-li {
+		display: flex;
+		justify-content: space-between;
+		// align-items: ;
+	}
+
+	.popupShow {
+		// overflow: hidden;
+		position: fixed;
+		left: 30rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/poultry/SingleDetail.vue b/pages/poultry/SingleDetail.vue
index 0acc736..6bbe18a 100644
--- a/pages/poultry/SingleDetail.vue
+++ b/pages/poultry/SingleDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<imgCard></imgCard>
+		<!-- <imgCard></imgCard>
 
 		<view class="bad-info">
 			<view class="" style="display: flex;align-items: center;">
@@ -54,7 +54,8 @@
 				</view>
 			</view>
 
-		</view>
+		</view> -->
+		<detailCard :id='id'></detailCard>
 		<view class="">
 			<view class="" style="margin-bottom: 20rpx;">
 				饲养记录
@@ -67,6 +68,7 @@
 <script setup>
 	import myTable from "@/components/myTable/index.vue"
 	import imgCard from "@/components/imgCard.vue"
+	import detailCard from "@/components/poultry/detailCard.vue"
 	import {
 		onLoad
 	} from "@dcloudio/uni-app"
diff --git a/pages/poultry/feedDetail.vue b/pages/poultry/feedDetail.vue
index 25bcab9..735a356 100644
--- a/pages/poultry/feedDetail.vue
+++ b/pages/poultry/feedDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content" @click.capture="selectAct=false">
-		<view class="card">
+		<!-- <view class="card">
 			<view class="tit">
 				<view class="">
 					农户名称: 1号土地
@@ -38,7 +38,7 @@
 					幼崽: 的划分等级
 				</view>
 			</view>
-		</view>
+		</view> -->
 
 		<!-- <view class="serch">
 			<u-search bgColor='white' height='63.08rpx' :show-action="false" actionText="搜索"
@@ -47,6 +47,7 @@
 				搜索
 			</view>
 		</view> -->
+		<farmersCard></farmersCard>
 		<view class="title">
 			<view class="">
 				编号: {{baseData.code}}
@@ -117,6 +118,7 @@
 </template>
 
 <script setup>
+	import farmersCard from "@/components/poultry/farmersCard.vue"
 	import imgCard from "@/components/imgCard.vue"
 	import myTable from "@/components/myTable/index.vue"
 	import {
diff --git a/pages/poultry/feedList.vue b/pages/poultry/feedList.vue
index 435d058..c39dcb6 100644
--- a/pages/poultry/feedList.vue
+++ b/pages/poultry/feedList.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="card">
+		<!-- <view class="card">
 			<view class="tit">
 				<view class="">
 					农户名称: 1号土地
@@ -38,12 +38,12 @@
 					幼崽: 的划分等级
 				</view>
 			</view>
-		</view>
-
+		</view> -->
+		<farmersCard></farmersCard>
 		<view class="serch">
-			<u-search bgColor='white' v-model="query" height='63.08rpx' :show-action="false" actionText="搜索"
-				:animation="true"></u-search>
-			<view class="serch-btn" @tap="queryFn">
+			<u-search bgColor='white' v-model="query" @change="queryFn" height='63.08rpx' :show-action="false"
+				actionText="搜索" :animation="true"></u-search>
+			<view class="serch-btn">
 				搜索
 			</view>
 		</view>
@@ -93,6 +93,7 @@
 		reactive,
 		ref
 	} from "vue";
+	import farmersCard from "@/components/poultry/farmersCard.vue"
 	const navgo = (url) => {
 		uni.navigateTo({
 			url
@@ -110,6 +111,7 @@
 	})
 	const query = ref("")
 	const queryFn = () => {
+		console.log(444454)
 		animalList.splice(0, 999999999)
 		animalListAPI({
 			user_id: 307,
diff --git a/pages/records/index.vue b/pages/records/index.vue
index 1f3f159..ec01827 100644
--- a/pages/records/index.vue
+++ b/pages/records/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		<view class="card">
+		<!-- <view class="card">
 			<view class="tit">
 				<view class="">
 					1号土地
@@ -42,15 +42,15 @@
 
 			</view>
 
-		</view>
-
+		</view> -->
+		<landInfo :land_id='land_id'></landInfo>
 		<view class="histroy">
 			<view class="tit" style="margin-bottom: 40rpx;">
 				历史操作记录
 			</view>
 			<myTable></myTable>
 		</view>
-		<view class="btn" @click="navgo('/pages/growRecord/index')">
+		<view class="btn" @click="navgo(`/pages/growRecord/index?land_id=${land_id}`)">
 			记录今日操作
 		</view>
 	</view>
@@ -62,11 +62,22 @@
 		actionsDetailAPI
 	} from "@/api/plant.js"
 	import myTable from "@/components/myTable/index.vue"
+	import landInfo from "@/components/plant/landInfo.vue"
+	import {
+		onLoad
+	} from "@dcloudio/uni-app"
+	import {
+		ref
+	} from "vue"
 	// actionsListAPI({
 	// 	type: 1
 	// }).then(res => {
 	// 	console.log(res)
 	// })
+	const land_id = ref(0)
+	onLoad((option) => {
+		land_id.value = option.land_id
+	})
 	actionsDetailAPI({
 		action_id: 2
 	}).then(res => {
diff --git a/unpackage/dist/dev/app-plus/app-config-service.js b/unpackage/dist/dev/app-plus/app-config-service.js
index ca30af5..be15e3d 100644
--- a/unpackage/dist/dev/app-plus/app-config-service.js
+++ b/unpackage/dist/dev/app-plus/app-config-service.js
@@ -1,8 +1,8 @@
 
   ;(function(){
   let u=void 0,isReady=false,onReadyCallbacks=[],isServiceReady=false,onServiceReadyCallbacks=[];
-  const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"test","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"3.8.12","entryPagePath":"pages/index/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"locales":{},"darkmode":false,"themeConfig":{}};
-  const __uniRoutes = [{"path":"pages/index/index","meta":{"isQuit":true,"isEntry":true,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/InformationAdd/index","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"信息添加","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/growRecord/index","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"生长记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/detail/plant","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/allPlant/index","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"全部种植","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/records/index","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"生长记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/profile/index","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"生长概况","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/feedList","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"养殖列表","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/feedDetail","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"养殖详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/histroyFeed","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"历史养殖记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/updateFeed","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"更新饲养状态","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/vaccineInfo","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"疫苗信息","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/addPoultry","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"添加饲养动物","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/allFeed","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"全部养殖记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/SingleDetail","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"单个详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/allRecording","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"全部记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/feedList","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"养殖列表","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/feedDetail","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"养殖详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/histroyFeed","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"历史养殖记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/updateFeed","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"更新饲养状态","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/vaccineInfo","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"疫苗信息","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/addPoultry","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"添加饲养动物","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/allFeed","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"全部养殖记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/allRecording","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"全部记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/aquatic/addAquatic","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"添加养殖","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/aquatic/addPond","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"养殖信息","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/aquatic/updateGrow","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"更新生长记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/aquatic/detail","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/supervision/group","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"小组公司监管","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/supervision/captain","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"生产队长监管","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/supervision/farmerDeatil","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"农户详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/supervision/detail","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"土地详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/test/index","meta":{"enablePullDownRefresh":true,"navigationBar":{"titleText":"uni-app","type":"default"},"isNVue":false}},{"path":"pages/test/index1","meta":{"enablePullDownRefresh":true,"navigationBar":{"titleText":"uni-app","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
+  const __uniConfig = {"pages":[],"globalStyle":{"backgroundColor":"#F8F8F8","navigationBar":{"backgroundColor":"#F8F8F8","titleText":"uni-app","type":"default","titleColor":"#000000"},"isNVue":false},"nvue":{"compiler":"uni-app","styleCompiler":"uni-app","flex-direction":"column"},"renderer":"auto","appname":"test","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":true},"compilerVersion":"3.94","entryPagePath":"pages/index/index","entryPageQuery":"","realEntryPagePath":"","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000},"locales":{},"darkmode":false,"themeConfig":{}};
+  const __uniRoutes = [{"path":"pages/index/index","meta":{"isQuit":true,"isEntry":true,"navigationBar":{"style":"custom","type":"default"},"isNVue":false}},{"path":"pages/InformationAdd/index","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"信息添加","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/growRecord/index","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"生长记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/detail/plant","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/allPlant/index","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"全部种植","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/records/index","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"生长记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/profile/index","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"生长概况","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/feedList","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"养殖列表","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/feedDetail","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"养殖详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/histroyFeed","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"历史养殖记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/updateFeed","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"更新饲养状态","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/vaccineInfo","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"疫苗信息","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/addPoultry","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"添加饲养动物","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/allRecordTable","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"记录列表","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/allFeed","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"全部养殖记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/SingleDetail","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"单个详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/feedIng/allRecording","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"全部记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/feedList","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"养殖列表","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/feedDetail","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"养殖详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/histroyFeed","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"历史养殖记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/updateFeed","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"更新饲养状态","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/vaccineInfo","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"疫苗信息","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/addPoultry","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"添加饲养动物","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/allFeed","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"全部养殖记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/SingleDetail","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"单个详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/poultry/allRecording","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"全部记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/aquatic/addAquatic","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"添加养殖","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/aquatic/addPond","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"养殖信息","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/aquatic/updateGrow","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"更新生长记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/aquatic/imgList","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"生长记录","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/aquatic/detail","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/supervision/group","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"小组公司监管","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/supervision/captain","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"生产队长监管","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/supervision/farmerDeatil","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"农户详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/supervision/detail","meta":{"enablePullDownRefresh":false,"navigationBar":{"backgroundColor":"#F4F4F4","titleText":"土地详情","type":"default","titleColor":"#000000"},"isNVue":false}},{"path":"pages/test/index","meta":{"enablePullDownRefresh":true,"navigationBar":{"titleText":"uni-app","type":"default"},"isNVue":false}},{"path":"pages/test/index1","meta":{"enablePullDownRefresh":true,"navigationBar":{"titleText":"uni-app","type":"default"},"isNVue":false}}].map(uniRoute=>(uniRoute.meta.route=uniRoute.path,__uniConfig.pages.push(uniRoute.path),uniRoute.path='/'+uniRoute.path,uniRoute));
   __uniConfig.styles=[];//styles
   __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
   __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
diff --git a/unpackage/dist/dev/app-plus/app-service.js b/unpackage/dist/dev/app-plus/app-service.js
index e08c960..beb7d47 100644
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js
@@ -1998,12 +1998,12 @@ if (uni.restoreGlobal) {
         }
       },
       // 阻止事件冒泡
-      preventEvent(e) {
-        e && typeof e.stopPropagation === "function" && e.stopPropagation();
+      preventEvent(e2) {
+        e2 && typeof e2.stopPropagation === "function" && e2.stopPropagation();
       },
       // 空操作
-      noop(e) {
-        this.preventEvent(e);
+      noop(e2) {
+        this.preventEvent(e2);
       }
     },
     onReachBottom() {
@@ -2027,7 +2027,7 @@ if (uni.restoreGlobal) {
     }
     return target;
   };
-  const _sfc_main$1c = {
+  const _sfc_main$1k = {
     name: "u-icon",
     data() {
       return {};
@@ -2071,9 +2071,9 @@ if (uni.restoreGlobal) {
       }
     },
     methods: {
-      clickHandler(e) {
+      clickHandler(e2) {
         this.$emit("click", this.index);
-        this.stop && this.preventEvent(e);
+        this.stop && this.preventEvent(e2);
       }
     }
   };
@@ -2121,7 +2121,7 @@ if (uni.restoreGlobal) {
       /* CLASS */
     );
   }
-  const __easycom_0$7 = /* @__PURE__ */ _export_sfc(_sfc_main$1c, [["render", _sfc_render$z], ["__scopeId", "data-v-1c933a9a"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-icon/u-icon.vue"]]);
+  const __easycom_0$7 = /* @__PURE__ */ _export_sfc(_sfc_main$1k, [["render", _sfc_render$z], ["__scopeId", "data-v-1c933a9a"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-icon/u-icon.vue"]]);
   const props$g = {
     props: {
       // 是否展示组件
@@ -2203,7 +2203,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  const _sfc_main$1b = {
+  const _sfc_main$1j = {
     name: "u-transition",
     data() {
       return {
@@ -2265,7 +2265,7 @@ if (uni.restoreGlobal) {
       /* CLASS, STYLE, HYDRATE_EVENTS */
     )) : vue.createCommentVNode("v-if", true);
   }
-  const __easycom_4$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1b, [["render", _sfc_render$y], ["__scopeId", "data-v-0573594d"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-transition/u-transition.vue"]]);
+  const __easycom_4$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1j, [["render", _sfc_render$y], ["__scopeId", "data-v-0573594d"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-transition/u-transition.vue"]]);
   const props$f = {
     props: {
       // 图片地址
@@ -2350,7 +2350,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  const _sfc_main$1a = {
+  const _sfc_main$1i = {
     name: "u-image",
     mixins: [mpMixin, mixin, props$f],
     data() {
@@ -2510,7 +2510,7 @@ if (uni.restoreGlobal) {
       /* FORWARDED */
     }, 8, ["show", "duration"]);
   }
-  const __easycom_0$6 = /* @__PURE__ */ _export_sfc(_sfc_main$1a, [["render", _sfc_render$x], ["__scopeId", "data-v-9d58ba7c"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-image/u-image.vue"]]);
+  const __easycom_0$6 = /* @__PURE__ */ _export_sfc(_sfc_main$1i, [["render", _sfc_render$x], ["__scopeId", "data-v-9d58ba7c"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-image/u-image.vue"]]);
   let BASE_URL;
   {
     BASE_URL = "http://ceshi-suyuan.lihaink.cn/";
@@ -2591,9 +2591,10 @@ if (uni.restoreGlobal) {
   const landEnvDataCurrAPI = (data) => syhttp.get("/LandPlant/landEnvDataCurr", data);
   const setLandCropRipeAPI = (data) => syhttp.get("/LandPlant/setLandCropRipe", data);
   const landCropPicListAPI = (data) => syhttp.get("/LandPlant/landCropPicList", data);
+  const actionsListAPI = (data) => syhttp.get("/user/actions", data);
   const actionsDetailAPI = (data) => syhttp.get("/user/actionsDetail", data);
   const landEnvDataChartAPI = (data) => syhttp.get("/LandPlant/landEnvDataChart", data);
-  const _sfc_main$19 = {
+  const _sfc_main$1h = {
     name: "uniTh",
     options: {
       virtualHost: true
@@ -2735,8 +2736,8 @@ if (uni.restoreGlobal) {
           return item;
         });
       },
-      ondropdown(e) {
-        this.$emit("filter-change", e);
+      ondropdown(e2) {
+        this.$emit("filter-change", e2);
       },
       /**
        * 获取父元素实例
@@ -2768,8 +2769,8 @@ if (uni.restoreGlobal) {
       /* CLASS, STYLE */
     );
   }
-  const __easycom_0$5 = /* @__PURE__ */ _export_sfc(_sfc_main$19, [["render", _sfc_render$w], ["__scopeId", "data-v-bf970acd"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/uni-table/components/uni-th/uni-th.vue"]]);
-  const _sfc_main$18 = {
+  const __easycom_0$5 = /* @__PURE__ */ _export_sfc(_sfc_main$1h, [["render", _sfc_render$w], ["__scopeId", "data-v-bf970acd"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/uni-table/components/uni-th/uni-th.vue"]]);
+  const _sfc_main$1g = {
     name: "TableCheckbox",
     emits: ["checkboxSelected"],
     props: {
@@ -2858,8 +2859,8 @@ if (uni.restoreGlobal) {
       ]))
     ]);
   }
-  const tableCheckbox = /* @__PURE__ */ _export_sfc(_sfc_main$18, [["render", _sfc_render$v], ["__scopeId", "data-v-25e435b1"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/uni-table/components/uni-tr/table-checkbox.vue"]]);
-  const _sfc_main$17 = {
+  const tableCheckbox = /* @__PURE__ */ _export_sfc(_sfc_main$1g, [["render", _sfc_render$v], ["__scopeId", "data-v-25e435b1"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/uni-table/components/uni-tr/table-checkbox.vue"]]);
+  const _sfc_main$1f = {
     name: "uniTr",
     components: { tableCheckbox },
     props: {
@@ -2918,15 +2919,15 @@ if (uni.restoreGlobal) {
         this.widthThArr.push(width);
       },
       // 选中
-      checkboxSelected(e) {
+      checkboxSelected(e2) {
         let rootData = this.root.data.find((v2) => v2[this.root.rowKey] === this.keyValue);
-        this.checked = e.checked;
-        this.root.check(rootData || this, e.checked, rootData ? this.keyValue : null);
+        this.checked = e2.checked;
+        this.root.check(rootData || this, e2.checked, rootData ? this.keyValue : null);
       },
-      change(e) {
+      change(e2) {
         this.root.trChildren.forEach((item) => {
           if (item === this) {
-            this.root.check(this, e.detail.value.length > 0 ? true : false);
+            this.root.check(this, e2.detail.value.length > 0 ? true : false);
           }
         });
       },
@@ -2969,8 +2970,8 @@ if (uni.restoreGlobal) {
       vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
     ]);
   }
-  const __easycom_1$7 = /* @__PURE__ */ _export_sfc(_sfc_main$17, [["render", _sfc_render$u], ["__scopeId", "data-v-b48b3e32"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/uni-table/components/uni-tr/uni-tr.vue"]]);
-  const _sfc_main$16 = {
+  const __easycom_1$8 = /* @__PURE__ */ _export_sfc(_sfc_main$1f, [["render", _sfc_render$u], ["__scopeId", "data-v-b48b3e32"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/uni-table/components/uni-tr/uni-tr.vue"]]);
+  const _sfc_main$1e = {
     name: "uniTd",
     options: {
       virtualHost: true
@@ -3042,8 +3043,8 @@ if (uni.restoreGlobal) {
       /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
     );
   }
-  const __easycom_2$4 = /* @__PURE__ */ _export_sfc(_sfc_main$16, [["render", _sfc_render$t], ["__scopeId", "data-v-edae4802"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/uni-table/components/uni-td/uni-td.vue"]]);
-  const _sfc_main$15 = {
+  const __easycom_2$2 = /* @__PURE__ */ _export_sfc(_sfc_main$1e, [["render", _sfc_render$t], ["__scopeId", "data-v-edae4802"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/uni-table/components/uni-td/uni-td.vue"]]);
+  const _sfc_main$1d = {
     name: "uniTable",
     options: {
       virtualHost: true
@@ -3334,8 +3335,8 @@ if (uni.restoreGlobal) {
       /* CLASS */
     );
   }
-  const __easycom_4 = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["render", _sfc_render$s], ["__scopeId", "data-v-c1ea9b5d"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/uni-table/components/uni-table/uni-table.vue"]]);
-  const _sfc_main$14 = {
+  const __easycom_4 = /* @__PURE__ */ _export_sfc(_sfc_main$1d, [["render", _sfc_render$s], ["__scopeId", "data-v-c1ea9b5d"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/uni-table/components/uni-table/uni-table.vue"]]);
+  const _sfc_main$1c = {
     __name: "index",
     props: {
       dataList: Object,
@@ -3351,14 +3352,20 @@ if (uni.restoreGlobal) {
         });
       };
       const objFn = (obj) => {
-        for (const [key, value] of Object.entries(JSON.parse(obj))) {
-          return `${key}: ${value}`;
+        if (typeof obj == "object") {
+          for (const [key, value] of Object.entries(obj)) {
+            return `${key}: ${value}`;
+          }
+        } else {
+          for (const [key, value] of Object.entries(JSON.parse(obj))) {
+            return `${key}: ${value}`;
+          }
         }
       };
       return (_ctx, _cache) => {
         const _component_uni_th = resolveEasycom(vue.resolveDynamicComponent("uni-th"), __easycom_0$5);
-        const _component_uni_tr = resolveEasycom(vue.resolveDynamicComponent("uni-tr"), __easycom_1$7);
-        const _component_uni_td = resolveEasycom(vue.resolveDynamicComponent("uni-td"), __easycom_2$4);
+        const _component_uni_tr = resolveEasycom(vue.resolveDynamicComponent("uni-tr"), __easycom_1$8);
+        const _component_uni_td = resolveEasycom(vue.resolveDynamicComponent("uni-td"), __easycom_2$2);
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
         const _component_uni_table = resolveEasycom(vue.resolveDynamicComponent("uni-table"), __easycom_4);
         return vue.openBlock(), vue.createElementBlock("view", { class: "card" }, [
@@ -3511,22 +3518,109 @@ if (uni.restoreGlobal) {
       };
     }
   };
-  const myTable = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["__scopeId", "data-v-90822214"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/myTable/index.vue"]]);
+  const myTable = /* @__PURE__ */ _export_sfc(_sfc_main$1c, [["__scopeId", "data-v-90822214"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/myTable/index.vue"]]);
   const animalListAPI$1 = (data) => syhttp.get("/AnimalBreed/animalList", data);
   const animalEnvDataAPI$1 = (data) => syhttp.get("/AnimalBreed/animalEnvData", data);
-  const addAnimalAPI$1 = (data) => syhttp.post("/AnimalBreed/addAnimal", data);
-  const actionsAPI = (data) => syhttp.get("/user/actions", data);
+  const actionsAPI$1 = (data) => syhttp.get("/user/actions", data);
+  const animalInfoAPI$1 = (data) => syhttp.get("/AnimalBreed/animalInfo", data);
   const animalPicListAPI$1 = (data) => syhttp.get("/AnimalBreed/animalPicList", data);
   const addAnimalPicAPI$1 = (data) => syhttp.post("/AnimalBreed/addAnimalPic", data);
   const animalStatusAPI = (data) => syhttp.post("/AnimalBreed/animalStatus", data);
-  const _sfc_main$13 = {
+  const animalChangeListAPI = (data) => syhttp.get("/AnimalBreed/animalChangeList", data);
+  const animalSellAPI = (data) => syhttp.post("/AnimalBreed/animalSell", data);
+  const _sfc_main$1b = {
+    __name: "farmersCard",
+    setup(__props) {
+      const userInfo = vue.reactive({});
+      const objFn = (res, data) => {
+        for (let key in res) {
+          data[key] = res[key];
+        }
+      };
+      userInfoAPI({
+        user_id: 307
+      }).then((res) => {
+        objFn(res.data, userInfo);
+      });
+      return (_ctx, _cache) => {
+        return userInfo.animal_detail ? (vue.openBlock(), vue.createElementBlock("view", {
+          key: 0,
+          class: "card"
+        }, [
+          vue.createCommentVNode(" {{userInfo.animal_detail.total_count}} "),
+          vue.createElementVNode("view", { class: "tit" }, [
+            vue.createElementVNode(
+              "view",
+              { class: "" },
+              " 农户名称: " + vue.toDisplayString(userInfo.name),
+              1
+              /* TEXT */
+            )
+          ]),
+          vue.createElementVNode("view", { class: "card-li" }, [
+            vue.createElementVNode("view", { class: "" }, " 种养殖类型: 养殖户 "),
+            vue.createElementVNode(
+              "view",
+              { class: "" },
+              " 养殖头数: " + vue.toDisplayString(userInfo.animal_detail.total_count) + "头 ",
+              1
+              /* TEXT */
+            )
+          ]),
+          vue.createElementVNode("view", { class: "card-li" }, [
+            vue.createElementVNode(
+              "view",
+              { class: "" },
+              " 土地面积:" + vue.toDisplayString(userInfo.total_land_area) + "亩 ",
+              1
+              /* TEXT */
+            ),
+            vue.createElementVNode(
+              "view",
+              { class: "" },
+              " 公: " + vue.toDisplayString(userInfo.animal_detail.male_count) + "头 ",
+              1
+              /* TEXT */
+            )
+          ]),
+          vue.createElementVNode("view", { class: "card-li" }, [
+            vue.createElementVNode(
+              "view",
+              { class: "" },
+              " 养殖种类: " + vue.toDisplayString(userInfo.animal_detail.kind[0]) + "," + vue.toDisplayString(userInfo.animal_detail.kind[1]),
+              1
+              /* TEXT */
+            ),
+            vue.createElementVNode(
+              "view",
+              { class: "" },
+              " 母: " + vue.toDisplayString(userInfo.animal_detail.maternal_count) + "头 ",
+              1
+              /* TEXT */
+            )
+          ]),
+          vue.createElementVNode("view", { class: "card-li" }, [
+            vue.createElementVNode(
+              "view",
+              { class: "" },
+              " 具体种类: " + vue.toDisplayString(userInfo.animal_detail.breed[0]),
+              1
+              /* TEXT */
+            )
+          ])
+        ])) : vue.createCommentVNode("v-if", true);
+      };
+    }
+  };
+  const farmersCard$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1b, [["__scopeId", "data-v-853f8e7d"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/animal/farmersCard.vue"]]);
+  const _sfc_main$1a = {
     __name: "cultivation",
     props: {
       userInfo: Object
     },
     setup(__props) {
       const props2 = __props;
-      const userInfo = vue.reactive(props2.userInfo);
+      vue.reactive(props2.userInfo);
       const data = vue.reactive([
         {
           tit: "环境温度",
@@ -3598,7 +3692,7 @@ if (uni.restoreGlobal) {
         }
       });
       const actionList = vue.reactive({});
-      actionsAPI({
+      actionsAPI$1({
         type: 3
       }).then((res) => {
         for (let key in res.data) {
@@ -3608,68 +3702,8 @@ if (uni.restoreGlobal) {
       return (_ctx, _cache) => {
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
-          vue.createElementVNode("view", { class: "card" }, [
-            vue.createElementVNode("view", { class: "tit" }, [
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 农户名称: " + vue.toDisplayString(userInfo.name),
-                1
-                /* TEXT */
-              )
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 种养殖类型: 养殖户 "),
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 养殖头数: " + vue.toDisplayString(userInfo.animal_detail.total_count) + "头 ",
-                1
-                /* TEXT */
-              )
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 土地面积:" + vue.toDisplayString(userInfo.total_land_area) + "亩 ",
-                1
-                /* TEXT */
-              ),
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 公: " + vue.toDisplayString(userInfo.animal_detail.male_count) + "头 ",
-                1
-                /* TEXT */
-              )
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 养殖种类: " + vue.toDisplayString(userInfo.animal_detail.kind[0]) + "," + vue.toDisplayString(userInfo.animal_detail.kind[1]),
-                1
-                /* TEXT */
-              ),
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 母: " + vue.toDisplayString(userInfo.animal_detail.maternal_count) + "头 ",
-                1
-                /* TEXT */
-              )
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 具体种类: " + vue.toDisplayString(userInfo.animal_detail.breed[0]),
-                1
-                /* TEXT */
-              )
-            ])
-          ]),
+          vue.createCommentVNode(' <view class="card">\r\n			<view class="tit">\r\n				<view class="">\r\n					农户名称: {{userInfo.name}}\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					种养殖类型: 养殖户\r\n				</view>\r\n				<view class="">\r\n					养殖头数: {{userInfo.animal_detail.total_count}}头\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					土地面积:{{userInfo.total_land_area}}亩\r\n				</view>\r\n				<view class="">\r\n					公: {{userInfo.animal_detail.male_count}}头\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					养殖种类: {{userInfo.animal_detail.kind[0]}},{{userInfo.animal_detail.kind[1]}}\r\n				</view>\r\n				<view class="">\r\n					母: {{userInfo.animal_detail.maternal_count}}头\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					具体种类: {{userInfo.animal_detail.breed[0]}}\r\n				</view>\r\n\r\n			</view>\r\n		</view> '),
+          vue.createVNode(farmersCard$1),
           vue.createElementVNode("view", { class: "circumstance" }, [
             vue.createElementVNode("view", { class: "card-tit" }, [
               vue.createElementVNode("view", { class: "" }, " 养殖情况 ")
@@ -3761,7 +3795,6 @@ if (uni.restoreGlobal) {
                 class: "circumstance",
                 key: index2
               }, [
-                vue.createCommentVNode(" {{item.action_record}} "),
                 vue.createElementVNode("view", { class: "card-tit" }, [
                   vue.createElementVNode(
                     "view",
@@ -3774,7 +3807,7 @@ if (uni.restoreGlobal) {
                     "view",
                     {
                       class: "updata-btn",
-                      onClick: _cache[1] || (_cache[1] = ($event) => navgo("/pages/growRecord/index"))
+                      onClick: _cache[1] || (_cache[1] = ($event) => navgo("/pages/growRecord/index?type=3"))
                     },
                     " 更新" + vue.toDisplayString(index2.slice(0, -2)),
                     1
@@ -3784,24 +3817,19 @@ if (uni.restoreGlobal) {
                 vue.createVNode(myTable, {
                   tit: `查看${index2.slice(0, -2)}`,
                   dataList: item.action_record,
-                  route: "/pages/feedIng/allRecording"
-                }, null, 8, ["tit", "dataList"])
+                  route: "/pages/feedIng/allRecordTable"
+                }, {
+                  default: vue.withCtx(() => [
+                    vue.createTextVNode("> ")
+                  ]),
+                  _: 2
+                  /* DYNAMIC */
+                }, 1032, ["tit", "dataList"])
               ]);
             }),
             128
             /* KEYED_FRAGMENT */
           )),
-          vue.createCommentVNode(` <view class="circumstance">\r
-			<view class="card-tit">\r
-				<view class="">\r
-					消毒情况\r
-				</view>\r
-				<view class="updata-btn" @click="navgo('/pages/growRecord/index')">\r
-					更新消毒情况\r
-				</view>\r
-			</view>\r
-			<myTable tit='查看历史消毒记录' route='/pages/feedIng/allRecording'></myTable>\r
-		</view> `),
           vue.createElementVNode("view", { class: "data" }, [
             vue.createElementVNode("view", { class: "tit" }, [
               vue.createElementVNode("view", {
@@ -3893,8 +3921,8 @@ if (uni.restoreGlobal) {
       };
     }
   };
-  const cultivation = /* @__PURE__ */ _export_sfc(_sfc_main$13, [["__scopeId", "data-v-91fd8d70"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/index/cultivation.vue"]]);
-  const _sfc_main$12 = {
+  const cultivation = /* @__PURE__ */ _export_sfc(_sfc_main$1a, [["__scopeId", "data-v-91fd8d70"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/index/cultivation.vue"]]);
+  const _sfc_main$19 = {
     __name: "planting",
     props: {
       userInfo: Object
@@ -4046,8 +4074,8 @@ if (uni.restoreGlobal) {
       };
     }
   };
-  const planting = /* @__PURE__ */ _export_sfc(_sfc_main$12, [["__scopeId", "data-v-093aaff7"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/index/planting.vue"]]);
-  const _sfc_main$11 = {
+  const planting = /* @__PURE__ */ _export_sfc(_sfc_main$19, [["__scopeId", "data-v-093aaff7"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/index/planting.vue"]]);
+  const _sfc_main$18 = {
     __name: "fishing",
     props: {
       userInfo: Object
@@ -4083,7 +4111,10 @@ if (uni.restoreGlobal) {
                 1
                 /* TEXT */
               ),
-              vue.createElementVNode("view", { class: "card-li" }, " 种养殖类型: 种植户 "),
+              vue.createElementVNode("view", { class: "card-li" }, " 种养殖类型: 养殖户 "),
+              vue.createElementVNode("view", { class: "card-li" }, [
+                vue.createCommentVNode(" 养殖种类: {{userInfo.}} ")
+              ]),
               vue.createElementVNode(
                 "view",
                 { class: "card-li" },
@@ -4179,20 +4210,118 @@ if (uni.restoreGlobal) {
       };
     }
   };
-  const fishing = /* @__PURE__ */ _export_sfc(_sfc_main$11, [["__scopeId", "data-v-bdc223d1"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/index/fishing.vue"]]);
+  const fishing = /* @__PURE__ */ _export_sfc(_sfc_main$18, [["__scopeId", "data-v-bdc223d1"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/index/fishing.vue"]]);
+  const _sfc_main$17 = {
+    __name: "farmersCard",
+    setup(__props) {
+      const userInfo = vue.reactive({});
+      const objFn = (res, data) => {
+        for (let key in res) {
+          data[key] = res[key];
+        }
+      };
+      userInfoAPI({
+        user_id: 307
+      }).then((res) => {
+        objFn(res.data, userInfo);
+      });
+      return (_ctx, _cache) => {
+        return vue.openBlock(), vue.createElementBlock(
+          vue.Fragment,
+          null,
+          [
+            vue.createCommentVNode(" {{userInfo.poultry_detail}} "),
+            userInfo.poultry_detail ? (vue.openBlock(), vue.createElementBlock("view", {
+              key: 0,
+              class: "card"
+            }, [
+              vue.createCommentVNode(" {{userInfo.animal_detail.total_count}} "),
+              vue.createElementVNode("view", { class: "tit" }, [
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 农户名称: " + vue.toDisplayString(userInfo.name),
+                  1
+                  /* TEXT */
+                )
+              ]),
+              vue.createElementVNode("view", { class: "card-li" }, [
+                vue.createElementVNode("view", { class: "" }, " 种养殖类型: 养殖户 "),
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 养殖头数: " + vue.toDisplayString(userInfo.poultry_detail.total_count) + "头 ",
+                  1
+                  /* TEXT */
+                )
+              ]),
+              vue.createElementVNode("view", { class: "card-li" }, [
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 土地面积:" + vue.toDisplayString(userInfo.total_land_area) + "亩 ",
+                  1
+                  /* TEXT */
+                ),
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 公: " + vue.toDisplayString(userInfo.poultry_detail.male_count) + "头 ",
+                  1
+                  /* TEXT */
+                )
+              ]),
+              vue.createElementVNode("view", { class: "card-li" }, [
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 养殖种类: " + vue.toDisplayString(userInfo.poultry_detail.kind[0]) + "," + vue.toDisplayString(userInfo.poultry_detail.kind[1]),
+                  1
+                  /* TEXT */
+                ),
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 母: " + vue.toDisplayString(userInfo.poultry_detail.maternal_count) + "头 ",
+                  1
+                  /* TEXT */
+                )
+              ]),
+              vue.createElementVNode("view", { class: "card-li" }, [
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 具体种类: " + vue.toDisplayString(userInfo.poultry_detail.breed[0]),
+                  1
+                  /* TEXT */
+                )
+              ])
+            ])) : vue.createCommentVNode("v-if", true)
+          ],
+          2112
+          /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+        );
+      };
+    }
+  };
+  const farmersCard = /* @__PURE__ */ _export_sfc(_sfc_main$17, [["__scopeId", "data-v-7a12289e"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/poultry/farmersCard.vue"]]);
   const animalListAPI = (data) => syhttp.get("/PoultryBreed/poultryList", data);
   const animalEnvDataAPI = (data) => syhttp.get("/PoultryBreed/poultryEnvData", data);
   const addAnimalAPI = (data) => syhttp.post("/PoultryBreed/addPoultry", data);
+  const actionsAPI = (data) => syhttp.get("/user/actions", data);
+  const animalInfoAPI = (data) => syhttp.get("/PoultryBreed/poultryInfo", data);
   const animalPicListAPI = (data) => syhttp.get("/PoultryBreed/poultryPicList", data);
   const addAnimalPicAPI = (data) => syhttp.post("/PoultryBreed/addPoultryPic", data);
-  const _sfc_main$10 = {
+  const poultryInfoAPI = (data) => syhttp.get("/PoultryBreed/poultryInfo", data);
+  const poultryStatusAPI = (data) => syhttp.post("/PoultryBreed/poultryStatus", data);
+  const _sfc_main$16 = {
     __name: "chick",
     props: {
       userInfo: Object
     },
     setup(__props) {
       const props2 = __props;
-      const userInfo = vue.reactive(props2.userInfo);
+      vue.reactive(props2.userInfo);
       const data = vue.reactive([
         {
           tit: "环境温度",
@@ -4255,7 +4384,7 @@ if (uni.restoreGlobal) {
         res.data.forEach((item) => {
           animalList.push(item);
         });
-        formatAppLog("log", "at components/index/chick.vue:235", animalList);
+        formatAppLog("log", "at components/index/chick.vue:237", animalList);
       });
       animalEnvDataAPI({
         user_id: 307
@@ -4265,71 +4394,18 @@ if (uni.restoreGlobal) {
         }
       });
       const actionList = vue.reactive({});
+      actionsAPI({
+        type: 2
+      }).then((res) => {
+        for (let key in res.data) {
+          actionList[key] = res.data[key];
+        }
+      });
       return (_ctx, _cache) => {
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
-          vue.createElementVNode("view", { class: "card" }, [
-            vue.createElementVNode("view", { class: "tit" }, [
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 农户名称: " + vue.toDisplayString(userInfo.name),
-                1
-                /* TEXT */
-              )
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 种养殖类型: 养殖户 "),
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 养殖头数: " + vue.toDisplayString(userInfo.poultry_detail.total_count) + "头 ",
-                1
-                /* TEXT */
-              )
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 土地面积:" + vue.toDisplayString(userInfo.total_land_area) + "亩 ",
-                1
-                /* TEXT */
-              ),
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 公: " + vue.toDisplayString(userInfo.poultry_detail.male_count) + "头 ",
-                1
-                /* TEXT */
-              )
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 养殖种类: " + vue.toDisplayString(userInfo.poultry_detail.kind[0]) + "," + vue.toDisplayString(userInfo.poultry_detail.kind[1]),
-                1
-                /* TEXT */
-              ),
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 母: " + vue.toDisplayString(userInfo.poultry_detail.maternal_count) + "头 ",
-                1
-                /* TEXT */
-              )
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode(
-                "view",
-                { class: "" },
-                " 具体种类: " + vue.toDisplayString(userInfo.poultry_detail.breed[0]),
-                1
-                /* TEXT */
-              )
-            ])
-          ]),
+          vue.createCommentVNode(' <view class="card">\r\n			<view class="tit">\r\n				<view class="">\r\n					农户名称: {{userInfo.name}}\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					种养殖类型: 养殖户\r\n				</view>\r\n				<view class="">\r\n					养殖头数: {{userInfo.poultry_detail.total_count}}头\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					土地面积:{{userInfo.total_land_area}}亩\r\n				</view>\r\n				<view class="">\r\n					公: {{userInfo.poultry_detail.male_count}}头\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					养殖种类: {{userInfo.poultry_detail.kind[0]}},{{userInfo.poultry_detail.kind[1]}}\r\n				</view>\r\n				<view class="">\r\n					母: {{userInfo.poultry_detail.maternal_count}}头\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					具体种类: {{userInfo.poultry_detail.breed[0]}}\r\n				</view>\r\n\r\n			</view>\r\n		</view> '),
+          vue.createVNode(farmersCard),
           vue.createElementVNode("view", { class: "circumstance" }, [
             vue.createElementVNode("view", { class: "card-tit" }, [
               vue.createElementVNode("view", { class: "" }, " 养殖情况 ")
@@ -4434,7 +4510,7 @@ if (uni.restoreGlobal) {
                     "view",
                     {
                       class: "updata-btn",
-                      onClick: _cache[1] || (_cache[1] = ($event) => navgo("/pages/growRecord/index"))
+                      onClick: _cache[1] || (_cache[1] = ($event) => navgo("/pages/growRecord/index?type=2"))
                     },
                     " 更新" + vue.toDisplayString(index2.slice(0, -2)),
                     1
@@ -4553,8 +4629,8 @@ if (uni.restoreGlobal) {
       };
     }
   };
-  const chick = /* @__PURE__ */ _export_sfc(_sfc_main$10, [["__scopeId", "data-v-c4e0dba5"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/index/chick.vue"]]);
-  const _sfc_main$$ = {
+  const chick = /* @__PURE__ */ _export_sfc(_sfc_main$16, [["__scopeId", "data-v-c4e0dba5"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/index/chick.vue"]]);
+  const _sfc_main$15 = {
     __name: "index",
     setup(__props) {
       const flag2 = vue.ref(1);
@@ -4667,7 +4743,7 @@ if (uni.restoreGlobal) {
       };
     }
   };
-  const PagesIndexIndex = /* @__PURE__ */ _export_sfc(_sfc_main$$, [["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/index/index.vue"]]);
+  const PagesIndexIndex = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/index/index.vue"]]);
   const props$e = {
     props: {
       // 绑定的值
@@ -4854,7 +4930,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  const _sfc_main$_ = {
+  const _sfc_main$14 = {
     name: "u-input",
     mixins: [mpMixin, mixin, props$e],
     data() {
@@ -4927,12 +5003,12 @@ if (uni.restoreGlobal) {
     emits: ["update:modelValue", "focus", "blur", "change", "confirm", "clear", "keyboardheightchange"],
     methods: {
       // 在微信小程序中，不支持将函数当做props参数，故只能通过ref形式调用
-      setFormatter(e) {
-        this.innerFormatter = e;
+      setFormatter(e2) {
+        this.innerFormatter = e2;
       },
       // 当键盘输入时，触发input事件
-      onInput(e) {
-        let { value = "" } = e.detail || {};
+      onInput(e2) {
+        let { value = "" } = e2.detail || {};
         const formatter = this.formatter || this.innerFormatter;
         const formatValue = formatter(value);
         this.innerValue = value;
@@ -5076,7 +5152,7 @@ if (uni.restoreGlobal) {
       /* CLASS, STYLE */
     );
   }
-  const __easycom_1$6 = /* @__PURE__ */ _export_sfc(_sfc_main$_, [["render", _sfc_render$r], ["__scopeId", "data-v-5904192e"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-input/u-input.vue"]]);
+  const __easycom_1$7 = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["render", _sfc_render$r], ["__scopeId", "data-v-5904192e"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-input/u-input.vue"]]);
   const props$d = {
     props: {
       // 是否显示组件
@@ -5136,7 +5212,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  const _sfc_main$Z = {
+  const _sfc_main$13 = {
     name: "u-loading-icon",
     mixins: [mpMixin, mixin, props$d],
     data() {
@@ -5259,7 +5335,7 @@ if (uni.restoreGlobal) {
       /* CLASS, STYLE */
     )) : vue.createCommentVNode("v-if", true);
   }
-  const __easycom_1$5 = /* @__PURE__ */ _export_sfc(_sfc_main$Z, [["render", _sfc_render$q], ["__scopeId", "data-v-00752c6d"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-loading-icon/u-loading-icon.vue"]]);
+  const __easycom_1$6 = /* @__PURE__ */ _export_sfc(_sfc_main$13, [["render", _sfc_render$q], ["__scopeId", "data-v-00752c6d"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-loading-icon/u-loading-icon.vue"]]);
   const props$c = {
     props: {
       // 是否细边框
@@ -5412,7 +5488,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  const _sfc_main$Y = {
+  const _sfc_main$12 = {
     name: "u-button",
     mixins: [mpMixin, mixin, props$c],
     data() {
@@ -5537,7 +5613,7 @@ if (uni.restoreGlobal) {
     }
   };
   function _sfc_render$p(_ctx, _cache, $props, $setup, $data, $options) {
-    const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$5);
+    const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$6);
     const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$7);
     return vue.openBlock(), vue.createElementBlock("button", {
       "hover-start-time": Number(_ctx.hoverStartTime),
@@ -5614,7 +5690,7 @@ if (uni.restoreGlobal) {
       ))
     ], 46, ["hover-start-time", "hover-stay-time", "form-type", "open-type", "app-parameter", "hover-stop-propagation", "send-message-title", "send-message-path", "lang", "data-name", "session-from", "send-message-img", "show-message-card", "hover-class"]);
   }
-  const __easycom_0$4 = /* @__PURE__ */ _export_sfc(_sfc_main$Y, [["render", _sfc_render$p], ["__scopeId", "data-v-461e713c"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-button/u-button.vue"]]);
+  const __easycom_0$4 = /* @__PURE__ */ _export_sfc(_sfc_main$12, [["render", _sfc_render$p], ["__scopeId", "data-v-461e713c"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-button/u-button.vue"]]);
   const props$b = {
     props: {
       // 是否显示遮罩
@@ -5639,7 +5715,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  const _sfc_main$X = {
+  const _sfc_main$11 = {
     name: "u-overlay",
     mixins: [mpMixin, mixin, props$b],
     computed: {
@@ -5679,7 +5755,7 @@ if (uni.restoreGlobal) {
       /* FORWARDED */
     }, 8, ["show", "duration", "custom-style", "onClick"]);
   }
-  const __easycom_0$3 = /* @__PURE__ */ _export_sfc(_sfc_main$X, [["render", _sfc_render$o], ["__scopeId", "data-v-35f7c3e5"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-overlay/u-overlay.vue"]]);
+  const __easycom_0$3 = /* @__PURE__ */ _export_sfc(_sfc_main$11, [["render", _sfc_render$o], ["__scopeId", "data-v-35f7c3e5"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-overlay/u-overlay.vue"]]);
   const props$a = {
     props: {
       bgColor: {
@@ -5688,7 +5764,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  const _sfc_main$W = {
+  const _sfc_main$10 = {
     name: "u-status-bar",
     mixins: [mpMixin, mixin, props$a],
     data() {
@@ -5717,11 +5793,11 @@ if (uni.restoreGlobal) {
       /* STYLE */
     );
   }
-  const __easycom_1$4 = /* @__PURE__ */ _export_sfc(_sfc_main$W, [["render", _sfc_render$n], ["__scopeId", "data-v-c0b45a48"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-status-bar/u-status-bar.vue"]]);
+  const __easycom_1$5 = /* @__PURE__ */ _export_sfc(_sfc_main$10, [["render", _sfc_render$n], ["__scopeId", "data-v-c0b45a48"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-status-bar/u-status-bar.vue"]]);
   const props$9 = {
     props: {}
   };
-  const _sfc_main$V = {
+  const _sfc_main$$ = {
     name: "u-safe-bottom",
     mixins: [mpMixin, mixin, props$9],
     data() {
@@ -5751,7 +5827,7 @@ if (uni.restoreGlobal) {
       /* CLASS, STYLE */
     );
   }
-  const __easycom_3$1 = /* @__PURE__ */ _export_sfc(_sfc_main$V, [["render", _sfc_render$m], ["__scopeId", "data-v-3ec581de"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-safe-bottom/u-safe-bottom.vue"]]);
+  const __easycom_3$1 = /* @__PURE__ */ _export_sfc(_sfc_main$$, [["render", _sfc_render$m], ["__scopeId", "data-v-3ec581de"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-safe-bottom/u-safe-bottom.vue"]]);
   const props$8 = {
     props: {
       // 是否展示弹窗
@@ -5831,7 +5907,7 @@ if (uni.restoreGlobal) {
       }
     }
   };
-  const _sfc_main$U = {
+  const _sfc_main$_ = {
     name: "u-popup",
     mixins: [mpMixin, mixin, props$8],
     data() {
@@ -5931,7 +6007,7 @@ if (uni.restoreGlobal) {
           this.$emit("close");
         }
       },
-      close(e) {
+      close(e2) {
         this.$emit("close");
       },
       afterEnter() {
@@ -5947,7 +6023,7 @@ if (uni.restoreGlobal) {
   };
   function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_u_overlay = resolveEasycom(vue.resolveDynamicComponent("u-overlay"), __easycom_0$3);
-    const _component_u_status_bar = resolveEasycom(vue.resolveDynamicComponent("u-status-bar"), __easycom_1$4);
+    const _component_u_status_bar = resolveEasycom(vue.resolveDynamicComponent("u-status-bar"), __easycom_1$5);
     const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$7);
     const _component_u_safe_bottom = resolveEasycom(vue.resolveDynamicComponent("u-safe-bottom"), __easycom_3$1);
     const _component_u_transition = resolveEasycom(vue.resolveDynamicComponent("u-transition"), __easycom_4$1);
@@ -6010,8 +6086,8 @@ if (uni.restoreGlobal) {
       }, 8, ["show", "customStyle", "mode", "duration", "onAfterEnter", "onClick"])
     ]);
   }
-  const __easycom_2$3 = /* @__PURE__ */ _export_sfc(_sfc_main$U, [["render", _sfc_render$l], ["__scopeId", "data-v-74921bef"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-popup/u-popup.vue"]]);
-  const _sfc_main$T = {
+  const __easycom_1$4 = /* @__PURE__ */ _export_sfc(_sfc_main$_, [["render", _sfc_render$l], ["__scopeId", "data-v-74921bef"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-popup/u-popup.vue"]]);
+  const _sfc_main$Z = {
     name: "u-calendar-header",
     mixins: [mpMixin, mixin],
     props: {
@@ -6077,7 +6153,7 @@ if (uni.restoreGlobal) {
       ])
     ]);
   }
-  const uHeader = /* @__PURE__ */ _export_sfc(_sfc_main$T, [["render", _sfc_render$k], ["__scopeId", "data-v-31c8bd61"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-calendar/header.vue"]]);
+  const uHeader = /* @__PURE__ */ _export_sfc(_sfc_main$Z, [["render", _sfc_render$k], ["__scopeId", "data-v-31c8bd61"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-calendar/header.vue"]]);
   var SECONDS_A_MINUTE = 60;
   var SECONDS_A_HOUR = SECONDS_A_MINUTE * 60;
   var SECONDS_A_DAY = SECONDS_A_HOUR * 24;
@@ -6246,7 +6322,7 @@ if (uni.restoreGlobal) {
       this[IS_DAYJS] = true;
     }
     var _proto = Dayjs2.prototype;
-    _proto.parse = function parse2(cfg) {
+    _proto.parse = function parse(cfg) {
       this.$d = parseDate(cfg);
       this.init();
     };
@@ -6556,7 +6632,7 @@ if (uni.restoreGlobal) {
   dayjs.en = Ls$1[L$1];
   dayjs.Ls = Ls$1;
   dayjs.p = {};
-  const _sfc_main$S = {
+  const _sfc_main$Y = {
     name: "u-calendar-month",
     mixins: [mpMixin, mixin],
     props: {
@@ -7015,7 +7091,7 @@ if (uni.restoreGlobal) {
       /* NEED_PATCH */
     );
   }
-  const uMonth = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["render", _sfc_render$j], ["__scopeId", "data-v-9b76ab7e"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-calendar/month.vue"]]);
+  const uMonth = /* @__PURE__ */ _export_sfc(_sfc_main$Y, [["render", _sfc_render$j], ["__scopeId", "data-v-9b76ab7e"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-calendar/month.vue"]]);
   const props$7 = {
     props: {
       // 日历顶部标题
@@ -7999,7 +8075,7 @@ if (uni.restoreGlobal) {
       return this.solar2lunar(cY, cM, cD);
     }
   };
-  const _sfc_main$R = {
+  const _sfc_main$X = {
     name: "u-calendar",
     mixins: [mpMixin, mixin, props$7],
     components: {
@@ -8075,12 +8151,12 @@ if (uni.restoreGlobal) {
     emits: ["confirm", "close"],
     methods: {
       // 在微信小程序中，不支持将函数当做props参数，故只能通过ref形式调用
-      setFormatter(e) {
-        this.innerFormatter = e;
+      setFormatter(e2) {
+        this.innerFormatter = e2;
       },
       // month组件内部选择日期后，通过事件通知给父组件
-      monthSelected(e) {
-        this.selected = e;
+      monthSelected(e2) {
+        this.selected = e2;
         if (!this.showConfirm) {
           if (this.mode === "multiple" || this.mode === "single" || this.mode === "range" && this.selected.length >= 2) {
             this.$emit("confirm", this.selected);
@@ -8211,7 +8287,7 @@ if (uni.restoreGlobal) {
     const _component_uHeader = vue.resolveComponent("uHeader");
     const _component_uMonth = vue.resolveComponent("uMonth");
     const _component_u_button = resolveEasycom(vue.resolveDynamicComponent("u-button"), __easycom_0$4);
-    const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_2$3);
+    const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_1$4);
     return vue.openBlock(), vue.createBlock(_component_u_popup, {
       show: _ctx.show,
       mode: "bottom",
@@ -8277,7 +8353,7 @@ if (uni.restoreGlobal) {
       /* FORWARDED */
     }, 8, ["show", "onClose", "round", "closeOnClickOverlay"]);
   }
-  const __easycom_2$2 = /* @__PURE__ */ _export_sfc(_sfc_main$R, [["render", _sfc_render$i], ["__scopeId", "data-v-4d01889e"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-calendar/u-calendar.vue"]]);
+  const __easycom_2$1 = /* @__PURE__ */ _export_sfc(_sfc_main$X, [["render", _sfc_render$i], ["__scopeId", "data-v-4d01889e"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-calendar/u-calendar.vue"]]);
   let uplodeImg = () => {
     return new Promise((reslove, reject) => {
       uni.chooseImage({
@@ -8384,7 +8460,7 @@ if (uni.restoreGlobal) {
         const raw = localStorage.getItem(localSettingsSaveId);
         const data = JSON.parse(raw);
         Object.assign(currentSettings, data);
-      } catch (e) {
+      } catch (e2) {
       }
       this.fallbacks = {
         getSettings() {
@@ -8393,7 +8469,7 @@ if (uni.restoreGlobal) {
         setSettings(value) {
           try {
             localStorage.setItem(localSettingsSaveId, JSON.stringify(value));
-          } catch (e) {
+          } catch (e2) {
           }
           currentSettings = value;
         },
@@ -8524,14 +8600,14 @@ if (uni.restoreGlobal) {
     xhr.open("HEAD", url2, false);
     try {
       xhr.send();
-    } catch (e) {
+    } catch (e2) {
     }
     return xhr.status >= 200 && xhr.status <= 299;
   }
   function click(node) {
     try {
       node.dispatchEvent(new MouseEvent("click"));
-    } catch (e) {
+    } catch (e2) {
       const evt = document.createEvent("MouseEvents");
       evt.initMouseEvent("click", true, true, window, 0, 0, 0, 80, 20, false, false, false, false, 0, null);
       node.dispatchEvent(evt);
@@ -9764,7 +9840,7 @@ This will fail in production.`);
       }
     }
   });
-  const _sfc_main$Q = {
+  const _sfc_main$W = {
     __name: "plant",
     setup(__props) {
       const userInfo = userInfoStore();
@@ -9780,9 +9856,9 @@ This will fail in production.`);
         crop_buy_time: "",
         pic: ""
       });
-      const confirm = (e) => {
-        formatAppLog("log", "at components/InformationAdd/plant.vue:123", e[0]);
-        formData.crop_buy_time = e[0];
+      const confirm = (e2) => {
+        formatAppLog("log", "at components/InformationAdd/plant.vue:123", e2[0]);
+        formData.crop_buy_time = e2[0];
         showDatePicker.value = false;
       };
       const updateImgFn = async () => {
@@ -9803,9 +9879,9 @@ This will fail in production.`);
         formData.land_id = options.land_id;
       });
       return (_ctx, _cache) => {
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
-        const _component_up_calendar = resolveEasycom(vue.resolveDynamicComponent("up-calendar"), __easycom_2$2);
+        const _component_up_calendar = resolveEasycom(vue.resolveDynamicComponent("up-calendar"), __easycom_2$1);
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
           null,
@@ -9928,8 +10004,8 @@ This will fail in production.`);
       };
     }
   };
-  const plantadd = /* @__PURE__ */ _export_sfc(_sfc_main$Q, [["__scopeId", "data-v-0a2913e2"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/InformationAdd/plant.vue"]]);
-  const _sfc_main$P = {
+  const plantadd = /* @__PURE__ */ _export_sfc(_sfc_main$W, [["__scopeId", "data-v-0a2913e2"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/InformationAdd/plant.vue"]]);
+  const _sfc_main$V = {
     __name: "index",
     setup(__props) {
       return (_ctx, _cache) => {
@@ -9939,8 +10015,745 @@ This will fail in production.`);
       };
     }
   };
-  const PagesInformationAddIndex = /* @__PURE__ */ _export_sfc(_sfc_main$P, [["__scopeId", "data-v-2fddea55"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/InformationAdd/index.vue"]]);
+  const PagesInformationAddIndex = /* @__PURE__ */ _export_sfc(_sfc_main$V, [["__scopeId", "data-v-2fddea55"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/InformationAdd/index.vue"]]);
+  const MIN_DISTANCE = 10;
+  function getDirection(x, y2) {
+    if (x > y2 && x > MIN_DISTANCE) {
+      return "horizontal";
+    }
+    if (y2 > x && y2 > MIN_DISTANCE) {
+      return "vertical";
+    }
+    return "";
+  }
+  const touch = {
+    methods: {
+      getTouchPoint(e2) {
+        if (!e2) {
+          return {
+            x: 0,
+            y: 0
+          };
+        }
+        if (e2.touches && e2.touches[0]) {
+          return {
+            x: e2.touches[0].pageX,
+            y: e2.touches[0].pageY
+          };
+        }
+        if (e2.changedTouches && e2.changedTouches[0]) {
+          return {
+            x: e2.changedTouches[0].pageX,
+            y: e2.changedTouches[0].pageY
+          };
+        }
+        return {
+          x: e2.clientX || 0,
+          y: e2.clientY || 0
+        };
+      },
+      resetTouchStatus() {
+        this.direction = "";
+        this.deltaX = 0;
+        this.deltaY = 0;
+        this.offsetX = 0;
+        this.offsetY = 0;
+      },
+      touchStart(event) {
+        this.resetTouchStatus();
+        const touch2 = this.getTouchPoint(event);
+        this.startX = touch2.x;
+        this.startY = touch2.y;
+      },
+      touchMove(event) {
+        const touch2 = this.getTouchPoint(event);
+        this.deltaX = touch2.x - this.startX;
+        this.deltaY = touch2.y - this.startY;
+        this.offsetX = Math.abs(this.deltaX);
+        this.offsetY = Math.abs(this.deltaY);
+        this.direction = this.direction || getDirection(this.offsetX, this.offsetY);
+      }
+    }
+  };
   const props$6 = {
+    props: {
+      // 控制打开或者关闭
+      show: {
+        type: Boolean,
+        default: props$i.swipeActionItem.show
+      },
+      // 标识符，如果是v-for，可用index索引值
+      name: {
+        type: [String, Number],
+        default: props$i.swipeActionItem.name
+      },
+      // 是否禁用
+      disabled: {
+        type: Boolean,
+        default: props$i.swipeActionItem.disabled
+      },
+      // 是否自动关闭其他swipe按钮组
+      autoClose: {
+        type: Boolean,
+        default: props$i.swipeActionItem.autoClose
+      },
+      // 滑动距离阈值，只有大于此值，才被认为是要打开菜单
+      threshold: {
+        type: Number,
+        default: props$i.swipeActionItem.threshold
+      },
+      // 右侧按钮内容
+      options: {
+        type: Array,
+        default() {
+          return uni.$u.props.swipeActionItem.rightOptions;
+        }
+      },
+      // 动画过渡时间，单位ms
+      duration: {
+        type: [String, Number],
+        default: props$i.swipeActionItem.duration
+      }
+    }
+  };
+  const wxs = {
+    methods: {
+      // 关闭时执行
+      closeHandler() {
+        this.status = "close";
+      },
+      setState(status) {
+        this.status = status;
+      },
+      closeOther() {
+        this.parent && this.parent.closeOther(this);
+      }
+    }
+  };
+  const block0$1 = (Comp) => {
+    (Comp.$wxs || (Comp.$wxs = [])).push("wxs");
+    (Comp.$wxsModules || (Comp.$wxsModules = {}))["wxs"] = "229ea0d2";
+  };
+  const _sfc_main$U = {
+    name: "u-swipe-action-item",
+    emits: ["click"],
+    mixins: [mpMixin, mixin, props$6, touch],
+    mixins: [mpMixin, mixin, props$6, touch, wxs],
+    data() {
+      return {
+        // 按钮的尺寸信息
+        size: {},
+        // 父组件u-swipe-action的参数
+        parentData: {
+          autoClose: true
+        },
+        // 当前状态，open-打开，close-关闭
+        status: "close"
+      };
+    },
+    watch: {
+      // 由于wxs无法直接读取外部的值，需要在外部值变化时，重新执行赋值逻辑
+      wxsInit(newValue, oldValue) {
+        this.queryRect();
+      }
+    },
+    computed: {
+      wxsInit() {
+        return [this.disabled, this.autoClose, this.threshold, this.options, this.duration];
+      }
+    },
+    mounted() {
+      this.init();
+    },
+    methods: {
+      init() {
+        this.updateParentData();
+        uni.$u.sleep().then(() => {
+          this.queryRect();
+        });
+      },
+      updateParentData() {
+        this.getParentData("u-swipe-action");
+      },
+      // 查询节点
+      queryRect() {
+        this.$uGetRect(".u-swipe-action-item__right__button", true).then((buttons) => {
+          this.size = {
+            buttons,
+            show: this.show,
+            disabled: this.disabled,
+            threshold: this.threshold,
+            duration: this.duration
+          };
+        });
+      },
+      // 按钮被点击
+      buttonClickHandler(item, index2) {
+        this.$emit("click", {
+          index: index2,
+          name: this.name
+        });
+      }
+    }
+  };
+  function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
+    const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$7);
+    return vue.openBlock(), vue.createElementBlock(
+      "view",
+      {
+        class: "u-swipe-action-item",
+        ref: "u-swipe-action-item"
+      },
+      [
+        vue.createElementVNode("view", { class: "u-swipe-action-item__right" }, [
+          vue.renderSlot(_ctx.$slots, "button", {}, () => [
+            (vue.openBlock(true), vue.createElementBlock(
+              vue.Fragment,
+              null,
+              vue.renderList(_ctx.options, (item, index2) => {
+                return vue.openBlock(), vue.createElementBlock("view", {
+                  key: index2,
+                  class: "u-swipe-action-item__right__button",
+                  ref_for: true,
+                  ref: `u-swipe-action-item__right__button-${index2}`,
+                  style: vue.normalizeStyle([{
+                    alignItems: item.style && item.style.borderRadius ? "center" : "stretch"
+                  }]),
+                  onClick: ($event) => $options.buttonClickHandler(item, index2)
+                }, [
+                  vue.createElementVNode(
+                    "view",
+                    {
+                      class: "u-swipe-action-item__right__button__wrapper",
+                      style: vue.normalizeStyle([{
+                        backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : "#C7C6CD",
+                        borderRadius: item.style && item.style.borderRadius ? item.style.borderRadius : "0",
+                        padding: item.style && item.style.borderRadius ? "0" : "0 15px"
+                      }, item.style])
+                    },
+                    [
+                      item.icon ? (vue.openBlock(), vue.createBlock(_component_u_icon, {
+                        key: 0,
+                        name: item.icon,
+                        color: item.style && item.style.color ? item.style.color : "#ffffff",
+                        size: item.iconSize ? _ctx.$u.addUnit(item.iconSize) : item.style && item.style.fontSize ? _ctx.$u.getPx(item.style.fontSize) * 1.2 : 17,
+                        customStyle: {
+                          marginRight: item.text ? "2px" : 0
+                        }
+                      }, null, 8, ["name", "color", "size", "customStyle"])) : vue.createCommentVNode("v-if", true),
+                      item.text ? (vue.openBlock(), vue.createElementBlock(
+                        "text",
+                        {
+                          key: 1,
+                          class: "u-swipe-action-item__right__button__wrapper__text u-line-1",
+                          style: vue.normalizeStyle([{
+                            color: item.style && item.style.color ? item.style.color : "#ffffff",
+                            fontSize: item.style && item.style.fontSize ? item.style.fontSize : "16px",
+                            lineHeight: item.style && item.style.fontSize ? item.style.fontSize : "16px"
+                          }])
+                        },
+                        vue.toDisplayString(item.text),
+                        5
+                        /* TEXT, STYLE */
+                      )) : vue.createCommentVNode("v-if", true)
+                    ],
+                    4
+                    /* STYLE */
+                  )
+                ], 12, ["onClick"]);
+              }),
+              128
+              /* KEYED_FRAGMENT */
+            ))
+          ], true)
+        ]),
+        vue.createElementVNode("view", {
+          class: "u-swipe-action-item__content",
+          onTouchstart: _cache[0] || (_cache[0] = (...args) => _ctx.wxs.touchstart && _ctx.wxs.touchstart(...args)),
+          onTouchmove: _cache[1] || (_cache[1] = (...args) => _ctx.wxs.touchmove && _ctx.wxs.touchmove(...args)),
+          onTouchend: _cache[2] || (_cache[2] = (...args) => _ctx.wxs.touchend && _ctx.wxs.touchend(...args)),
+          status: vue.wp($data.status),
+          "change:status": _ctx.wxs.statusChange,
+          size: vue.wp($data.size),
+          "change:size": _ctx.wxs.sizeChange
+        }, [
+          vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
+        ], 40, ["status", "change:status", "size", "change:size"])
+      ],
+      512
+      /* NEED_PATCH */
+    );
+  }
+  if (typeof block0$1 === "function")
+    block0$1(_sfc_main$U);
+  const __easycom_2 = /* @__PURE__ */ _export_sfc(_sfc_main$U, [["render", _sfc_render$h], ["__scopeId", "data-v-8b5d76c2"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-swipe-action-item/u-swipe-action-item.vue"]]);
+  const props$5 = {
+    props: {
+      // 是否自动关闭其他swipe按钮组
+      autoClose: {
+        type: Boolean,
+        default: props$i.swipeAction.autoClose
+      }
+    }
+  };
+  const _sfc_main$T = {
+    name: "u-swipe-action",
+    mixins: [mpMixin, mixin, props$5],
+    data() {
+      return {};
+    },
+    provide() {
+      return {
+        swipeAction: this
+      };
+    },
+    computed: {
+      // 这里computed的变量，都是子组件u-swipe-action-item需要用到的，由于头条小程序的兼容性差异，子组件无法实时监听父组件参数的变化
+      // 所以需要手动通知子组件，这里返回一个parentData变量，供watch监听，在其中去通知每一个子组件重新从父组件(u-swipe-action-item)
+      // 拉取父组件新的变化后的参数
+      parentData() {
+        return [this.autoClose];
+      }
+    },
+    watch: {
+      // 当父组件需要子组件需要共享的参数发生了变化，手动通知子组件
+      parentData() {
+        if (this.children.length) {
+          this.children.map((child) => {
+            typeof child.updateParentData === "function" && child.updateParentData();
+          });
+        }
+      }
+    },
+    created() {
+      this.children = [];
+    },
+    methods: {
+      closeOther(child) {
+        if (this.autoClose) {
+          this.children.map((item, index2) => {
+            if (child !== item) {
+              item.closeHandler();
+            }
+          });
+        }
+      }
+    }
+  };
+  function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
+    return vue.openBlock(), vue.createElementBlock("view", { class: "u-swipe-action" }, [
+      vue.renderSlot(_ctx.$slots, "default")
+    ]);
+  }
+  const __easycom_3 = /* @__PURE__ */ _export_sfc(_sfc_main$T, [["render", _sfc_render$g], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-swipe-action/u-swipe-action.vue"]]);
+  const props$4 = {
+    props: {
+      // 是否展示工具条
+      show: {
+        type: Boolean,
+        default: props$i.toolbar.show
+      },
+      // 取消按钮的文字
+      cancelText: {
+        type: String,
+        default: props$i.toolbar.cancelText
+      },
+      // 确认按钮的文字
+      confirmText: {
+        type: String,
+        default: props$i.toolbar.confirmText
+      },
+      // 取消按钮的颜色
+      cancelColor: {
+        type: String,
+        default: props$i.toolbar.cancelColor
+      },
+      // 确认按钮的颜色
+      confirmColor: {
+        type: String,
+        default: props$i.toolbar.confirmColor
+      },
+      // 标题文字
+      title: {
+        type: String,
+        default: props$i.toolbar.title
+      }
+    }
+  };
+  const _sfc_main$S = {
+    name: "u-toolbar",
+    mixins: [mpMixin, mixin, props$4],
+    emits: ["confirm", "cancel"],
+    methods: {
+      // 点击取消按钮
+      cancel() {
+        this.$emit("cancel");
+      },
+      // 点击确定按钮
+      confirm() {
+        this.$emit("confirm");
+      }
+    }
+  };
+  function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
+    return _ctx.show ? (vue.openBlock(), vue.createElementBlock(
+      "view",
+      {
+        key: 0,
+        class: "u-toolbar",
+        onTouchmove: _cache[2] || (_cache[2] = vue.withModifiers((...args) => _ctx.noop && _ctx.noop(...args), ["stop", "prevent"]))
+      },
+      [
+        vue.createElementVNode("view", {
+          class: "u-toolbar__cancel__wrapper",
+          "hover-class": "u-hover-class"
+        }, [
+          vue.createElementVNode(
+            "text",
+            {
+              class: "u-toolbar__wrapper__cancel",
+              onClick: _cache[0] || (_cache[0] = (...args) => $options.cancel && $options.cancel(...args)),
+              style: vue.normalizeStyle({
+                color: _ctx.cancelColor
+              })
+            },
+            vue.toDisplayString(_ctx.cancelText),
+            5
+            /* TEXT, STYLE */
+          )
+        ]),
+        _ctx.title ? (vue.openBlock(), vue.createElementBlock(
+          "text",
+          {
+            key: 0,
+            class: "u-toolbar__title u-line-1"
+          },
+          vue.toDisplayString(_ctx.title),
+          1
+          /* TEXT */
+        )) : vue.createCommentVNode("v-if", true),
+        vue.createElementVNode("view", {
+          class: "u-toolbar__confirm__wrapper",
+          "hover-class": "u-hover-class"
+        }, [
+          vue.createElementVNode(
+            "text",
+            {
+              class: "u-toolbar__wrapper__confirm",
+              onClick: _cache[1] || (_cache[1] = (...args) => $options.confirm && $options.confirm(...args)),
+              style: vue.normalizeStyle({
+                color: _ctx.confirmColor
+              })
+            },
+            vue.toDisplayString(_ctx.confirmText),
+            5
+            /* TEXT, STYLE */
+          )
+        ])
+      ],
+      32
+      /* HYDRATE_EVENTS */
+    )) : vue.createCommentVNode("v-if", true);
+  }
+  const __easycom_0$2 = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["render", _sfc_render$f], ["__scopeId", "data-v-3fd495d6"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-toolbar/u-toolbar.vue"]]);
+  const props$3 = {
+    props: {
+      // 是否展示picker弹窗
+      show: {
+        type: Boolean,
+        default: props$i.picker.show
+      },
+      // 是否展示顶部的操作栏
+      showToolbar: {
+        type: Boolean,
+        default: props$i.picker.showToolbar
+      },
+      // 顶部标题
+      title: {
+        type: String,
+        default: props$i.picker.title
+      },
+      // 对象数组，设置每一列的数据
+      columns: {
+        type: Array,
+        default: props$i.picker.columns
+      },
+      // 是否显示加载中状态
+      loading: {
+        type: Boolean,
+        default: props$i.picker.loading
+      },
+      // 各列中，单个选项的高度
+      itemHeight: {
+        type: [String, Number],
+        default: props$i.picker.itemHeight
+      },
+      // 取消按钮的文字
+      cancelText: {
+        type: String,
+        default: props$i.picker.cancelText
+      },
+      // 确认按钮的文字
+      confirmText: {
+        type: String,
+        default: props$i.picker.confirmText
+      },
+      // 取消按钮的颜色
+      cancelColor: {
+        type: String,
+        default: props$i.picker.cancelColor
+      },
+      // 确认按钮的颜色
+      confirmColor: {
+        type: String,
+        default: props$i.picker.confirmColor
+      },
+      // 每列中可见选项的数量
+      visibleItemCount: {
+        type: [String, Number],
+        default: props$i.picker.visibleItemCount
+      },
+      // 选项对象中，需要展示的属性键名
+      keyName: {
+        type: String,
+        default: props$i.picker.keyName
+      },
+      // 是否允许点击遮罩关闭选择器
+      closeOnClickOverlay: {
+        type: Boolean,
+        default: props$i.picker.closeOnClickOverlay
+      },
+      // 各列的默认索引
+      defaultIndex: {
+        type: Array,
+        default: props$i.picker.defaultIndex
+      },
+      // 是否在手指松开时立即触发 change 事件。若不开启则会在滚动动画结束后触发 change 事件，只在微信2.21.1及以上有效
+      immediateChange: {
+        type: Boolean,
+        default: props$i.picker.immediateChange
+      }
+    }
+  };
+  const _sfc_main$R = {
+    name: "u-picker",
+    mixins: [mpMixin, mixin, props$3],
+    data() {
+      return {
+        // 上一次选择的列索引
+        lastIndex: [],
+        // 索引值 ，对应picker-view的value
+        innerIndex: [],
+        // 各列的值
+        innerColumns: [],
+        // 上一次的变化列索引
+        columnIndex: 0
+      };
+    },
+    watch: {
+      // 监听默认索引的变化，重新设置对应的值
+      defaultIndex: {
+        immediate: true,
+        handler(n2) {
+          this.setIndexs(n2, true);
+        }
+      },
+      // 监听columns参数的变化
+      columns: {
+        immediate: true,
+        deep: true,
+        handler(n2) {
+          this.setColumns(n2);
+        }
+      }
+    },
+    emits: ["close", "cancel", "confirm", "change"],
+    methods: {
+      // 获取item需要显示的文字，判别为对象还是文本
+      getItemText(item) {
+        if (uni.$u.test.object(item)) {
+          return item[this.keyName];
+        } else {
+          return item;
+        }
+      },
+      // 关闭选择器
+      closeHandler() {
+        if (this.closeOnClickOverlay) {
+          this.$emit("close");
+        }
+      },
+      // 点击工具栏的取消按钮
+      cancel() {
+        this.$emit("cancel");
+      },
+      // 点击工具栏的确定按钮
+      confirm() {
+        this.$emit("confirm", {
+          indexs: this.innerIndex,
+          value: this.innerColumns.map((item, index2) => item[this.innerIndex[index2]]),
+          values: this.innerColumns
+        });
+      },
+      // 选择器某一列的数据发生变化时触发
+      changeHandler(e2) {
+        const {
+          value
+        } = e2.detail;
+        let index2 = 0, columnIndex = 0;
+        for (let i2 = 0; i2 < value.length; i2++) {
+          let item = value[i2];
+          if (item !== (this.lastIndex[i2] || 0)) {
+            columnIndex = i2;
+            index2 = item;
+            break;
+          }
+        }
+        this.columnIndex = columnIndex;
+        const values = this.innerColumns;
+        this.setLastIndex(value);
+        this.setIndexs(value);
+        this.$emit("change", {
+          // 微信小程序不能传递this，会因为循环引用而报错
+          picker: this,
+          value: this.innerColumns.map((item, index3) => item[value[index3]]),
+          index: index2,
+          indexs: value,
+          // values为当前变化列的数组内容
+          values,
+          columnIndex
+        });
+      },
+      // 设置index索引，此方法可被外部调用设置
+      setIndexs(index2, setLastIndex) {
+        this.innerIndex = uni.$u.deepClone(index2);
+        if (setLastIndex) {
+          this.setLastIndex(index2);
+        }
+      },
+      // 记录上一次的各列索引位置
+      setLastIndex(index2) {
+        this.lastIndex = uni.$u.deepClone(index2);
+      },
+      // 设置对应列选项的所有值
+      setColumnValues(columnIndex, values) {
+        this.innerColumns.splice(columnIndex, 1, values);
+        let tmpIndex = uni.$u.deepClone(this.innerIndex);
+        for (let i2 = 0; i2 < this.innerColumns.length; i2++) {
+          if (i2 > this.columnIndex) {
+            tmpIndex[i2] = 0;
+          }
+        }
+        this.setIndexs(tmpIndex);
+      },
+      // 获取对应列的所有选项
+      getColumnValues(columnIndex) {
+        (async () => {
+          await uni.$u.sleep();
+        })();
+        return this.innerColumns[columnIndex];
+      },
+      // 设置整体各列的columns的值
+      setColumns(columns) {
+        this.innerColumns = uni.$u.deepClone(columns);
+        if (this.innerIndex.length === 0) {
+          this.innerIndex = new Array(columns.length).fill(0);
+        }
+      },
+      // 获取各列选中值对应的索引
+      getIndexs() {
+        return this.innerIndex;
+      },
+      // 获取各列选中的值
+      getValues() {
+        (async () => {
+          await uni.$u.sleep();
+        })();
+        return this.innerColumns.map((item, index2) => item[this.innerIndex[index2]]);
+      }
+    }
+  };
+  function _sfc_render$e(_ctx, _cache, $props, $setup, $data, $options) {
+    const _component_u_toolbar = resolveEasycom(vue.resolveDynamicComponent("u-toolbar"), __easycom_0$2);
+    const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$6);
+    const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_1$4);
+    return vue.openBlock(), vue.createBlock(_component_u_popup, {
+      show: _ctx.show,
+      onClose: $options.closeHandler
+    }, {
+      default: vue.withCtx(() => [
+        vue.createElementVNode("view", { class: "u-picker" }, [
+          _ctx.showToolbar ? (vue.openBlock(), vue.createBlock(_component_u_toolbar, {
+            key: 0,
+            cancelColor: _ctx.cancelColor,
+            confirmColor: _ctx.confirmColor,
+            cancelText: _ctx.cancelText,
+            confirmText: _ctx.confirmText,
+            title: _ctx.title,
+            onCancel: $options.cancel,
+            onConfirm: $options.confirm
+          }, null, 8, ["cancelColor", "confirmColor", "cancelText", "confirmText", "title", "onCancel", "onConfirm"])) : vue.createCommentVNode("v-if", true),
+          vue.createElementVNode("picker-view", {
+            class: "u-picker__view",
+            indicatorStyle: `height: ${_ctx.$u.addUnit(_ctx.itemHeight)}`,
+            value: $data.innerIndex,
+            immediateChange: _ctx.immediateChange,
+            style: vue.normalizeStyle({
+              height: `${_ctx.$u.addUnit(_ctx.visibleItemCount * _ctx.itemHeight)}`
+            }),
+            onChange: _cache[0] || (_cache[0] = (...args) => $options.changeHandler && $options.changeHandler(...args))
+          }, [
+            (vue.openBlock(true), vue.createElementBlock(
+              vue.Fragment,
+              null,
+              vue.renderList($data.innerColumns, (item, index2) => {
+                return vue.openBlock(), vue.createElementBlock("picker-view-column", {
+                  key: index2,
+                  class: "u-picker__view__column"
+                }, [
+                  _ctx.$u.test.array(item) ? (vue.openBlock(true), vue.createElementBlock(
+                    vue.Fragment,
+                    { key: 0 },
+                    vue.renderList(item, (item1, index1) => {
+                      return vue.openBlock(), vue.createElementBlock(
+                        "text",
+                        {
+                          class: "u-picker__view__column__item u-line-1",
+                          key: index1,
+                          style: vue.normalizeStyle({
+                            height: _ctx.$u.addUnit(_ctx.itemHeight),
+                            lineHeight: _ctx.$u.addUnit(_ctx.itemHeight),
+                            fontWeight: index1 === $data.innerIndex[index2] ? "bold" : "normal"
+                          })
+                        },
+                        vue.toDisplayString($options.getItemText(item1)),
+                        5
+                        /* TEXT, STYLE */
+                      );
+                    }),
+                    128
+                    /* KEYED_FRAGMENT */
+                  )) : vue.createCommentVNode("v-if", true)
+                ]);
+              }),
+              128
+              /* KEYED_FRAGMENT */
+            ))
+          ], 44, ["indicatorStyle", "value", "immediateChange"]),
+          _ctx.loading ? (vue.openBlock(), vue.createElementBlock("view", {
+            key: 1,
+            class: "u-picker--loading"
+          }, [
+            vue.createVNode(_component_u_loading_icon, { mode: "circle" })
+          ])) : vue.createCommentVNode("v-if", true)
+        ])
+      ]),
+      _: 1
+      /* STABLE */
+    }, 8, ["show", "onClose"]);
+  }
+  const __easycom_1$3 = /* @__PURE__ */ _export_sfc(_sfc_main$R, [["render", _sfc_render$e], ["__scopeId", "data-v-1500ce68"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-picker/u-picker.vue"]]);
+  const props$2 = {
     props: {
       color: {
         type: String,
@@ -9973,9 +10786,9 @@ This will fail in production.`);
       }
     }
   };
-  const _sfc_main$O = {
+  const _sfc_main$Q = {
     name: "u-line",
-    mixins: [mpMixin, mixin, props$6],
+    mixins: [mpMixin, mixin, props$2],
     computed: {
       lineStyle() {
         const style = {};
@@ -9998,7 +10811,7 @@ This will fail in production.`);
       }
     }
   };
-  function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock(
       "view",
       {
@@ -10010,8 +10823,8 @@ This will fail in production.`);
       /* STYLE */
     );
   }
-  const __easycom_0$2 = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["render", _sfc_render$h], ["__scopeId", "data-v-bbd9963c"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-line/u-line.vue"]]);
-  const props$5 = {
+  const __easycom_0$1 = /* @__PURE__ */ _export_sfc(_sfc_main$Q, [["render", _sfc_render$d], ["__scopeId", "data-v-bbd9963c"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-line/u-line.vue"]]);
+  const props$1 = {
     props: {
       // 是否展示modal
       show: {
@@ -10095,9 +10908,9 @@ This will fail in production.`);
       }
     }
   };
-  const _sfc_main$N = {
+  const _sfc_main$P = {
     name: "u-modal",
-    mixins: [mpMixin, mixin, props$5],
+    mixins: [mpMixin, mixin, props$1],
     data() {
       return {
         loading: false
@@ -10134,10 +10947,10 @@ This will fail in production.`);
       }
     }
   };
-  function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
-    const _component_u_line = resolveEasycom(vue.resolveDynamicComponent("u-line"), __easycom_0$2);
-    const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$5);
-    const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_2$3);
+  function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
+    const _component_u_line = resolveEasycom(vue.resolveDynamicComponent("u-line"), __easycom_0$1);
+    const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$6);
+    const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_1$4);
     return vue.openBlock(), vue.createBlock(_component_u_popup, {
       mode: "center",
       zoom: _ctx.zoom,
@@ -10287,8 +11100,8 @@ This will fail in production.`);
       /* FORWARDED */
     }, 8, ["zoom", "show", "customStyle", "closeOnClickOverlay", "onClick"]);
   }
-  const __easycom_2$1 = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["render", _sfc_render$g], ["__scopeId", "data-v-12b77a26"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-modal/u-modal.vue"]]);
-  const _sfc_main$M = {
+  const __easycom_6 = /* @__PURE__ */ _export_sfc(_sfc_main$P, [["render", _sfc_render$c], ["__scopeId", "data-v-12b77a26"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-modal/u-modal.vue"]]);
+  const _sfc_main$O = {
     __name: "landInfo",
     props: {
       land_id: String,
@@ -10312,7 +11125,6 @@ This will fail in production.`);
           });
         }
       }, {
-        // 页面加载会先执行一次
         immediate: true
       });
       return (_ctx, _cache) => {
@@ -10391,13 +11203,33 @@ This will fail in production.`);
       };
     }
   };
-  const landInfo = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__scopeId", "data-v-5f103973"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/plant/landInfo.vue"]]);
-  const _sfc_main$L = {
+  const landInfo = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["__scopeId", "data-v-5f103973"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/plant/landInfo.vue"]]);
+  const _sfc_main$N = {
     __name: "index",
     setup(__props) {
+      const options1 = vue.reactive([{
+        text: "删除"
+      }]);
+      const showPicker = vue.ref(false);
+      const columns = vue.reactive([
+        ["中国", "美国", "日本"]
+      ]);
+      const confirmFn = (e2) => {
+        showPicker.value = false;
+        formatAppLog("log", "at pages/growRecord/index.vue:236", e2.value);
+      };
       const land_id = vue.ref(0);
+      vue.ref(0);
+      const actionData = vue.reactive({});
       onLoad((options) => {
         land_id.value = options.land_id;
+        actionsListAPI({
+          type: options.type
+        }).then((res) => {
+          for (let key in res.data) {
+            actionData[key] = res.data[key];
+          }
+        });
       });
       const showPop = vue.ref(false);
       const formData = vue.reactive({
@@ -10406,11 +11238,6 @@ This will fail in production.`);
       const confirm = () => {
         showPop.value = false;
       };
-      const navgo = (url2) => {
-        uni.navigateTo({
-          url: url2
-        });
-      };
       const showModal = vue.ref(false);
       const delFn = () => {
         showModal.value = false;
@@ -10420,37 +11247,92 @@ This will fail in production.`);
           duration: 1e3
         });
       };
+      const popList = vue.reactive([]);
+      const showPopFn = (id) => {
+        popList.splice(0, popList.length);
+        showPop.value = true;
+        columns[0].splice(0, columns[0].length);
+        actionsDetailAPI({
+          action_id: id
+        }).then((res) => {
+          res.data.forEach((item) => {
+            popList.push(item);
+            if (item.type == 4) {
+              columns[0] = Array.from(item.options);
+              formatAppLog("log", "at pages/growRecord/index.vue:288", columns[0]);
+            }
+          });
+        });
+      };
       return (_ctx, _cache) => {
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
-        const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_2$3);
-        const _component_u_modal = resolveEasycom(vue.resolveDynamicComponent("u-modal"), __easycom_2$1);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
+        const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
+        const _component_u_swipe_action_item = resolveEasycom(vue.resolveDynamicComponent("u-swipe-action-item"), __easycom_2);
+        const _component_u_swipe_action = resolveEasycom(vue.resolveDynamicComponent("u-swipe-action"), __easycom_3);
+        const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_1$4);
+        const _component_u_picker = resolveEasycom(vue.resolveDynamicComponent("u-picker"), __easycom_1$3);
+        const _component_u_modal = resolveEasycom(vue.resolveDynamicComponent("u-modal"), __easycom_6);
         return vue.openBlock(), vue.createElementBlock(
-          vue.Fragment,
-          null,
+          "view",
+          {
+            class: vue.normalizeClass({ popupShow: showPop.value })
+          },
           [
             vue.createElementVNode("view", { class: "cont" }, [
-              vue.createCommentVNode(' <view class="card">\r\n			<view class="tit">\r\n				<view class="">\r\n					1号土地\r\n				</view>\r\n				<view class="">\r\n					溯源码: 12302\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					当前种植: 土豆\r\n				</view>\r\n				<view class="">\r\n					种植品牌: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					土地面积: 20亩\r\n				</view>\r\n				<view class="">\r\n					种子品牌: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					播种时间: 2020.12.01\r\n				</view>\r\n\r\n			</view>\r\n		</view> '),
+              vue.createCommentVNode(' <view class="card">\r\n				<view class="tit">\r\n					<view class="">\r\n						1号土地\r\n					</view>\r\n					<view class="">\r\n						溯源码: 12302\r\n					</view>\r\n				</view>\r\n				<view class="card-li">\r\n					<view class="">\r\n						当前种植: 土豆\r\n					</view>\r\n					<view class="">\r\n						种植品牌: 的划分等级\r\n					</view>\r\n				</view>\r\n				<view class="card-li">\r\n					<view class="">\r\n						土地面积: 20亩\r\n					</view>\r\n					<view class="">\r\n						种子品牌: 的划分等级\r\n					</view>\r\n				</view>\r\n				<view class="card-li">\r\n					<view class="">\r\n						播种时间: 2020.12.01\r\n					</view>\r\n		\r\n				</view>\r\n			</view> '),
               vue.createVNode(landInfo, { land_id: land_id.value }, null, 8, ["land_id"]),
-              vue.createElementVNode("view", { class: "operate" }, [
-                vue.createElementVNode("view", { class: "tit" }, " 操作选择 "),
-                vue.createElementVNode("view", { class: "card" }, [
-                  vue.createElementVNode("view", {
-                    class: "operate-li",
-                    onClick: _cache[0] || (_cache[0] = ($event) => showPop.value = true)
-                  }, " 胶水 "),
-                  vue.createElementVNode("view", {
-                    class: "operate-li",
-                    onClick: _cache[1] || (_cache[1] = ($event) => navgo(""))
-                  }, " 喂食 "),
-                  vue.createElementVNode("view", {
-                    class: "operate-li",
-                    onClick: _cache[2] || (_cache[2] = ($event) => navgo("/pages/feedIng/vaccineInfo"))
-                  }, " 注射疫苗 "),
-                  vue.createElementVNode("view", { class: "operate-li" }, " 胶水dassdd "),
-                  vue.createElementVNode("view", { class: "operate-li" }, " 胶水 "),
-                  vue.createElementVNode("view", { class: "operate-li" }, " 胶水 ")
-                ])
-              ]),
+              (vue.openBlock(true), vue.createElementBlock(
+                vue.Fragment,
+                null,
+                vue.renderList(actionData, (item, index2) => {
+                  return vue.openBlock(), vue.createElementBlock("view", {
+                    class: "operate",
+                    key: index2
+                  }, [
+                    vue.createElementVNode(
+                      "view",
+                      { class: "tit" },
+                      vue.toDisplayString(index2),
+                      1
+                      /* TEXT */
+                    ),
+                    vue.createElementVNode("view", { class: "card" }, [
+                      (vue.openBlock(true), vue.createElementBlock(
+                        vue.Fragment,
+                        null,
+                        vue.renderList(item.actions, (items, indexs) => {
+                          return vue.openBlock(), vue.createElementBlock("view", {
+                            class: "operate-li",
+                            style: { "margin": "20rpx 0", "margin-right": "20rpx" },
+                            onClick: ($event) => showPopFn(items.id),
+                            key: indexs
+                          }, vue.toDisplayString(items.name), 9, ["onClick"]);
+                        }),
+                        128
+                        /* KEYED_FRAGMENT */
+                      )),
+                      vue.createCommentVNode(` <view class="operate-li" @tap="navgo('')">\r
+						喂食\r
+					</view>\r
+					<view class="operate-li" @tap="navgo('/pages/feedIng/vaccineInfo')">\r
+						注射疫苗\r
+					</view>\r
+					<view class="operate-li">\r
+						胶水dassdd\r
+					</view>\r
+					<view class="operate-li">\r
+						胶水\r
+					</view>\r
+					<view class="operate-li">\r
+						胶水\r
+					</view> `)
+                    ]),
+                    vue.createElementVNode("view", { class: "" })
+                  ]);
+                }),
+                128
+                /* KEYED_FRAGMENT */
+              )),
               vue.createElementVNode("view", { class: "fertilize" }, [
                 vue.createElementVNode("view", { class: "card" }, [
                   vue.createElementVNode("view", { class: "fertilize-tit" }, [
@@ -10459,7 +11341,7 @@ This will fail in production.`);
                       vue.createElementVNode("view", {
                         class: "",
                         style: { "color": "red" },
-                        onClick: _cache[3] || (_cache[3] = ($event) => showModal.value = true)
+                        onClick: _cache[0] || (_cache[0] = ($event) => showModal.value = true)
                       }, " 删除 "),
                       vue.createElementVNode("view", { style: { "margin-left": "40rpx", "color": "#00A15E" } }, " 编辑 ")
                     ])
@@ -10486,28 +11368,166 @@ This will fail in production.`);
                 onOpen: _cache[7] || (_cache[7] = ($event) => showPop.value = true)
               }, {
                 default: vue.withCtx(() => [
-                  vue.createElementVNode("view", { class: "pop-content" }, [
-                    vue.createElementVNode("view", { class: "pop-tit" }, " 添加肥料相关信息 "),
-                    vue.createElementVNode("view", { class: "" }, " 肥料类型 "),
-                    vue.createElementVNode("view", { class: "pop-li" }, [
-                      vue.createVNode(_component_up_input, {
-                        placeholder: "请输入品种",
-                        border: "surround",
-                        modelValue: formData.value,
-                        "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => formData.value = $event),
-                        onChange: _ctx.change
-                      }, null, 8, ["modelValue", "onChange"])
-                    ]),
-                    vue.createElementVNode("view", { class: "" }, " 兑水浓度 "),
-                    vue.createElementVNode("view", { class: "pop-li" }, [
-                      vue.createVNode(_component_up_input, {
-                        placeholder: "请输入品种",
-                        border: "surround",
-                        modelValue: formData.value,
-                        "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => formData.value = $event),
-                        onChange: _ctx.change
-                      }, null, 8, ["modelValue", "onChange"])
-                    ]),
+                  vue.createElementVNode("scroll-view", {
+                    "scroll-y": "",
+                    style: { "max-height": "90vh" }
+                  }, [
+                    vue.createCommentVNode(" 滚动内容 "),
+                    (vue.openBlock(true), vue.createElementBlock(
+                      vue.Fragment,
+                      null,
+                      vue.renderList(popList, (item, index2) => {
+                        return vue.openBlock(), vue.createElementBlock("view", {
+                          class: "pop-content",
+                          key: index2
+                        }, [
+                          vue.createCommentVNode(" 文本框 "),
+                          item.type == 1 ? (vue.openBlock(), vue.createElementBlock("view", {
+                            key: 0,
+                            class: ""
+                          }, [
+                            vue.createElementVNode(
+                              "view",
+                              { class: "" },
+                              vue.toDisplayString(item.title),
+                              1
+                              /* TEXT */
+                            ),
+                            vue.createElementVNode("view", { class: "pop-li" }, [
+                              vue.createVNode(_component_up_input, {
+                                placeholder: "请输入",
+                                border: "surround",
+                                modelValue: formData.value,
+                                "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => formData.value = $event),
+                                onChange: _ctx.change
+                              }, null, 8, ["modelValue", "onChange"])
+                            ])
+                          ])) : vue.createCommentVNode("v-if", true),
+                          vue.createCommentVNode(" 下拉框 "),
+                          item.type == 4 ? (vue.openBlock(), vue.createElementBlock("view", {
+                            key: 1,
+                            class: ""
+                          }, [
+                            vue.createElementVNode(
+                              "view",
+                              { class: "" },
+                              vue.toDisplayString(item.title),
+                              1
+                              /* TEXT */
+                            ),
+                            vue.createElementVNode("view", { class: "pop-li" }, [
+                              vue.createVNode(_component_up_input, {
+                                readonly: "",
+                                placeholder: "点击选择",
+                                border: "surround",
+                                modelValue: formData.value,
+                                "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => formData.value = $event),
+                                onClick: _cache[3] || (_cache[3] = ($event) => showPicker.value = true)
+                              }, null, 8, ["modelValue"])
+                            ])
+                          ])) : vue.createCommentVNode("v-if", true),
+                          vue.createCommentVNode(" 上传图片 "),
+                          item.type == 2 ? (vue.openBlock(), vue.createElementBlock("view", {
+                            key: 2,
+                            class: ""
+                          }, [
+                            vue.createElementVNode(
+                              "view",
+                              { class: "" },
+                              vue.toDisplayString(item.title),
+                              1
+                              /* TEXT */
+                            ),
+                            vue.createElementVNode("view", { class: "pop-li" }, [
+                              vue.createElementVNode("view", { class: "code-img" }, [
+                                vue.createElementVNode("view", {
+                                  class: "carime-icon",
+                                  onClick: _cache[4] || (_cache[4] = (...args) => _ctx.updateImgFn && _ctx.updateImgFn(...args))
+                                }, [
+                                  vue.createVNode(_component_u__image, {
+                                    src: "/static/img/DJSC.png",
+                                    width: "91.12rpx",
+                                    height: "91.12rpx"
+                                  }),
+                                  vue.createElementVNode("view", { class: "" }, " 点击上传图片 ")
+                                ])
+                              ])
+                            ])
+                          ])) : vue.createCommentVNode("v-if", true),
+                          vue.createCommentVNode(" 搜索框 "),
+                          item.type == 3 ? (vue.openBlock(), vue.createElementBlock("view", {
+                            key: 3,
+                            class: ""
+                          }, [
+                            vue.createElementVNode(
+                              "view",
+                              { class: "" },
+                              vue.toDisplayString(item.title),
+                              1
+                              /* TEXT */
+                            ),
+                            vue.createElementVNode("view", { class: "pop-li" }, [
+                              vue.createVNode(_component_up_input, {
+                                placeholder: "请输入品种",
+                                border: "surround",
+                                modelValue: formData.value,
+                                "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => formData.value = $event)
+                              }, null, 8, ["modelValue"])
+                            ]),
+                            (vue.openBlock(), vue.createElementBlock(
+                              vue.Fragment,
+                              null,
+                              vue.renderList([1], (item2) => {
+                                return vue.createElementVNode("view", {
+                                  style: { "margin-bottom": "20rpx" },
+                                  key: item2
+                                }, [
+                                  vue.createVNode(_component_u_swipe_action, null, {
+                                    default: vue.withCtx(() => [
+                                      vue.createVNode(_component_u_swipe_action_item, {
+                                        options: options1,
+                                        style: { "border-radius": "20rpx", "border": "1px solid #C7C6CD" }
+                                      }, {
+                                        default: vue.withCtx(() => [
+                                          vue.createElementVNode("view", {
+                                            class: "",
+                                            style: { "padding": "20rpx 30rpx" }
+                                          }, [
+                                            vue.createElementVNode("view", { class: "swipe-action-tit" }, [
+                                              vue.createElementVNode("view", { class: "" }, " 编号: 123456 "),
+                                              (vue.openBlock(), vue.createElementBlock("view", {
+                                                key: 0,
+                                                class: "",
+                                                style: { "color": "#00A15E" }
+                                              }, " 健康 ")),
+                                              vue.createCommentVNode("v-if", true),
+                                              vue.createCommentVNode("v-if", true)
+                                            ]),
+                                            vue.createElementVNode("view", { class: "swipe-action-li" }, [
+                                              vue.createElementVNode("view", { class: "" }, " 养殖品种:黑山猪 "),
+                                              vue.createElementVNode("view", { class: "" }, " 年龄: 5年 "),
+                                              vue.createElementVNode("view", { class: "" }, " 体重: 150kg ")
+                                            ])
+                                          ])
+                                        ]),
+                                        _: 1
+                                        /* STABLE */
+                                      }, 8, ["options"])
+                                    ]),
+                                    _: 1
+                                    /* STABLE */
+                                  })
+                                ]);
+                              }),
+                              64
+                              /* STABLE_FRAGMENT */
+                            ))
+                          ])) : vue.createCommentVNode("v-if", true)
+                        ]);
+                      }),
+                      128
+                      /* KEYED_FRAGMENT */
+                    )),
                     vue.createElementVNode("view", {
                       class: "pop-confirm",
                       onClick: confirm
@@ -10519,6 +11539,11 @@ This will fail in production.`);
               }, 8, ["show"])
             ]),
             vue.createCommentVNode(" 组件 "),
+            vue.createVNode(_component_u_picker, {
+              show: showPicker.value,
+              columns,
+              onConfirm: confirmFn
+            }, null, 8, ["show", "columns"]),
             vue.createVNode(_component_u_modal, {
               show: showModal.value,
               showCancelButton: true,
@@ -10529,14 +11554,14 @@ This will fail in production.`);
               onCancel: _cache[9] || (_cache[9] = ($event) => showModal.value = false)
             }, null, 8, ["show"])
           ],
-          64
-          /* STABLE_FRAGMENT */
+          2
+          /* CLASS */
         );
       };
     }
   };
-  const PagesGrowRecordIndex = /* @__PURE__ */ _export_sfc(_sfc_main$L, [["__scopeId", "data-v-c4917c49"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/growRecord/index.vue"]]);
-  const _sfc_main$K = {
+  const PagesGrowRecordIndex = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["__scopeId", "data-v-c4917c49"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/growRecord/index.vue"]]);
+  const _sfc_main$M = {
     __name: "imgCard",
     props: {
       imgUrl: String,
@@ -10576,8 +11601,8 @@ This will fail in production.`);
       };
     }
   };
-  const imgCard = /* @__PURE__ */ _export_sfc(_sfc_main$K, [["__scopeId", "data-v-7e7d0af4"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/imgCard.vue"]]);
-  const _sfc_main$J = {
+  const imgCard = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__scopeId", "data-v-7e7d0af4"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/imgCard.vue"]]);
+  const _sfc_main$L = {
     __name: "plant",
     setup(__props) {
       const crop_yield = vue.ref("");
@@ -10642,7 +11667,7 @@ This will fail in production.`);
             crop_id: landDeatil.crop_id,
             pic: image2
           }).then((res2) => {
-            formatAppLog("log", "at pages/detail/plant.vue:232", res2);
+            formatAppLog("log", "at pages/detail/plant.vue:246", res2);
           });
         });
       };
@@ -10675,8 +11700,8 @@ This will fail in production.`);
       };
       return (_ctx, _cache) => {
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
-        const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_2$3);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
+        const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_1$4);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
           vue.createVNode(imgCard, {
             imgUrl: landDeatil.pic,
@@ -10726,15 +11751,26 @@ This will fail in production.`);
             vue.createElementVNode("view", { class: "" }, " 生长记录操作 "),
             vue.createElementVNode("view", {
               class: "updata-btn",
-              onClick: _cache[1] || (_cache[1] = ($event) => navgo(`/pages/growRecord/index?land_id=${landDeatil.land_id}`))
+              onClick: _cache[1] || (_cache[1] = ($event) => navgo(`/pages/growRecord/index?land_id=${landDeatil.land_id}&type=1`))
             }, " 更新生长记录 ")
           ]),
-          vue.createCommentVNode(` <myTable :dataList="dataList" tit='查看历史'></myTable> `),
           vue.createVNode(myTable, {
             tit: "查看历史记录",
             dataList: tableDate,
-            route: "/pages/records/index"
-          }, null, 8, ["dataList"]),
+            route: `/pages/records/index?land_id=${landDeatil.land_id}`
+          }, null, 8, ["dataList", "route"]),
+          vue.createCommentVNode(` <view class="circumstance" v-for="(item,index) in tableDate" :key="index">\r
+			<view class="card-tit">\r
+				<view class="">\r
+					{{index}}\r
+				</view>\r
+				<view class="updata-btn" @click="navgo('/pages/growRecord/index')">\r
+					更新{{index.slice(0,-2)}}\r
+				</view>\r
+			</view>\r
+			<myTable :tit='\`查看\${index.slice(0,-2)}\`' :dataList="item.action_record" route='/pages/feedIng/allRecording'>\r
+			</myTable>\r
+		</view> `),
           vue.createElementVNode("view", { class: "data" }, [
             vue.createElementVNode("view", { class: "tit" }, [
               vue.createElementVNode("view", {
@@ -10941,8 +11977,8 @@ This will fail in production.`);
       };
     }
   };
-  const PagesDetailPlant = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__scopeId", "data-v-3bac3d0d"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/detail/plant.vue"]]);
-  const _sfc_main$I = {
+  const PagesDetailPlant = /* @__PURE__ */ _export_sfc(_sfc_main$L, [["__scopeId", "data-v-3bac3d0d"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/detail/plant.vue"]]);
+  const _sfc_main$K = {
     __name: "index",
     setup(__props) {
       const imgList = vue.reactive([]);
@@ -11025,14 +12061,18 @@ This will fail in production.`);
       };
     }
   };
-  const PagesAllPlantIndex = /* @__PURE__ */ _export_sfc(_sfc_main$I, [["__scopeId", "data-v-8f7dbbd5"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/allPlant/index.vue"]]);
-  const _sfc_main$H = {
+  const PagesAllPlantIndex = /* @__PURE__ */ _export_sfc(_sfc_main$K, [["__scopeId", "data-v-8f7dbbd5"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/allPlant/index.vue"]]);
+  const _sfc_main$J = {
     __name: "index",
     setup(__props) {
+      const land_id = vue.ref(0);
+      onLoad((option) => {
+        land_id.value = option.land_id;
+      });
       actionsDetailAPI({
         action_id: 2
       }).then((res) => {
-        formatAppLog("log", "at pages/records/index.vue:73", res);
+        formatAppLog("log", "at pages/records/index.vue:84", res);
       });
       const navgo = (url2) => {
         uni.navigateTo({
@@ -11041,27 +12081,8 @@ This will fail in production.`);
       };
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
-          vue.createElementVNode("view", { class: "card" }, [
-            vue.createElementVNode("view", { class: "tit" }, [
-              vue.createElementVNode("view", { class: "" }, " 1号土地 "),
-              vue.createElementVNode("view", { class: "" }, " 溯源码: 12302 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 当前种植: 土豆 "),
-              vue.createElementVNode("view", { class: "" }, " 种植品牌: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 土地面积: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 种子品牌: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 预计产量: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 已出售: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 播种时间: 2020.12.01 ")
-            ])
-          ]),
+          vue.createCommentVNode(' <view class="card">\r\n			<view class="tit">\r\n				<view class="">\r\n					1号土地\r\n				</view>\r\n				<view class="">\r\n					溯源码: 12302\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					当前种植: 土豆\r\n				</view>\r\n				<view class="">\r\n					种植品牌: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					土地面积: 20亩\r\n				</view>\r\n				<view class="">\r\n					种子品牌: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					预计产量: 20亩\r\n				</view>\r\n				<view class="">\r\n					已出售: 的划分等级\r\n				</view>\r\n			</view>\r\n\r\n\r\n			<view class="card-li">\r\n				<view class="">\r\n					播种时间: 2020.12.01\r\n				</view>\r\n\r\n			</view>\r\n\r\n		</view> '),
+          vue.createVNode(landInfo, { land_id: land_id.value }, null, 8, ["land_id"]),
           vue.createElementVNode("view", { class: "histroy" }, [
             vue.createElementVNode("view", {
               class: "tit",
@@ -11071,297 +12092,13 @@ This will fail in production.`);
           ]),
           vue.createElementVNode("view", {
             class: "btn",
-            onClick: _cache[0] || (_cache[0] = ($event) => navgo("/pages/growRecord/index"))
+            onClick: _cache[0] || (_cache[0] = ($event) => navgo(`/pages/growRecord/index?land_id=${land_id.value}`))
           }, " 记录今日操作 ")
         ]);
       };
     }
   };
-  const PagesRecordsIndex = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["__scopeId", "data-v-f1512143"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/records/index.vue"]]);
-  const isObject$1 = (val) => val !== null && typeof val === "object";
-  const defaultDelimiters = ["{", "}"];
-  class BaseFormatter {
-    constructor() {
-      this._caches = /* @__PURE__ */ Object.create(null);
-    }
-    interpolate(message, values, delimiters = defaultDelimiters) {
-      if (!values) {
-        return [message];
-      }
-      let tokens = this._caches[message];
-      if (!tokens) {
-        tokens = parse(message, delimiters);
-        this._caches[message] = tokens;
-      }
-      return compile(tokens, values);
-    }
-  }
-  const RE_TOKEN_LIST_VALUE = /^(?:\d)+/;
-  const RE_TOKEN_NAMED_VALUE = /^(?:\w)+/;
-  function parse(format, [startDelimiter, endDelimiter]) {
-    const tokens = [];
-    let position = 0;
-    let text = "";
-    while (position < format.length) {
-      let char = format[position++];
-      if (char === startDelimiter) {
-        if (text) {
-          tokens.push({ type: "text", value: text });
-        }
-        text = "";
-        let sub = "";
-        char = format[position++];
-        while (char !== void 0 && char !== endDelimiter) {
-          sub += char;
-          char = format[position++];
-        }
-        const isClosed = char === endDelimiter;
-        const type = RE_TOKEN_LIST_VALUE.test(sub) ? "list" : isClosed && RE_TOKEN_NAMED_VALUE.test(sub) ? "named" : "unknown";
-        tokens.push({ value: sub, type });
-      } else {
-        text += char;
-      }
-    }
-    text && tokens.push({ type: "text", value: text });
-    return tokens;
-  }
-  function compile(tokens, values) {
-    const compiled = [];
-    let index2 = 0;
-    const mode = Array.isArray(values) ? "list" : isObject$1(values) ? "named" : "unknown";
-    if (mode === "unknown") {
-      return compiled;
-    }
-    while (index2 < tokens.length) {
-      const token = tokens[index2];
-      switch (token.type) {
-        case "text":
-          compiled.push(token.value);
-          break;
-        case "list":
-          compiled.push(values[parseInt(token.value, 10)]);
-          break;
-        case "named":
-          if (mode === "named") {
-            compiled.push(values[token.value]);
-          } else {
-            {
-              console.warn(`Type of token '${token.type}' and format of value '${mode}' don't match!`);
-            }
-          }
-          break;
-        case "unknown":
-          {
-            console.warn(`Detect 'unknown' type of token!`);
-          }
-          break;
-      }
-      index2++;
-    }
-    return compiled;
-  }
-  const LOCALE_ZH_HANS = "zh-Hans";
-  const LOCALE_ZH_HANT = "zh-Hant";
-  const LOCALE_EN = "en";
-  const LOCALE_FR = "fr";
-  const LOCALE_ES = "es";
-  const hasOwnProperty = Object.prototype.hasOwnProperty;
-  const hasOwn = (val, key) => hasOwnProperty.call(val, key);
-  const defaultFormatter = new BaseFormatter();
-  function include(str, parts) {
-    return !!parts.find((part) => str.indexOf(part) !== -1);
-  }
-  function startsWith(str, parts) {
-    return parts.find((part) => str.indexOf(part) === 0);
-  }
-  function normalizeLocale(locale, messages) {
-    if (!locale) {
-      return;
-    }
-    locale = locale.trim().replace(/_/g, "-");
-    if (messages && messages[locale]) {
-      return locale;
-    }
-    locale = locale.toLowerCase();
-    if (locale === "chinese") {
-      return LOCALE_ZH_HANS;
-    }
-    if (locale.indexOf("zh") === 0) {
-      if (locale.indexOf("-hans") > -1) {
-        return LOCALE_ZH_HANS;
-      }
-      if (locale.indexOf("-hant") > -1) {
-        return LOCALE_ZH_HANT;
-      }
-      if (include(locale, ["-tw", "-hk", "-mo", "-cht"])) {
-        return LOCALE_ZH_HANT;
-      }
-      return LOCALE_ZH_HANS;
-    }
-    let locales = [LOCALE_EN, LOCALE_FR, LOCALE_ES];
-    if (messages && Object.keys(messages).length > 0) {
-      locales = Object.keys(messages);
-    }
-    const lang = startsWith(locale, locales);
-    if (lang) {
-      return lang;
-    }
-  }
-  class I18n {
-    constructor({ locale, fallbackLocale, messages, watcher, formater }) {
-      this.locale = LOCALE_EN;
-      this.fallbackLocale = LOCALE_EN;
-      this.message = {};
-      this.messages = {};
-      this.watchers = [];
-      if (fallbackLocale) {
-        this.fallbackLocale = fallbackLocale;
-      }
-      this.formater = formater || defaultFormatter;
-      this.messages = messages || {};
-      this.setLocale(locale || LOCALE_EN);
-      if (watcher) {
-        this.watchLocale(watcher);
-      }
-    }
-    setLocale(locale) {
-      const oldLocale = this.locale;
-      this.locale = normalizeLocale(locale, this.messages) || this.fallbackLocale;
-      if (!this.messages[this.locale]) {
-        this.messages[this.locale] = {};
-      }
-      this.message = this.messages[this.locale];
-      if (oldLocale !== this.locale) {
-        this.watchers.forEach((watcher) => {
-          watcher(this.locale, oldLocale);
-        });
-      }
-    }
-    getLocale() {
-      return this.locale;
-    }
-    watchLocale(fn) {
-      const index2 = this.watchers.push(fn) - 1;
-      return () => {
-        this.watchers.splice(index2, 1);
-      };
-    }
-    add(locale, message, override = true) {
-      const curMessages = this.messages[locale];
-      if (curMessages) {
-        if (override) {
-          Object.assign(curMessages, message);
-        } else {
-          Object.keys(message).forEach((key) => {
-            if (!hasOwn(curMessages, key)) {
-              curMessages[key] = message[key];
-            }
-          });
-        }
-      } else {
-        this.messages[locale] = message;
-      }
-    }
-    f(message, values, delimiters) {
-      return this.formater.interpolate(message, values, delimiters).join("");
-    }
-    t(key, locale, values) {
-      let message = this.message;
-      if (typeof locale === "string") {
-        locale = normalizeLocale(locale, this.messages);
-        locale && (message = this.messages[locale]);
-      } else {
-        values = locale;
-      }
-      if (!hasOwn(message, key)) {
-        console.warn(`Cannot translate the value of keypath ${key}. Use the value of keypath as default.`);
-        return key;
-      }
-      return this.formater.interpolate(message[key], values).join("");
-    }
-  }
-  function watchAppLocale(appVm, i18n) {
-    if (appVm.$watchLocale) {
-      appVm.$watchLocale((newLocale) => {
-        i18n.setLocale(newLocale);
-      });
-    } else {
-      appVm.$watch(() => appVm.$locale, (newLocale) => {
-        i18n.setLocale(newLocale);
-      });
-    }
-  }
-  function getDefaultLocale() {
-    if (typeof uni !== "undefined" && uni.getLocale) {
-      return uni.getLocale();
-    }
-    if (typeof global !== "undefined" && global.getLocale) {
-      return global.getLocale();
-    }
-    return LOCALE_EN;
-  }
-  function initVueI18n(locale, messages = {}, fallbackLocale, watcher) {
-    if (typeof locale !== "string") {
-      [locale, messages] = [
-        messages,
-        locale
-      ];
-    }
-    if (typeof locale !== "string") {
-      locale = getDefaultLocale();
-    }
-    if (typeof fallbackLocale !== "string") {
-      fallbackLocale = typeof __uniConfig !== "undefined" && __uniConfig.fallbackLocale || LOCALE_EN;
-    }
-    const i18n = new I18n({
-      locale,
-      fallbackLocale,
-      messages,
-      watcher
-    });
-    let t2 = (key, values) => {
-      if (typeof getApp !== "function") {
-        t2 = function(key2, values2) {
-          return i18n.t(key2, values2);
-        };
-      } else {
-        let isWatchedAppLocale = false;
-        t2 = function(key2, values2) {
-          const appVm = getApp().$vm;
-          if (appVm) {
-            appVm.$locale;
-            if (!isWatchedAppLocale) {
-              isWatchedAppLocale = true;
-              watchAppLocale(appVm, i18n);
-            }
-          }
-          return i18n.t(key2, values2);
-        };
-      }
-      return t2(key, values);
-    };
-    return {
-      i18n,
-      f(message, values, delimiters) {
-        return i18n.f(message, values, delimiters);
-      },
-      t(key, values) {
-        return t2(key, values);
-      },
-      add(locale2, message, override = true) {
-        return i18n.add(locale2, message, override);
-      },
-      watch(fn) {
-        return i18n.watchLocale(fn);
-      },
-      getLocale() {
-        return i18n.getLocale();
-      },
-      setLocale(newLocale) {
-        return i18n.setLocale(newLocale);
-      }
-    };
-  }
+  const PagesRecordsIndex = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__scopeId", "data-v-f1512143"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/records/index.vue"]]);
   const easycom = {
     custom: {
       "^u--(.*)": "uview-plus/components/u-$1/u-$1.vue",
@@ -11484,6 +12221,15 @@ This will fail in production.`);
         navigationBarTextStyle: "black"
       }
     },
+    {
+      path: "pages/feedIng/allRecordTable",
+      style: {
+        navigationBarTitleText: "记录列表",
+        enablePullDownRefresh: false,
+        navigationBarBackgroundColor: "#F4F4F4",
+        navigationBarTextStyle: "black"
+      }
+    },
     {
       path: "pages/feedIng/allFeed",
       style: {
@@ -11574,6 +12320,15 @@ This will fail in production.`);
         navigationBarTextStyle: "black"
       }
     },
+    {
+      path: "pages/poultry/SingleDetail",
+      style: {
+        navigationBarTitleText: "单个详情",
+        enablePullDownRefresh: false,
+        navigationBarBackgroundColor: "#F4F4F4",
+        navigationBarTextStyle: "black"
+      }
+    },
     {
       path: "pages/poultry/allRecording",
       style: {
@@ -11610,6 +12365,15 @@ This will fail in production.`);
         navigationBarTextStyle: "black"
       }
     },
+    {
+      path: "pages/aquatic/imgList",
+      style: {
+        navigationBarTitleText: "生长记录",
+        enablePullDownRefresh: false,
+        navigationBarBackgroundColor: "#F4F4F4",
+        navigationBarTextStyle: "black"
+      }
+    },
     {
       path: "pages/aquatic/detail",
       style: {
@@ -11677,53 +12441,53 @@ This will fail in production.`);
     backgroundColor: "#F8F8F8"
   };
   const uniIdRouter = {};
-  const t = {
+  const e = {
     easycom,
     pages: pages$1,
     globalStyle,
     uniIdRouter
   };
-  function n(e) {
-    return e && e.__esModule && Object.prototype.hasOwnProperty.call(e, "default") ? e.default : e;
+  function t(e2) {
+    return e2 && e2.__esModule && Object.prototype.hasOwnProperty.call(e2, "default") ? e2.default : e2;
   }
-  function s(e, t2, n2) {
-    return e(n2 = { path: t2, exports: {}, require: function(e2, t3) {
+  function n(e2, t2, n2) {
+    return e2(n2 = { path: t2, exports: {}, require: function(e3, t3) {
       return function() {
         throw new Error("Dynamic requires are not currently supported by @rollup/plugin-commonjs");
       }(null == t3 && n2.path);
     } }, n2.exports), n2.exports;
   }
-  var r = s(function(e, t2) {
+  var s = n(function(e2, t2) {
     var n2;
-    e.exports = (n2 = n2 || function(e2, t3) {
+    e2.exports = (n2 = n2 || function(e3, t3) {
       var n3 = Object.create || function() {
-        function e3() {
+        function e4() {
         }
         return function(t4) {
           var n4;
-          return e3.prototype = t4, n4 = new e3(), e3.prototype = null, n4;
+          return e4.prototype = t4, n4 = new e4(), e4.prototype = null, n4;
         };
-      }(), s2 = {}, r2 = s2.lib = {}, i2 = r2.Base = { extend: function(e3) {
+      }(), s2 = {}, r2 = s2.lib = {}, i2 = r2.Base = { extend: function(e4) {
         var t4 = n3(this);
-        return e3 && t4.mixIn(e3), t4.hasOwnProperty("init") && this.init !== t4.init || (t4.init = function() {
+        return e4 && t4.mixIn(e4), t4.hasOwnProperty("init") && this.init !== t4.init || (t4.init = function() {
           t4.$super.init.apply(this, arguments);
         }), t4.init.prototype = t4, t4.$super = this, t4;
       }, create: function() {
-        var e3 = this.extend();
-        return e3.init.apply(e3, arguments), e3;
+        var e4 = this.extend();
+        return e4.init.apply(e4, arguments), e4;
       }, init: function() {
-      }, mixIn: function(e3) {
-        for (var t4 in e3)
-          e3.hasOwnProperty(t4) && (this[t4] = e3[t4]);
-        e3.hasOwnProperty("toString") && (this.toString = e3.toString);
+      }, mixIn: function(e4) {
+        for (var t4 in e4)
+          e4.hasOwnProperty(t4) && (this[t4] = e4[t4]);
+        e4.hasOwnProperty("toString") && (this.toString = e4.toString);
       }, clone: function() {
         return this.init.prototype.extend(this);
-      } }, o2 = r2.WordArray = i2.extend({ init: function(e3, n4) {
-        e3 = this.words = e3 || [], this.sigBytes = n4 != t3 ? n4 : 4 * e3.length;
-      }, toString: function(e3) {
-        return (e3 || c2).stringify(this);
-      }, concat: function(e3) {
-        var t4 = this.words, n4 = e3.words, s3 = this.sigBytes, r3 = e3.sigBytes;
+      } }, o2 = r2.WordArray = i2.extend({ init: function(e4, n4) {
+        e4 = this.words = e4 || [], this.sigBytes = n4 != t3 ? n4 : 4 * e4.length;
+      }, toString: function(e4) {
+        return (e4 || c2).stringify(this);
+      }, concat: function(e4) {
+        var t4 = this.words, n4 = e4.words, s3 = this.sigBytes, r3 = e4.sigBytes;
         if (this.clamp(), s3 % 4)
           for (var i3 = 0; i3 < r3; i3++) {
             var o3 = n4[i3 >>> 2] >>> 24 - i3 % 4 * 8 & 255;
@@ -11735,177 +12499,177 @@ This will fail in production.`);
         return this.sigBytes += r3, this;
       }, clamp: function() {
         var t4 = this.words, n4 = this.sigBytes;
-        t4[n4 >>> 2] &= 4294967295 << 32 - n4 % 4 * 8, t4.length = e2.ceil(n4 / 4);
+        t4[n4 >>> 2] &= 4294967295 << 32 - n4 % 4 * 8, t4.length = e3.ceil(n4 / 4);
       }, clone: function() {
-        var e3 = i2.clone.call(this);
-        return e3.words = this.words.slice(0), e3;
+        var e4 = i2.clone.call(this);
+        return e4.words = this.words.slice(0), e4;
       }, random: function(t4) {
         for (var n4, s3 = [], r3 = function(t5) {
           t5 = t5;
           var n5 = 987654321, s4 = 4294967295;
           return function() {
             var r4 = ((n5 = 36969 * (65535 & n5) + (n5 >> 16) & s4) << 16) + (t5 = 18e3 * (65535 & t5) + (t5 >> 16) & s4) & s4;
-            return r4 /= 4294967296, (r4 += 0.5) * (e2.random() > 0.5 ? 1 : -1);
+            return r4 /= 4294967296, (r4 += 0.5) * (e3.random() > 0.5 ? 1 : -1);
           };
         }, i3 = 0; i3 < t4; i3 += 4) {
-          var a3 = r3(4294967296 * (n4 || e2.random()));
+          var a3 = r3(4294967296 * (n4 || e3.random()));
           n4 = 987654071 * a3(), s3.push(4294967296 * a3() | 0);
         }
         return new o2.init(s3, t4);
-      } }), a2 = s2.enc = {}, c2 = a2.Hex = { stringify: function(e3) {
-        for (var t4 = e3.words, n4 = e3.sigBytes, s3 = [], r3 = 0; r3 < n4; r3++) {
+      } }), a2 = s2.enc = {}, c2 = a2.Hex = { stringify: function(e4) {
+        for (var t4 = e4.words, n4 = e4.sigBytes, s3 = [], r3 = 0; r3 < n4; r3++) {
           var i3 = t4[r3 >>> 2] >>> 24 - r3 % 4 * 8 & 255;
           s3.push((i3 >>> 4).toString(16)), s3.push((15 & i3).toString(16));
         }
         return s3.join("");
-      }, parse: function(e3) {
-        for (var t4 = e3.length, n4 = [], s3 = 0; s3 < t4; s3 += 2)
-          n4[s3 >>> 3] |= parseInt(e3.substr(s3, 2), 16) << 24 - s3 % 8 * 4;
+      }, parse: function(e4) {
+        for (var t4 = e4.length, n4 = [], s3 = 0; s3 < t4; s3 += 2)
+          n4[s3 >>> 3] |= parseInt(e4.substr(s3, 2), 16) << 24 - s3 % 8 * 4;
         return new o2.init(n4, t4 / 2);
-      } }, u2 = a2.Latin1 = { stringify: function(e3) {
-        for (var t4 = e3.words, n4 = e3.sigBytes, s3 = [], r3 = 0; r3 < n4; r3++) {
+      } }, u2 = a2.Latin1 = { stringify: function(e4) {
+        for (var t4 = e4.words, n4 = e4.sigBytes, s3 = [], r3 = 0; r3 < n4; r3++) {
           var i3 = t4[r3 >>> 2] >>> 24 - r3 % 4 * 8 & 255;
           s3.push(String.fromCharCode(i3));
         }
         return s3.join("");
-      }, parse: function(e3) {
-        for (var t4 = e3.length, n4 = [], s3 = 0; s3 < t4; s3++)
-          n4[s3 >>> 2] |= (255 & e3.charCodeAt(s3)) << 24 - s3 % 4 * 8;
+      }, parse: function(e4) {
+        for (var t4 = e4.length, n4 = [], s3 = 0; s3 < t4; s3++)
+          n4[s3 >>> 2] |= (255 & e4.charCodeAt(s3)) << 24 - s3 % 4 * 8;
         return new o2.init(n4, t4);
-      } }, h2 = a2.Utf8 = { stringify: function(e3) {
+      } }, l2 = a2.Utf8 = { stringify: function(e4) {
         try {
-          return decodeURIComponent(escape(u2.stringify(e3)));
-        } catch (e4) {
+          return decodeURIComponent(escape(u2.stringify(e4)));
+        } catch (e5) {
           throw new Error("Malformed UTF-8 data");
         }
-      }, parse: function(e3) {
-        return u2.parse(unescape(encodeURIComponent(e3)));
-      } }, l2 = r2.BufferedBlockAlgorithm = i2.extend({ reset: function() {
+      }, parse: function(e4) {
+        return u2.parse(unescape(encodeURIComponent(e4)));
+      } }, h2 = r2.BufferedBlockAlgorithm = i2.extend({ reset: function() {
         this._data = new o2.init(), this._nDataBytes = 0;
-      }, _append: function(e3) {
-        "string" == typeof e3 && (e3 = h2.parse(e3)), this._data.concat(e3), this._nDataBytes += e3.sigBytes;
+      }, _append: function(e4) {
+        "string" == typeof e4 && (e4 = l2.parse(e4)), this._data.concat(e4), this._nDataBytes += e4.sigBytes;
       }, _process: function(t4) {
-        var n4 = this._data, s3 = n4.words, r3 = n4.sigBytes, i3 = this.blockSize, a3 = r3 / (4 * i3), c3 = (a3 = t4 ? e2.ceil(a3) : e2.max((0 | a3) - this._minBufferSize, 0)) * i3, u3 = e2.min(4 * c3, r3);
+        var n4 = this._data, s3 = n4.words, r3 = n4.sigBytes, i3 = this.blockSize, a3 = r3 / (4 * i3), c3 = (a3 = t4 ? e3.ceil(a3) : e3.max((0 | a3) - this._minBufferSize, 0)) * i3, u3 = e3.min(4 * c3, r3);
         if (c3) {
-          for (var h3 = 0; h3 < c3; h3 += i3)
-            this._doProcessBlock(s3, h3);
-          var l3 = s3.splice(0, c3);
+          for (var l3 = 0; l3 < c3; l3 += i3)
+            this._doProcessBlock(s3, l3);
+          var h3 = s3.splice(0, c3);
           n4.sigBytes -= u3;
         }
-        return new o2.init(l3, u3);
+        return new o2.init(h3, u3);
       }, clone: function() {
-        var e3 = i2.clone.call(this);
-        return e3._data = this._data.clone(), e3;
+        var e4 = i2.clone.call(this);
+        return e4._data = this._data.clone(), e4;
       }, _minBufferSize: 0 });
-      r2.Hasher = l2.extend({ cfg: i2.extend(), init: function(e3) {
-        this.cfg = this.cfg.extend(e3), this.reset();
+      r2.Hasher = h2.extend({ cfg: i2.extend(), init: function(e4) {
+        this.cfg = this.cfg.extend(e4), this.reset();
       }, reset: function() {
-        l2.reset.call(this), this._doReset();
-      }, update: function(e3) {
-        return this._append(e3), this._process(), this;
-      }, finalize: function(e3) {
-        return e3 && this._append(e3), this._doFinalize();
-      }, blockSize: 16, _createHelper: function(e3) {
+        h2.reset.call(this), this._doReset();
+      }, update: function(e4) {
+        return this._append(e4), this._process(), this;
+      }, finalize: function(e4) {
+        return e4 && this._append(e4), this._doFinalize();
+      }, blockSize: 16, _createHelper: function(e4) {
         return function(t4, n4) {
-          return new e3.init(n4).finalize(t4);
+          return new e4.init(n4).finalize(t4);
         };
-      }, _createHmacHelper: function(e3) {
+      }, _createHmacHelper: function(e4) {
         return function(t4, n4) {
-          return new d2.HMAC.init(e3, n4).finalize(t4);
+          return new d2.HMAC.init(e4, n4).finalize(t4);
         };
       } });
       var d2 = s2.algo = {};
       return s2;
     }(Math), n2);
-  }), i = r, o = (s(function(e, t2) {
+  }), r = s, i = (n(function(e2, t2) {
     var n2;
-    e.exports = (n2 = i, function(e2) {
+    e2.exports = (n2 = r, function(e3) {
       var t3 = n2, s2 = t3.lib, r2 = s2.WordArray, i2 = s2.Hasher, o2 = t3.algo, a2 = [];
       !function() {
         for (var t4 = 0; t4 < 64; t4++)
-          a2[t4] = 4294967296 * e2.abs(e2.sin(t4 + 1)) | 0;
+          a2[t4] = 4294967296 * e3.abs(e3.sin(t4 + 1)) | 0;
       }();
       var c2 = o2.MD5 = i2.extend({ _doReset: function() {
         this._hash = new r2.init([1732584193, 4023233417, 2562383102, 271733878]);
-      }, _doProcessBlock: function(e3, t4) {
+      }, _doProcessBlock: function(e4, t4) {
         for (var n3 = 0; n3 < 16; n3++) {
-          var s3 = t4 + n3, r3 = e3[s3];
-          e3[s3] = 16711935 & (r3 << 8 | r3 >>> 24) | 4278255360 & (r3 << 24 | r3 >>> 8);
+          var s3 = t4 + n3, r3 = e4[s3];
+          e4[s3] = 16711935 & (r3 << 8 | r3 >>> 24) | 4278255360 & (r3 << 24 | r3 >>> 8);
         }
-        var i3 = this._hash.words, o3 = e3[t4 + 0], c3 = e3[t4 + 1], p2 = e3[t4 + 2], f2 = e3[t4 + 3], g2 = e3[t4 + 4], m2 = e3[t4 + 5], y2 = e3[t4 + 6], _2 = e3[t4 + 7], w2 = e3[t4 + 8], v2 = e3[t4 + 9], I2 = e3[t4 + 10], S2 = e3[t4 + 11], b2 = e3[t4 + 12], k2 = e3[t4 + 13], C = e3[t4 + 14], T2 = e3[t4 + 15], P2 = i3[0], A2 = i3[1], E2 = i3[2], O = i3[3];
-        P2 = u2(P2, A2, E2, O, o3, 7, a2[0]), O = u2(O, P2, A2, E2, c3, 12, a2[1]), E2 = u2(E2, O, P2, A2, p2, 17, a2[2]), A2 = u2(A2, E2, O, P2, f2, 22, a2[3]), P2 = u2(P2, A2, E2, O, g2, 7, a2[4]), O = u2(O, P2, A2, E2, m2, 12, a2[5]), E2 = u2(E2, O, P2, A2, y2, 17, a2[6]), A2 = u2(A2, E2, O, P2, _2, 22, a2[7]), P2 = u2(P2, A2, E2, O, w2, 7, a2[8]), O = u2(O, P2, A2, E2, v2, 12, a2[9]), E2 = u2(E2, O, P2, A2, I2, 17, a2[10]), A2 = u2(A2, E2, O, P2, S2, 22, a2[11]), P2 = u2(P2, A2, E2, O, b2, 7, a2[12]), O = u2(O, P2, A2, E2, k2, 12, a2[13]), E2 = u2(E2, O, P2, A2, C, 17, a2[14]), P2 = h2(P2, A2 = u2(A2, E2, O, P2, T2, 22, a2[15]), E2, O, c3, 5, a2[16]), O = h2(O, P2, A2, E2, y2, 9, a2[17]), E2 = h2(E2, O, P2, A2, S2, 14, a2[18]), A2 = h2(A2, E2, O, P2, o3, 20, a2[19]), P2 = h2(P2, A2, E2, O, m2, 5, a2[20]), O = h2(O, P2, A2, E2, I2, 9, a2[21]), E2 = h2(E2, O, P2, A2, T2, 14, a2[22]), A2 = h2(A2, E2, O, P2, g2, 20, a2[23]), P2 = h2(P2, A2, E2, O, v2, 5, a2[24]), O = h2(O, P2, A2, E2, C, 9, a2[25]), E2 = h2(E2, O, P2, A2, f2, 14, a2[26]), A2 = h2(A2, E2, O, P2, w2, 20, a2[27]), P2 = h2(P2, A2, E2, O, k2, 5, a2[28]), O = h2(O, P2, A2, E2, p2, 9, a2[29]), E2 = h2(E2, O, P2, A2, _2, 14, a2[30]), P2 = l2(P2, A2 = h2(A2, E2, O, P2, b2, 20, a2[31]), E2, O, m2, 4, a2[32]), O = l2(O, P2, A2, E2, w2, 11, a2[33]), E2 = l2(E2, O, P2, A2, S2, 16, a2[34]), A2 = l2(A2, E2, O, P2, C, 23, a2[35]), P2 = l2(P2, A2, E2, O, c3, 4, a2[36]), O = l2(O, P2, A2, E2, g2, 11, a2[37]), E2 = l2(E2, O, P2, A2, _2, 16, a2[38]), A2 = l2(A2, E2, O, P2, I2, 23, a2[39]), P2 = l2(P2, A2, E2, O, k2, 4, a2[40]), O = l2(O, P2, A2, E2, o3, 11, a2[41]), E2 = l2(E2, O, P2, A2, f2, 16, a2[42]), A2 = l2(A2, E2, O, P2, y2, 23, a2[43]), P2 = l2(P2, A2, E2, O, v2, 4, a2[44]), O = l2(O, P2, A2, E2, b2, 11, a2[45]), E2 = l2(E2, O, P2, A2, T2, 16, a2[46]), P2 = d2(P2, A2 = l2(A2, E2, O, P2, p2, 23, a2[47]), E2, O, o3, 6, a2[48]), O = d2(O, P2, A2, E2, _2, 10, a2[49]), E2 = d2(E2, O, P2, A2, C, 15, a2[50]), A2 = d2(A2, E2, O, P2, m2, 21, a2[51]), P2 = d2(P2, A2, E2, O, b2, 6, a2[52]), O = d2(O, P2, A2, E2, f2, 10, a2[53]), E2 = d2(E2, O, P2, A2, I2, 15, a2[54]), A2 = d2(A2, E2, O, P2, c3, 21, a2[55]), P2 = d2(P2, A2, E2, O, w2, 6, a2[56]), O = d2(O, P2, A2, E2, T2, 10, a2[57]), E2 = d2(E2, O, P2, A2, y2, 15, a2[58]), A2 = d2(A2, E2, O, P2, k2, 21, a2[59]), P2 = d2(P2, A2, E2, O, g2, 6, a2[60]), O = d2(O, P2, A2, E2, S2, 10, a2[61]), E2 = d2(E2, O, P2, A2, p2, 15, a2[62]), A2 = d2(A2, E2, O, P2, v2, 21, a2[63]), i3[0] = i3[0] + P2 | 0, i3[1] = i3[1] + A2 | 0, i3[2] = i3[2] + E2 | 0, i3[3] = i3[3] + O | 0;
+        var i3 = this._hash.words, o3 = e4[t4 + 0], c3 = e4[t4 + 1], p2 = e4[t4 + 2], f2 = e4[t4 + 3], g2 = e4[t4 + 4], m2 = e4[t4 + 5], y2 = e4[t4 + 6], _2 = e4[t4 + 7], w2 = e4[t4 + 8], v2 = e4[t4 + 9], I2 = e4[t4 + 10], S2 = e4[t4 + 11], b2 = e4[t4 + 12], k = e4[t4 + 13], A2 = e4[t4 + 14], P2 = e4[t4 + 15], T2 = i3[0], C2 = i3[1], x = i3[2], O2 = i3[3];
+        T2 = u2(T2, C2, x, O2, o3, 7, a2[0]), O2 = u2(O2, T2, C2, x, c3, 12, a2[1]), x = u2(x, O2, T2, C2, p2, 17, a2[2]), C2 = u2(C2, x, O2, T2, f2, 22, a2[3]), T2 = u2(T2, C2, x, O2, g2, 7, a2[4]), O2 = u2(O2, T2, C2, x, m2, 12, a2[5]), x = u2(x, O2, T2, C2, y2, 17, a2[6]), C2 = u2(C2, x, O2, T2, _2, 22, a2[7]), T2 = u2(T2, C2, x, O2, w2, 7, a2[8]), O2 = u2(O2, T2, C2, x, v2, 12, a2[9]), x = u2(x, O2, T2, C2, I2, 17, a2[10]), C2 = u2(C2, x, O2, T2, S2, 22, a2[11]), T2 = u2(T2, C2, x, O2, b2, 7, a2[12]), O2 = u2(O2, T2, C2, x, k, 12, a2[13]), x = u2(x, O2, T2, C2, A2, 17, a2[14]), T2 = l2(T2, C2 = u2(C2, x, O2, T2, P2, 22, a2[15]), x, O2, c3, 5, a2[16]), O2 = l2(O2, T2, C2, x, y2, 9, a2[17]), x = l2(x, O2, T2, C2, S2, 14, a2[18]), C2 = l2(C2, x, O2, T2, o3, 20, a2[19]), T2 = l2(T2, C2, x, O2, m2, 5, a2[20]), O2 = l2(O2, T2, C2, x, I2, 9, a2[21]), x = l2(x, O2, T2, C2, P2, 14, a2[22]), C2 = l2(C2, x, O2, T2, g2, 20, a2[23]), T2 = l2(T2, C2, x, O2, v2, 5, a2[24]), O2 = l2(O2, T2, C2, x, A2, 9, a2[25]), x = l2(x, O2, T2, C2, f2, 14, a2[26]), C2 = l2(C2, x, O2, T2, w2, 20, a2[27]), T2 = l2(T2, C2, x, O2, k, 5, a2[28]), O2 = l2(O2, T2, C2, x, p2, 9, a2[29]), x = l2(x, O2, T2, C2, _2, 14, a2[30]), T2 = h2(T2, C2 = l2(C2, x, O2, T2, b2, 20, a2[31]), x, O2, m2, 4, a2[32]), O2 = h2(O2, T2, C2, x, w2, 11, a2[33]), x = h2(x, O2, T2, C2, S2, 16, a2[34]), C2 = h2(C2, x, O2, T2, A2, 23, a2[35]), T2 = h2(T2, C2, x, O2, c3, 4, a2[36]), O2 = h2(O2, T2, C2, x, g2, 11, a2[37]), x = h2(x, O2, T2, C2, _2, 16, a2[38]), C2 = h2(C2, x, O2, T2, I2, 23, a2[39]), T2 = h2(T2, C2, x, O2, k, 4, a2[40]), O2 = h2(O2, T2, C2, x, o3, 11, a2[41]), x = h2(x, O2, T2, C2, f2, 16, a2[42]), C2 = h2(C2, x, O2, T2, y2, 23, a2[43]), T2 = h2(T2, C2, x, O2, v2, 4, a2[44]), O2 = h2(O2, T2, C2, x, b2, 11, a2[45]), x = h2(x, O2, T2, C2, P2, 16, a2[46]), T2 = d2(T2, C2 = h2(C2, x, O2, T2, p2, 23, a2[47]), x, O2, o3, 6, a2[48]), O2 = d2(O2, T2, C2, x, _2, 10, a2[49]), x = d2(x, O2, T2, C2, A2, 15, a2[50]), C2 = d2(C2, x, O2, T2, m2, 21, a2[51]), T2 = d2(T2, C2, x, O2, b2, 6, a2[52]), O2 = d2(O2, T2, C2, x, f2, 10, a2[53]), x = d2(x, O2, T2, C2, I2, 15, a2[54]), C2 = d2(C2, x, O2, T2, c3, 21, a2[55]), T2 = d2(T2, C2, x, O2, w2, 6, a2[56]), O2 = d2(O2, T2, C2, x, P2, 10, a2[57]), x = d2(x, O2, T2, C2, y2, 15, a2[58]), C2 = d2(C2, x, O2, T2, k, 21, a2[59]), T2 = d2(T2, C2, x, O2, g2, 6, a2[60]), O2 = d2(O2, T2, C2, x, S2, 10, a2[61]), x = d2(x, O2, T2, C2, p2, 15, a2[62]), C2 = d2(C2, x, O2, T2, v2, 21, a2[63]), i3[0] = i3[0] + T2 | 0, i3[1] = i3[1] + C2 | 0, i3[2] = i3[2] + x | 0, i3[3] = i3[3] + O2 | 0;
       }, _doFinalize: function() {
         var t4 = this._data, n3 = t4.words, s3 = 8 * this._nDataBytes, r3 = 8 * t4.sigBytes;
         n3[r3 >>> 5] |= 128 << 24 - r3 % 32;
-        var i3 = e2.floor(s3 / 4294967296), o3 = s3;
+        var i3 = e3.floor(s3 / 4294967296), o3 = s3;
         n3[15 + (r3 + 64 >>> 9 << 4)] = 16711935 & (i3 << 8 | i3 >>> 24) | 4278255360 & (i3 << 24 | i3 >>> 8), n3[14 + (r3 + 64 >>> 9 << 4)] = 16711935 & (o3 << 8 | o3 >>> 24) | 4278255360 & (o3 << 24 | o3 >>> 8), t4.sigBytes = 4 * (n3.length + 1), this._process();
         for (var a3 = this._hash, c3 = a3.words, u3 = 0; u3 < 4; u3++) {
-          var h3 = c3[u3];
-          c3[u3] = 16711935 & (h3 << 8 | h3 >>> 24) | 4278255360 & (h3 << 24 | h3 >>> 8);
+          var l3 = c3[u3];
+          c3[u3] = 16711935 & (l3 << 8 | l3 >>> 24) | 4278255360 & (l3 << 24 | l3 >>> 8);
         }
         return a3;
       }, clone: function() {
-        var e3 = i2.clone.call(this);
-        return e3._hash = this._hash.clone(), e3;
+        var e4 = i2.clone.call(this);
+        return e4._hash = this._hash.clone(), e4;
       } });
-      function u2(e3, t4, n3, s3, r3, i3, o3) {
-        var a3 = e3 + (t4 & n3 | ~t4 & s3) + r3 + o3;
+      function u2(e4, t4, n3, s3, r3, i3, o3) {
+        var a3 = e4 + (t4 & n3 | ~t4 & s3) + r3 + o3;
         return (a3 << i3 | a3 >>> 32 - i3) + t4;
       }
-      function h2(e3, t4, n3, s3, r3, i3, o3) {
-        var a3 = e3 + (t4 & s3 | n3 & ~s3) + r3 + o3;
+      function l2(e4, t4, n3, s3, r3, i3, o3) {
+        var a3 = e4 + (t4 & s3 | n3 & ~s3) + r3 + o3;
         return (a3 << i3 | a3 >>> 32 - i3) + t4;
       }
-      function l2(e3, t4, n3, s3, r3, i3, o3) {
-        var a3 = e3 + (t4 ^ n3 ^ s3) + r3 + o3;
+      function h2(e4, t4, n3, s3, r3, i3, o3) {
+        var a3 = e4 + (t4 ^ n3 ^ s3) + r3 + o3;
         return (a3 << i3 | a3 >>> 32 - i3) + t4;
       }
-      function d2(e3, t4, n3, s3, r3, i3, o3) {
-        var a3 = e3 + (n3 ^ (t4 | ~s3)) + r3 + o3;
+      function d2(e4, t4, n3, s3, r3, i3, o3) {
+        var a3 = e4 + (n3 ^ (t4 | ~s3)) + r3 + o3;
         return (a3 << i3 | a3 >>> 32 - i3) + t4;
       }
       t3.MD5 = i2._createHelper(c2), t3.HmacMD5 = i2._createHmacHelper(c2);
     }(Math), n2.MD5);
-  }), s(function(e, t2) {
+  }), n(function(e2, t2) {
     var n2;
-    e.exports = (n2 = i, void function() {
-      var e2 = n2, t3 = e2.lib.Base, s2 = e2.enc.Utf8;
-      e2.algo.HMAC = t3.extend({ init: function(e3, t4) {
-        e3 = this._hasher = new e3.init(), "string" == typeof t4 && (t4 = s2.parse(t4));
-        var n3 = e3.blockSize, r2 = 4 * n3;
-        t4.sigBytes > r2 && (t4 = e3.finalize(t4)), t4.clamp();
+    e2.exports = (n2 = r, void function() {
+      var e3 = n2, t3 = e3.lib.Base, s2 = e3.enc.Utf8;
+      e3.algo.HMAC = t3.extend({ init: function(e4, t4) {
+        e4 = this._hasher = new e4.init(), "string" == typeof t4 && (t4 = s2.parse(t4));
+        var n3 = e4.blockSize, r2 = 4 * n3;
+        t4.sigBytes > r2 && (t4 = e4.finalize(t4)), t4.clamp();
         for (var i2 = this._oKey = t4.clone(), o2 = this._iKey = t4.clone(), a2 = i2.words, c2 = o2.words, u2 = 0; u2 < n3; u2++)
           a2[u2] ^= 1549556828, c2[u2] ^= 909522486;
         i2.sigBytes = o2.sigBytes = r2, this.reset();
       }, reset: function() {
-        var e3 = this._hasher;
-        e3.reset(), e3.update(this._iKey);
-      }, update: function(e3) {
-        return this._hasher.update(e3), this;
-      }, finalize: function(e3) {
-        var t4 = this._hasher, n3 = t4.finalize(e3);
+        var e4 = this._hasher;
+        e4.reset(), e4.update(this._iKey);
+      }, update: function(e4) {
+        return this._hasher.update(e4), this;
+      }, finalize: function(e4) {
+        var t4 = this._hasher, n3 = t4.finalize(e4);
         return t4.reset(), t4.finalize(this._oKey.clone().concat(n3));
       } });
     }());
-  }), s(function(e, t2) {
-    e.exports = i.HmacMD5;
-  })), a = s(function(e, t2) {
-    e.exports = i.enc.Utf8;
-  }), c = s(function(e, t2) {
+  }), n(function(e2, t2) {
+    e2.exports = r.HmacMD5;
+  })), o = n(function(e2, t2) {
+    e2.exports = r.enc.Utf8;
+  }), a = n(function(e2, t2) {
     var n2;
-    e.exports = (n2 = i, function() {
-      var e2 = n2, t3 = e2.lib.WordArray;
-      function s2(e3, n3, s3) {
+    e2.exports = (n2 = r, function() {
+      var e3 = n2, t3 = e3.lib.WordArray;
+      function s2(e4, n3, s3) {
         for (var r2 = [], i2 = 0, o2 = 0; o2 < n3; o2++)
           if (o2 % 4) {
-            var a2 = s3[e3.charCodeAt(o2 - 1)] << o2 % 4 * 2, c2 = s3[e3.charCodeAt(o2)] >>> 6 - o2 % 4 * 2;
+            var a2 = s3[e4.charCodeAt(o2 - 1)] << o2 % 4 * 2, c2 = s3[e4.charCodeAt(o2)] >>> 6 - o2 % 4 * 2;
             r2[i2 >>> 2] |= (a2 | c2) << 24 - i2 % 4 * 8, i2++;
           }
         return t3.create(r2, i2);
       }
-      e2.enc.Base64 = { stringify: function(e3) {
-        var t4 = e3.words, n3 = e3.sigBytes, s3 = this._map;
-        e3.clamp();
+      e3.enc.Base64 = { stringify: function(e4) {
+        var t4 = e4.words, n3 = e4.sigBytes, s3 = this._map;
+        e4.clamp();
         for (var r2 = [], i2 = 0; i2 < n3; i2 += 3)
           for (var o2 = (t4[i2 >>> 2] >>> 24 - i2 % 4 * 8 & 255) << 16 | (t4[i2 + 1 >>> 2] >>> 24 - (i2 + 1) % 4 * 8 & 255) << 8 | t4[i2 + 2 >>> 2] >>> 24 - (i2 + 2) % 4 * 8 & 255, a2 = 0; a2 < 4 && i2 + 0.75 * a2 < n3; a2++)
             r2.push(s3.charAt(o2 >>> 6 * (3 - a2) & 63));
@@ -11914,8 +12678,8 @@ This will fail in production.`);
           for (; r2.length % 4; )
             r2.push(c2);
         return r2.join("");
-      }, parse: function(e3) {
-        var t4 = e3.length, n3 = this._map, r2 = this._reverseMap;
+      }, parse: function(e4) {
+        var t4 = e4.length, n3 = this._map, r2 = this._reverseMap;
         if (!r2) {
           r2 = this._reverseMap = [];
           for (var i2 = 0; i2 < n3.length; i2++)
@@ -11923,244 +12687,243 @@ This will fail in production.`);
         }
         var o2 = n3.charAt(64);
         if (o2) {
-          var a2 = e3.indexOf(o2);
+          var a2 = e4.indexOf(o2);
           -1 !== a2 && (t4 = a2);
         }
-        return s2(e3, t4, r2);
+        return s2(e4, t4, r2);
       }, _map: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=" };
     }(), n2.enc.Base64);
   });
-  const u = "FUNCTION", h = "OBJECT", l = "CLIENT_DB", d = "pending", p = "fullfilled", f = "rejected";
-  function g(e) {
-    return Object.prototype.toString.call(e).slice(8, -1).toLowerCase();
+  const c = "FUNCTION", u = "OBJECT", l = "CLIENT_DB", h = "pending", d = "fulfilled", p = "rejected";
+  function f(e2) {
+    return Object.prototype.toString.call(e2).slice(8, -1).toLowerCase();
   }
-  function m(e) {
-    return "object" === g(e);
+  function g(e2) {
+    return "object" === f(e2);
   }
-  function y(e) {
-    return "function" == typeof e;
+  function m(e2) {
+    return "function" == typeof e2;
   }
-  function _(e) {
+  function y(e2) {
     return function() {
       try {
-        return e.apply(e, arguments);
-      } catch (e2) {
-        console.error(e2);
+        return e2.apply(e2, arguments);
+      } catch (e3) {
+        console.error(e3);
       }
     };
   }
-  const w = "REJECTED", v = "NOT_PENDING";
-  class I {
-    constructor({ createPromise: e, retryRule: t2 = w } = {}) {
-      this.createPromise = e, this.status = null, this.promise = null, this.retryRule = t2;
+  const _ = "REJECTED", w = "NOT_PENDING";
+  class v {
+    constructor({ createPromise: e2, retryRule: t2 = _ } = {}) {
+      this.createPromise = e2, this.status = null, this.promise = null, this.retryRule = t2;
     }
     get needRetry() {
       if (!this.status)
         return true;
       switch (this.retryRule) {
+        case _:
+          return this.status === p;
         case w:
-          return this.status === f;
-        case v:
-          return this.status !== d;
+          return this.status !== h;
       }
     }
     exec() {
-      return this.needRetry ? (this.status = d, this.promise = this.createPromise().then((e) => (this.status = p, Promise.resolve(e)), (e) => (this.status = f, Promise.reject(e))), this.promise) : this.promise;
+      return this.needRetry ? (this.status = h, this.promise = this.createPromise().then((e2) => (this.status = d, Promise.resolve(e2)), (e2) => (this.status = p, Promise.reject(e2))), this.promise) : this.promise;
     }
   }
-  function S(e) {
-    return e && "string" == typeof e ? JSON.parse(e) : e;
+  function I(e2) {
+    return e2 && "string" == typeof e2 ? JSON.parse(e2) : e2;
   }
-  const b = true, k = "app", T = S([]), P = k, A = S(""), E = S("[]") || [];
-  let x = "";
+  const S = true, b = "app", A = I([]), P = b, T = I(""), C = I("[]") || [];
+  let O = "";
   try {
-    x = "__UNI__B1D7CFE";
-  } catch (e) {
+    O = "__UNI__B1D7CFE";
+  } catch (e2) {
   }
-  let R = {};
-  function U(e, t2 = {}) {
+  let E = {};
+  function L(e2, t2 = {}) {
     var n2, s2;
-    return n2 = R, s2 = e, Object.prototype.hasOwnProperty.call(n2, s2) || (R[e] = t2), R[e];
+    return n2 = E, s2 = e2, Object.prototype.hasOwnProperty.call(n2, s2) || (E[e2] = t2), E[e2];
   }
-  R = uni._globalUniCloudObj ? uni._globalUniCloudObj : uni._globalUniCloudObj = {};
-  const L = ["invoke", "success", "fail", "complete"], N = U("_globalUniCloudInterceptor");
-  function D(e, t2) {
-    N[e] || (N[e] = {}), m(t2) && Object.keys(t2).forEach((n2) => {
-      L.indexOf(n2) > -1 && function(e2, t3, n3) {
-        let s2 = N[e2][t3];
-        s2 || (s2 = N[e2][t3] = []), -1 === s2.indexOf(n3) && y(n3) && s2.push(n3);
-      }(e, n2, t2[n2]);
+  E = uni._globalUniCloudObj ? uni._globalUniCloudObj : uni._globalUniCloudObj = {};
+  const R = ["invoke", "success", "fail", "complete"], U = L("_globalUniCloudInterceptor");
+  function N(e2, t2) {
+    U[e2] || (U[e2] = {}), g(t2) && Object.keys(t2).forEach((n2) => {
+      R.indexOf(n2) > -1 && function(e3, t3, n3) {
+        let s2 = U[e3][t3];
+        s2 || (s2 = U[e3][t3] = []), -1 === s2.indexOf(n3) && m(n3) && s2.push(n3);
+      }(e2, n2, t2[n2]);
     });
   }
-  function F(e, t2) {
-    N[e] || (N[e] = {}), m(t2) ? Object.keys(t2).forEach((n2) => {
-      L.indexOf(n2) > -1 && function(e2, t3, n3) {
-        const s2 = N[e2][t3];
+  function D(e2, t2) {
+    U[e2] || (U[e2] = {}), g(t2) ? Object.keys(t2).forEach((n2) => {
+      R.indexOf(n2) > -1 && function(e3, t3, n3) {
+        const s2 = U[e3][t3];
         if (!s2)
           return;
         const r2 = s2.indexOf(n3);
         r2 > -1 && s2.splice(r2, 1);
-      }(e, n2, t2[n2]);
-    }) : delete N[e];
+      }(e2, n2, t2[n2]);
+    }) : delete U[e2];
   }
-  function M(e, t2) {
-    return e && 0 !== e.length ? e.reduce((e2, n2) => e2.then(() => n2(t2)), Promise.resolve()) : Promise.resolve();
+  function M(e2, t2) {
+    return e2 && 0 !== e2.length ? e2.reduce((e3, n2) => e3.then(() => n2(t2)), Promise.resolve()) : Promise.resolve();
   }
-  function q(e, t2) {
-    return N[e] && N[e][t2] || [];
+  function q(e2, t2) {
+    return U[e2] && U[e2][t2] || [];
   }
-  function K(e) {
-    D("callObject", e);
+  function F(e2) {
+    N("callObject", e2);
   }
-  const j = U("_globalUniCloudListener"), B = "response", $ = "needLogin", W = "refreshToken", z = "clientdb", J = "cloudfunction", H = "cloudobject";
-  function G(e) {
-    return j[e] || (j[e] = []), j[e];
+  const K = L("_globalUniCloudListener"), j = "response", B = "needLogin", $ = "refreshToken", W = "clientdb", H = "cloudfunction", z = "cloudobject";
+  function J(e2) {
+    return K[e2] || (K[e2] = []), K[e2];
   }
-  function V(e, t2) {
-    const n2 = G(e);
+  function V(e2, t2) {
+    const n2 = J(e2);
     n2.includes(t2) || n2.push(t2);
   }
-  function Y(e, t2) {
-    const n2 = G(e), s2 = n2.indexOf(t2);
+  function G(e2, t2) {
+    const n2 = J(e2), s2 = n2.indexOf(t2);
     -1 !== s2 && n2.splice(s2, 1);
   }
-  function Q(e, t2) {
-    const n2 = G(e);
-    for (let e2 = 0; e2 < n2.length; e2++) {
-      (0, n2[e2])(t2);
+  function Y(e2, t2) {
+    const n2 = J(e2);
+    for (let e3 = 0; e3 < n2.length; e3++) {
+      (0, n2[e3])(t2);
     }
   }
-  let X, Z = false;
-  function ee() {
-    return X || (X = new Promise((e) => {
-      Z && e(), function t2() {
+  let Q, X = false;
+  function Z() {
+    return Q || (Q = new Promise((e2) => {
+      X && e2(), function t2() {
         if ("function" == typeof getCurrentPages) {
           const t3 = getCurrentPages();
-          t3 && t3[0] && (Z = true, e());
+          t3 && t3[0] && (X = true, e2());
         }
-        Z || setTimeout(() => {
+        X || setTimeout(() => {
           t2();
         }, 30);
       }();
-    }), X);
+    }), Q);
   }
-  function te(e) {
+  function ee(e2) {
     const t2 = {};
-    for (const n2 in e) {
-      const s2 = e[n2];
-      y(s2) && (t2[n2] = _(s2));
+    for (const n2 in e2) {
+      const s2 = e2[n2];
+      m(s2) && (t2[n2] = y(s2));
     }
     return t2;
   }
-  class ne extends Error {
-    constructor(e) {
-      super(e.message), this.errMsg = e.message || e.errMsg || "unknown system error", this.code = this.errCode = e.code || e.errCode || "SYSTEM_ERROR", this.errSubject = this.subject = e.subject || e.errSubject, this.cause = e.cause, this.requestId = e.requestId;
+  class te extends Error {
+    constructor(e2) {
+      super(e2.message), this.errMsg = e2.message || e2.errMsg || "unknown system error", this.code = this.errCode = e2.code || e2.errCode || "SYSTEM_ERROR", this.errSubject = this.subject = e2.subject || e2.errSubject, this.cause = e2.cause, this.requestId = e2.requestId;
     }
-    toJson(e = 0) {
-      if (!(e >= 10))
-        return e++, { errCode: this.errCode, errMsg: this.errMsg, errSubject: this.errSubject, cause: this.cause && this.cause.toJson ? this.cause.toJson(e) : this.cause };
+    toJson(e2 = 0) {
+      if (!(e2 >= 10))
+        return e2++, { errCode: this.errCode, errMsg: this.errMsg, errSubject: this.errSubject, cause: this.cause && this.cause.toJson ? this.cause.toJson(e2) : this.cause };
     }
   }
-  var se = { request: (e) => uni.request(e), uploadFile: (e) => uni.uploadFile(e), setStorageSync: (e, t2) => uni.setStorageSync(e, t2), getStorageSync: (e) => uni.getStorageSync(e), removeStorageSync: (e) => uni.removeStorageSync(e), clearStorageSync: () => uni.clearStorageSync() };
-  function re(e) {
-    return e && re(e.__v_raw) || e;
+  var ne = { request: (e2) => uni.request(e2), uploadFile: (e2) => uni.uploadFile(e2), setStorageSync: (e2, t2) => uni.setStorageSync(e2, t2), getStorageSync: (e2) => uni.getStorageSync(e2), removeStorageSync: (e2) => uni.removeStorageSync(e2), clearStorageSync: () => uni.clearStorageSync() };
+  function se(e2) {
+    return e2 && se(e2.__v_raw) || e2;
   }
-  function ie() {
-    return { token: se.getStorageSync("uni_id_token") || se.getStorageSync("uniIdToken"), tokenExpired: se.getStorageSync("uni_id_token_expired") };
+  function re() {
+    return { token: ne.getStorageSync("uni_id_token") || ne.getStorageSync("uniIdToken"), tokenExpired: ne.getStorageSync("uni_id_token_expired") };
   }
-  function oe({ token: e, tokenExpired: t2 } = {}) {
-    e && se.setStorageSync("uni_id_token", e), t2 && se.setStorageSync("uni_id_token_expired", t2);
+  function ie({ token: e2, tokenExpired: t2 } = {}) {
+    e2 && ne.setStorageSync("uni_id_token", e2), t2 && ne.setStorageSync("uni_id_token_expired", t2);
+  }
+  let oe, ae;
+  function ce() {
+    return oe || (oe = uni.getSystemInfoSync()), oe;
   }
-  let ae, ce;
   function ue() {
-    return ae || (ae = uni.getSystemInfoSync()), ae;
-  }
-  function he() {
-    let e, t2;
+    let e2, t2;
     try {
       if (uni.getLaunchOptionsSync) {
         if (uni.getLaunchOptionsSync.toString().indexOf("not yet implemented") > -1)
           return;
         const { scene: n2, channel: s2 } = uni.getLaunchOptionsSync();
-        e = s2, t2 = n2;
+        e2 = s2, t2 = n2;
       }
-    } catch (e2) {
+    } catch (e3) {
     }
-    return { channel: e, scene: t2 };
+    return { channel: e2, scene: t2 };
   }
   function le() {
-    const e = uni.getLocale && uni.getLocale() || "en";
-    if (ce)
-      return { ...ce, locale: e, LOCALE: e };
-    const t2 = ue(), { deviceId: n2, osName: s2, uniPlatform: r2, appId: i2 } = t2, o2 = ["pixelRatio", "brand", "model", "system", "language", "version", "platform", "host", "SDKVersion", "swanNativeVersion", "app", "AppPlatform", "fontSizeSetting"];
-    for (let e2 = 0; e2 < o2.length; e2++) {
-      delete t2[o2[e2]];
+    const e2 = uni.getLocale && uni.getLocale() || "en";
+    if (ae)
+      return { ...ae, locale: e2, LOCALE: e2 };
+    const t2 = ce(), { deviceId: n2, osName: s2, uniPlatform: r2, appId: i2 } = t2, o2 = ["pixelRatio", "brand", "model", "system", "language", "version", "platform", "host", "SDKVersion", "swanNativeVersion", "app", "AppPlatform", "fontSizeSetting"];
+    for (let e3 = 0; e3 < o2.length; e3++) {
+      delete t2[o2[e3]];
     }
-    return ce = { PLATFORM: r2, OS: s2, APPID: i2, DEVICEID: n2, ...he(), ...t2 }, { ...ce, locale: e, LOCALE: e };
+    return ae = { PLATFORM: r2, OS: s2, APPID: i2, DEVICEID: n2, ...ue(), ...t2 }, { ...ae, locale: e2, LOCALE: e2 };
   }
-  var de = { sign: function(e, t2) {
+  var he = { sign: function(e2, t2) {
     let n2 = "";
-    return Object.keys(e).sort().forEach(function(t3) {
-      e[t3] && (n2 = n2 + "&" + t3 + "=" + e[t3]);
-    }), n2 = n2.slice(1), o(n2, t2).toString();
-  }, wrappedRequest: function(e, t2) {
+    return Object.keys(e2).sort().forEach(function(t3) {
+      e2[t3] && (n2 = n2 + "&" + t3 + "=" + e2[t3]);
+    }), n2 = n2.slice(1), i(n2, t2).toString();
+  }, wrappedRequest: function(e2, t2) {
     return new Promise((n2, s2) => {
-      t2(Object.assign(e, { complete(e2) {
-        e2 || (e2 = {});
-        const t3 = e2.data && e2.data.header && e2.data.header["x-serverless-request-id"] || e2.header && e2.header["request-id"];
-        if (!e2.statusCode || e2.statusCode >= 400)
-          return s2(new ne({ code: "SYS_ERR", message: e2.errMsg || "request:fail", requestId: t3 }));
-        const r2 = e2.data;
+      t2(Object.assign(e2, { complete(e3) {
+        e3 || (e3 = {});
+        const t3 = e3.data && e3.data.header && e3.data.header["x-serverless-request-id"] || e3.header && e3.header["request-id"];
+        if (!e3.statusCode || e3.statusCode >= 400)
+          return s2(new te({ code: "SYS_ERR", message: e3.errMsg || "request:fail", requestId: t3 }));
+        const r2 = e3.data;
         if (r2.error)
-          return s2(new ne({ code: r2.error.code, message: r2.error.message, requestId: t3 }));
+          return s2(new te({ code: r2.error.code, message: r2.error.message, requestId: t3 }));
         r2.result = r2.data, r2.requestId = t3, delete r2.data, n2(r2);
       } }));
     });
-  }, toBase64: function(e) {
-    return c.stringify(a.parse(e));
-  } }, pe = { "uniCloud.init.paramRequired": "{param} required", "uniCloud.uploadFile.fileError": "filePath should be instance of File" };
-  const { t: fe } = initVueI18n({ "zh-Hans": { "uniCloud.init.paramRequired": "缺少参数：{param}", "uniCloud.uploadFile.fileError": "filePath应为File对象" }, "zh-Hant": { "uniCloud.init.paramRequired": "缺少参数：{param}", "uniCloud.uploadFile.fileError": "filePath应为File对象" }, en: pe, fr: { "uniCloud.init.paramRequired": "{param} required", "uniCloud.uploadFile.fileError": "filePath should be instance of File" }, es: { "uniCloud.init.paramRequired": "{param} required", "uniCloud.uploadFile.fileError": "filePath should be instance of File" }, ja: pe }, "zh-Hans");
-  var ge = class {
-    constructor(e) {
+  }, toBase64: function(e2) {
+    return a.stringify(o.parse(e2));
+  } };
+  var de = class {
+    constructor(e2) {
       ["spaceId", "clientSecret"].forEach((t2) => {
-        if (!Object.prototype.hasOwnProperty.call(e, t2))
-          throw new Error(fe("uniCloud.init.paramRequired", { param: t2 }));
-      }), this.config = Object.assign({}, { endpoint: 0 === e.spaceId.indexOf("mp-") ? "https://api.next.bspapp.com" : "https://api.bspapp.com" }, e), this.config.provider = "aliyun", this.config.requestUrl = this.config.endpoint + "/client", this.config.envType = this.config.envType || "public", this.config.accessTokenKey = "access_token_" + this.config.spaceId, this.adapter = se, this._getAccessTokenPromiseHub = new I({ createPromise: () => this.requestAuth(this.setupRequest({ method: "serverless.auth.user.anonymousAuthorize", params: "{}" }, "auth")).then((e2) => {
-        if (!e2.result || !e2.result.accessToken)
-          throw new ne({ code: "AUTH_FAILED", message: "获取accessToken失败" });
-        this.setAccessToken(e2.result.accessToken);
-      }), retryRule: v });
+        if (!Object.prototype.hasOwnProperty.call(e2, t2))
+          throw new Error(`${t2} required`);
+      }), this.config = Object.assign({}, { endpoint: 0 === e2.spaceId.indexOf("mp-") ? "https://api.next.bspapp.com" : "https://api.bspapp.com" }, e2), this.config.provider = "aliyun", this.config.requestUrl = this.config.endpoint + "/client", this.config.envType = this.config.envType || "public", this.config.accessTokenKey = "access_token_" + this.config.spaceId, this.adapter = ne, this._getAccessTokenPromiseHub = new v({ createPromise: () => this.requestAuth(this.setupRequest({ method: "serverless.auth.user.anonymousAuthorize", params: "{}" }, "auth")).then((e3) => {
+        if (!e3.result || !e3.result.accessToken)
+          throw new te({ code: "AUTH_FAILED", message: "获取accessToken失败" });
+        this.setAccessToken(e3.result.accessToken);
+      }), retryRule: w });
     }
     get hasAccessToken() {
       return !!this.accessToken;
     }
-    setAccessToken(e) {
-      this.accessToken = e;
+    setAccessToken(e2) {
+      this.accessToken = e2;
     }
-    requestWrapped(e) {
-      return de.wrappedRequest(e, this.adapter.request);
+    requestWrapped(e2) {
+      return he.wrappedRequest(e2, this.adapter.request);
     }
-    requestAuth(e) {
-      return this.requestWrapped(e);
+    requestAuth(e2) {
+      return this.requestWrapped(e2);
     }
-    request(e, t2) {
-      return Promise.resolve().then(() => this.hasAccessToken ? t2 ? this.requestWrapped(e) : this.requestWrapped(e).catch((t3) => new Promise((e2, n2) => {
-        !t3 || "GATEWAY_INVALID_TOKEN" !== t3.code && "InvalidParameter.InvalidToken" !== t3.code ? n2(t3) : e2();
+    request(e2, t2) {
+      return Promise.resolve().then(() => this.hasAccessToken ? t2 ? this.requestWrapped(e2) : this.requestWrapped(e2).catch((t3) => new Promise((e3, n2) => {
+        !t3 || "GATEWAY_INVALID_TOKEN" !== t3.code && "InvalidParameter.InvalidToken" !== t3.code ? n2(t3) : e3();
       }).then(() => this.getAccessToken()).then(() => {
-        const t4 = this.rebuildRequest(e);
+        const t4 = this.rebuildRequest(e2);
         return this.request(t4, true);
       })) : this.getAccessToken().then(() => {
-        const t3 = this.rebuildRequest(e);
+        const t3 = this.rebuildRequest(e2);
         return this.request(t3, true);
       }));
     }
-    rebuildRequest(e) {
-      const t2 = Object.assign({}, e);
-      return t2.data.token = this.accessToken, t2.header["x-basement-token"] = this.accessToken, t2.header["x-serverless-sign"] = de.sign(t2.data, this.config.clientSecret), t2;
+    rebuildRequest(e2) {
+      const t2 = Object.assign({}, e2);
+      return t2.data.token = this.accessToken, t2.header["x-basement-token"] = this.accessToken, t2.header["x-serverless-sign"] = he.sign(t2.data, this.config.clientSecret), t2;
     }
-    setupRequest(e, t2) {
-      const n2 = Object.assign({}, e, { spaceId: this.config.spaceId, timestamp: Date.now() }), s2 = { "Content-Type": "application/json" };
-      return "auth" !== t2 && (n2.token = this.accessToken, s2["x-basement-token"] = this.accessToken), s2["x-serverless-sign"] = de.sign(n2, this.config.clientSecret), { url: this.config.requestUrl, method: "POST", data: n2, dataType: "json", header: s2 };
+    setupRequest(e2, t2) {
+      const n2 = Object.assign({}, e2, { spaceId: this.config.spaceId, timestamp: Date.now() }), s2 = { "Content-Type": "application/json" };
+      return "auth" !== t2 && (n2.token = this.accessToken, s2["x-basement-token"] = this.accessToken), s2["x-serverless-sign"] = he.sign(n2, this.config.clientSecret), { url: this.config.requestUrl, method: "POST", data: n2, dataType: "json", header: s2 };
     }
     getAccessToken() {
       return this._getAccessTokenPromiseHub.exec();
@@ -12168,66 +12931,66 @@ This will fail in production.`);
     async authorize() {
       await this.getAccessToken();
     }
-    callFunction(e) {
-      const t2 = { method: "serverless.function.runtime.invoke", params: JSON.stringify({ functionTarget: e.name, functionArgs: e.data || {} }) };
+    callFunction(e2) {
+      const t2 = { method: "serverless.function.runtime.invoke", params: JSON.stringify({ functionTarget: e2.name, functionArgs: e2.data || {} }) };
       return this.request(this.setupRequest(t2));
     }
-    getOSSUploadOptionsFromPath(e) {
-      const t2 = { method: "serverless.file.resource.generateProximalSign", params: JSON.stringify(e) };
+    getOSSUploadOptionsFromPath(e2) {
+      const t2 = { method: "serverless.file.resource.generateProximalSign", params: JSON.stringify(e2) };
       return this.request(this.setupRequest(t2));
     }
-    uploadFileToOSS({ url: e, formData: t2, name: n2, filePath: s2, fileType: r2, onUploadProgress: i2 }) {
+    uploadFileToOSS({ url: e2, formData: t2, name: n2, filePath: s2, fileType: r2, onUploadProgress: i2 }) {
       return new Promise((o2, a2) => {
-        const c2 = this.adapter.uploadFile({ url: e, formData: t2, name: n2, filePath: s2, fileType: r2, header: { "X-OSS-server-side-encrpytion": "AES256" }, success(e2) {
-          e2 && e2.statusCode < 400 ? o2(e2) : a2(new ne({ code: "UPLOAD_FAILED", message: "文件上传失败" }));
-        }, fail(e2) {
-          a2(new ne({ code: e2.code || "UPLOAD_FAILED", message: e2.message || e2.errMsg || "文件上传失败" }));
+        const c2 = this.adapter.uploadFile({ url: e2, formData: t2, name: n2, filePath: s2, fileType: r2, header: { "X-OSS-server-side-encrpytion": "AES256" }, success(e3) {
+          e3 && e3.statusCode < 400 ? o2(e3) : a2(new te({ code: "UPLOAD_FAILED", message: "文件上传失败" }));
+        }, fail(e3) {
+          a2(new te({ code: e3.code || "UPLOAD_FAILED", message: e3.message || e3.errMsg || "文件上传失败" }));
         } });
-        "function" == typeof i2 && c2 && "function" == typeof c2.onProgressUpdate && c2.onProgressUpdate((e2) => {
-          i2({ loaded: e2.totalBytesSent, total: e2.totalBytesExpectedToSend });
+        "function" == typeof i2 && c2 && "function" == typeof c2.onProgressUpdate && c2.onProgressUpdate((e3) => {
+          i2({ loaded: e3.totalBytesSent, total: e3.totalBytesExpectedToSend });
         });
       });
     }
-    reportOSSUpload(e) {
-      const t2 = { method: "serverless.file.resource.report", params: JSON.stringify(e) };
+    reportOSSUpload(e2) {
+      const t2 = { method: "serverless.file.resource.report", params: JSON.stringify(e2) };
       return this.request(this.setupRequest(t2));
     }
-    async uploadFile({ filePath: e, cloudPath: t2, fileType: n2 = "image", cloudPathAsRealPath: s2 = false, onUploadProgress: r2, config: i2 }) {
-      if ("string" !== g(t2))
-        throw new ne({ code: "INVALID_PARAM", message: "cloudPath必须为字符串类型" });
+    async uploadFile({ filePath: e2, cloudPath: t2, fileType: n2 = "image", cloudPathAsRealPath: s2 = false, onUploadProgress: r2, config: i2 }) {
+      if ("string" !== f(t2))
+        throw new te({ code: "INVALID_PARAM", message: "cloudPath必须为字符串类型" });
       if (!(t2 = t2.trim()))
-        throw new ne({ code: "INVALID_PARAM", message: "cloudPath不可为空" });
+        throw new te({ code: "INVALID_PARAM", message: "cloudPath不可为空" });
       if (/:\/\//.test(t2))
-        throw new ne({ code: "INVALID_PARAM", message: "cloudPath不合法" });
+        throw new te({ code: "INVALID_PARAM", message: "cloudPath不合法" });
       const o2 = i2 && i2.envType || this.config.envType;
       if (s2 && ("/" !== t2[0] && (t2 = "/" + t2), t2.indexOf("\\") > -1))
-        throw new ne({ code: "INVALID_PARAM", message: "使用cloudPath作为路径时，cloudPath不可包含“\\”" });
-      const a2 = (await this.getOSSUploadOptionsFromPath({ env: o2, filename: s2 ? t2.split("/").pop() : t2, fileId: s2 ? t2 : void 0 })).result, c2 = "https://" + a2.cdnDomain + "/" + a2.ossPath, { securityToken: u2, accessKeyId: h2, signature: l2, host: d2, ossPath: p2, id: f2, policy: m2, ossCallbackUrl: y2 } = a2, _2 = { "Cache-Control": "max-age=2592000", "Content-Disposition": "attachment", OSSAccessKeyId: h2, Signature: l2, host: d2, id: f2, key: p2, policy: m2, success_action_status: 200 };
+        throw new te({ code: "INVALID_PARAM", message: "使用cloudPath作为路径时，cloudPath不可包含“\\”" });
+      const a2 = (await this.getOSSUploadOptionsFromPath({ env: o2, filename: s2 ? t2.split("/").pop() : t2, fileId: s2 ? t2 : void 0 })).result, c2 = "https://" + a2.cdnDomain + "/" + a2.ossPath, { securityToken: u2, accessKeyId: l2, signature: h2, host: d2, ossPath: p2, id: g2, policy: m2, ossCallbackUrl: y2 } = a2, _2 = { "Cache-Control": "max-age=2592000", "Content-Disposition": "attachment", OSSAccessKeyId: l2, Signature: h2, host: d2, id: g2, key: p2, policy: m2, success_action_status: 200 };
       if (u2 && (_2["x-oss-security-token"] = u2), y2) {
-        const e2 = JSON.stringify({ callbackUrl: y2, callbackBody: JSON.stringify({ fileId: f2, spaceId: this.config.spaceId }), callbackBodyType: "application/json" });
-        _2.callback = de.toBase64(e2);
+        const e3 = JSON.stringify({ callbackUrl: y2, callbackBody: JSON.stringify({ fileId: g2, spaceId: this.config.spaceId }), callbackBodyType: "application/json" });
+        _2.callback = he.toBase64(e3);
       }
-      const w2 = { url: "https://" + a2.host, formData: _2, fileName: "file", name: "file", filePath: e, fileType: n2 };
+      const w2 = { url: "https://" + a2.host, formData: _2, fileName: "file", name: "file", filePath: e2, fileType: n2 };
       if (await this.uploadFileToOSS(Object.assign({}, w2, { onUploadProgress: r2 })), y2)
-        return { success: true, filePath: e, fileID: c2 };
-      if ((await this.reportOSSUpload({ id: f2 })).success)
-        return { success: true, filePath: e, fileID: c2 };
-      throw new ne({ code: "UPLOAD_FAILED", message: "文件上传失败" });
+        return { success: true, filePath: e2, fileID: c2 };
+      if ((await this.reportOSSUpload({ id: g2 })).success)
+        return { success: true, filePath: e2, fileID: c2 };
+      throw new te({ code: "UPLOAD_FAILED", message: "文件上传失败" });
     }
-    getTempFileURL({ fileList: e } = {}) {
+    getTempFileURL({ fileList: e2 } = {}) {
       return new Promise((t2, n2) => {
-        Array.isArray(e) && 0 !== e.length || n2(new ne({ code: "INVALID_PARAM", message: "fileList的元素必须是非空的字符串" })), t2({ fileList: e.map((e2) => ({ fileID: e2, tempFileURL: e2 })) });
+        Array.isArray(e2) && 0 !== e2.length || n2(new te({ code: "INVALID_PARAM", message: "fileList的元素必须是非空的字符串" })), t2({ fileList: e2.map((e3) => ({ fileID: e3, tempFileURL: e3 })) });
       });
     }
-    async getFileInfo({ fileList: e } = {}) {
-      if (!Array.isArray(e) || 0 === e.length)
-        throw new ne({ code: "INVALID_PARAM", message: "fileList的元素必须是非空的字符串" });
-      const t2 = { method: "serverless.file.resource.info", params: JSON.stringify({ id: e.map((e2) => e2.split("?")[0]).join(",") }) };
+    async getFileInfo({ fileList: e2 } = {}) {
+      if (!Array.isArray(e2) || 0 === e2.length)
+        throw new te({ code: "INVALID_PARAM", message: "fileList的元素必须是非空的字符串" });
+      const t2 = { method: "serverless.file.resource.info", params: JSON.stringify({ id: e2.map((e3) => e3.split("?")[0]).join(",") }) };
       return { fileList: (await this.request(this.setupRequest(t2))).result };
     }
   };
-  var me = { init(e) {
-    const t2 = new ge(e), n2 = { signInAnonymously: function() {
+  var pe = { init(e2) {
+    const t2 = new de(e2), n2 = { signInAnonymously: function() {
       return t2.authorize();
     }, getLoginState: function() {
       return Promise.resolve(false);
@@ -12236,117 +12999,159 @@ This will fail in production.`);
       return n2;
     }, t2.customAuth = t2.auth, t2;
   } };
-  const ye = "undefined" != typeof location && "http:" === location.protocol ? "http:" : "https:";
-  var _e;
-  !function(e) {
-    e.local = "local", e.none = "none", e.session = "session";
-  }(_e || (_e = {}));
-  var we = function() {
-  };
+  const fe = "undefined" != typeof location && "http:" === location.protocol ? "http:" : "https:";
+  var ge;
+  !function(e2) {
+    e2.local = "local", e2.none = "none", e2.session = "session";
+  }(ge || (ge = {}));
+  var me = function() {
+  }, ye = n(function(e2, t2) {
+    var n2;
+    e2.exports = (n2 = r, function(e3) {
+      var t3 = n2, s2 = t3.lib, r2 = s2.WordArray, i2 = s2.Hasher, o2 = t3.algo, a2 = [], c2 = [];
+      !function() {
+        function t4(t5) {
+          for (var n4 = e3.sqrt(t5), s4 = 2; s4 <= n4; s4++)
+            if (!(t5 % s4))
+              return false;
+          return true;
+        }
+        function n3(e4) {
+          return 4294967296 * (e4 - (0 | e4)) | 0;
+        }
+        for (var s3 = 2, r3 = 0; r3 < 64; )
+          t4(s3) && (r3 < 8 && (a2[r3] = n3(e3.pow(s3, 0.5))), c2[r3] = n3(e3.pow(s3, 1 / 3)), r3++), s3++;
+      }();
+      var u2 = [], l2 = o2.SHA256 = i2.extend({ _doReset: function() {
+        this._hash = new r2.init(a2.slice(0));
+      }, _doProcessBlock: function(e4, t4) {
+        for (var n3 = this._hash.words, s3 = n3[0], r3 = n3[1], i3 = n3[2], o3 = n3[3], a3 = n3[4], l3 = n3[5], h2 = n3[6], d2 = n3[7], p2 = 0; p2 < 64; p2++) {
+          if (p2 < 16)
+            u2[p2] = 0 | e4[t4 + p2];
+          else {
+            var f2 = u2[p2 - 15], g2 = (f2 << 25 | f2 >>> 7) ^ (f2 << 14 | f2 >>> 18) ^ f2 >>> 3, m2 = u2[p2 - 2], y2 = (m2 << 15 | m2 >>> 17) ^ (m2 << 13 | m2 >>> 19) ^ m2 >>> 10;
+            u2[p2] = g2 + u2[p2 - 7] + y2 + u2[p2 - 16];
+          }
+          var _2 = s3 & r3 ^ s3 & i3 ^ r3 & i3, w2 = (s3 << 30 | s3 >>> 2) ^ (s3 << 19 | s3 >>> 13) ^ (s3 << 10 | s3 >>> 22), v2 = d2 + ((a3 << 26 | a3 >>> 6) ^ (a3 << 21 | a3 >>> 11) ^ (a3 << 7 | a3 >>> 25)) + (a3 & l3 ^ ~a3 & h2) + c2[p2] + u2[p2];
+          d2 = h2, h2 = l3, l3 = a3, a3 = o3 + v2 | 0, o3 = i3, i3 = r3, r3 = s3, s3 = v2 + (w2 + _2) | 0;
+        }
+        n3[0] = n3[0] + s3 | 0, n3[1] = n3[1] + r3 | 0, n3[2] = n3[2] + i3 | 0, n3[3] = n3[3] + o3 | 0, n3[4] = n3[4] + a3 | 0, n3[5] = n3[5] + l3 | 0, n3[6] = n3[6] + h2 | 0, n3[7] = n3[7] + d2 | 0;
+      }, _doFinalize: function() {
+        var t4 = this._data, n3 = t4.words, s3 = 8 * this._nDataBytes, r3 = 8 * t4.sigBytes;
+        return n3[r3 >>> 5] |= 128 << 24 - r3 % 32, n3[14 + (r3 + 64 >>> 9 << 4)] = e3.floor(s3 / 4294967296), n3[15 + (r3 + 64 >>> 9 << 4)] = s3, t4.sigBytes = 4 * n3.length, this._process(), this._hash;
+      }, clone: function() {
+        var e4 = i2.clone.call(this);
+        return e4._hash = this._hash.clone(), e4;
+      } });
+      t3.SHA256 = i2._createHelper(l2), t3.HmacSHA256 = i2._createHmacHelper(l2);
+    }(Math), n2.SHA256);
+  }), _e = ye, we = n(function(e2, t2) {
+    e2.exports = r.HmacSHA256;
+  });
   const ve = () => {
-    let e;
+    let e2;
     if (!Promise) {
-      e = () => {
-      }, e.promise = {};
+      e2 = () => {
+      }, e2.promise = {};
       const t3 = () => {
-        throw new ne({ message: 'Your Node runtime does support ES6 Promises. Set "global.Promise" to your preferred implementation of promises.' });
+        throw new te({ message: 'Your Node runtime does support ES6 Promises. Set "global.Promise" to your preferred implementation of promises.' });
       };
-      return Object.defineProperty(e.promise, "then", { get: t3 }), Object.defineProperty(e.promise, "catch", { get: t3 }), e;
+      return Object.defineProperty(e2.promise, "then", { get: t3 }), Object.defineProperty(e2.promise, "catch", { get: t3 }), e2;
     }
     const t2 = new Promise((t3, n2) => {
-      e = (e2, s2) => e2 ? n2(e2) : t3(s2);
+      e2 = (e3, s2) => e3 ? n2(e3) : t3(s2);
     });
-    return e.promise = t2, e;
+    return e2.promise = t2, e2;
   };
-  function Ie(e) {
-    return void 0 === e;
+  function Ie(e2) {
+    return void 0 === e2;
   }
-  function Se(e) {
-    return "[object Null]" === Object.prototype.toString.call(e);
+  function Se(e2) {
+    return "[object Null]" === Object.prototype.toString.call(e2);
   }
   var be;
-  function ke(e) {
-    const t2 = (n2 = e, "[object Array]" === Object.prototype.toString.call(n2) ? e : [e]);
+  function ke(e2) {
+    const t2 = (n2 = e2, "[object Array]" === Object.prototype.toString.call(n2) ? e2 : [e2]);
     var n2;
-    for (const e2 of t2) {
-      const { isMatch: t3, genAdapter: n3, runtime: s2 } = e2;
+    for (const e3 of t2) {
+      const { isMatch: t3, genAdapter: n3, runtime: s2 } = e3;
       if (t3())
         return { adapter: n3(), runtime: s2 };
     }
   }
-  !function(e) {
-    e.WEB = "web", e.WX_MP = "wx_mp";
+  !function(e2) {
+    e2.WEB = "web", e2.WX_MP = "wx_mp";
   }(be || (be = {}));
-  const Ce = { adapter: null, runtime: void 0 }, Te = ["anonymousUuidKey"];
-  class Pe extends we {
+  const Ae = { adapter: null, runtime: void 0 }, Pe = ["anonymousUuidKey"];
+  class Te extends me {
     constructor() {
-      super(), Ce.adapter.root.tcbObject || (Ce.adapter.root.tcbObject = {});
+      super(), Ae.adapter.root.tcbObject || (Ae.adapter.root.tcbObject = {});
     }
-    setItem(e, t2) {
-      Ce.adapter.root.tcbObject[e] = t2;
+    setItem(e2, t2) {
+      Ae.adapter.root.tcbObject[e2] = t2;
     }
-    getItem(e) {
-      return Ce.adapter.root.tcbObject[e];
+    getItem(e2) {
+      return Ae.adapter.root.tcbObject[e2];
     }
-    removeItem(e) {
-      delete Ce.adapter.root.tcbObject[e];
+    removeItem(e2) {
+      delete Ae.adapter.root.tcbObject[e2];
     }
     clear() {
-      delete Ce.adapter.root.tcbObject;
+      delete Ae.adapter.root.tcbObject;
     }
   }
-  function Ae(e, t2) {
-    switch (e) {
+  function Ce(e2, t2) {
+    switch (e2) {
       case "local":
-        return t2.localStorage || new Pe();
+        return t2.localStorage || new Te();
       case "none":
-        return new Pe();
+        return new Te();
       default:
-        return t2.sessionStorage || new Pe();
+        return t2.sessionStorage || new Te();
     }
   }
-  class Ee {
-    constructor(e) {
+  class xe {
+    constructor(e2) {
       if (!this._storage) {
-        this._persistence = Ce.adapter.primaryStorage || e.persistence, this._storage = Ae(this._persistence, Ce.adapter);
-        const t2 = `access_token_${e.env}`, n2 = `access_token_expire_${e.env}`, s2 = `refresh_token_${e.env}`, r2 = `anonymous_uuid_${e.env}`, i2 = `login_type_${e.env}`, o2 = `user_info_${e.env}`;
+        this._persistence = Ae.adapter.primaryStorage || e2.persistence, this._storage = Ce(this._persistence, Ae.adapter);
+        const t2 = `access_token_${e2.env}`, n2 = `access_token_expire_${e2.env}`, s2 = `refresh_token_${e2.env}`, r2 = `anonymous_uuid_${e2.env}`, i2 = `login_type_${e2.env}`, o2 = `user_info_${e2.env}`;
         this.keys = { accessTokenKey: t2, accessTokenExpireKey: n2, refreshTokenKey: s2, anonymousUuidKey: r2, loginTypeKey: i2, userInfoKey: o2 };
       }
     }
-    updatePersistence(e) {
-      if (e === this._persistence)
+    updatePersistence(e2) {
+      if (e2 === this._persistence)
         return;
       const t2 = "local" === this._persistence;
-      this._persistence = e;
-      const n2 = Ae(e, Ce.adapter);
-      for (const e2 in this.keys) {
-        const s2 = this.keys[e2];
-        if (t2 && Te.includes(e2))
+      this._persistence = e2;
+      const n2 = Ce(e2, Ae.adapter);
+      for (const e3 in this.keys) {
+        const s2 = this.keys[e3];
+        if (t2 && Pe.includes(e3))
           continue;
         const r2 = this._storage.getItem(s2);
         Ie(r2) || Se(r2) || (n2.setItem(s2, r2), this._storage.removeItem(s2));
       }
       this._storage = n2;
     }
-    setStore(e, t2, n2) {
+    setStore(e2, t2, n2) {
       if (!this._storage)
         return;
       const s2 = { version: n2 || "localCachev1", content: t2 }, r2 = JSON.stringify(s2);
       try {
-        this._storage.setItem(e, r2);
-      } catch (e2) {
-        throw e2;
+        this._storage.setItem(e2, r2);
+      } catch (e3) {
+        throw e3;
       }
     }
-    getStore(e, t2) {
+    getStore(e2, t2) {
       try {
         if (!this._storage)
           return;
-      } catch (e2) {
+      } catch (e3) {
         return "";
       }
       t2 = t2 || "localCachev1";
-      const n2 = this._storage.getItem(e);
+      const n2 = this._storage.getItem(e2);
       if (!n2)
         return "";
       if (n2.indexOf(t2) >= 0) {
@@ -12354,298 +13159,298 @@ This will fail in production.`);
       }
       return "";
     }
-    removeStore(e) {
-      this._storage.removeItem(e);
+    removeStore(e2) {
+      this._storage.removeItem(e2);
     }
   }
-  const Oe = {}, xe = {};
-  function Re(e) {
-    return Oe[e];
+  const Oe = {}, Ee = {};
+  function Le(e2) {
+    return Oe[e2];
   }
-  class Ue {
-    constructor(e, t2) {
-      this.data = t2 || null, this.name = e;
+  class Re {
+    constructor(e2, t2) {
+      this.data = t2 || null, this.name = e2;
     }
   }
-  class Le extends Ue {
-    constructor(e, t2) {
-      super("error", { error: e, data: t2 }), this.error = e;
+  class Ue extends Re {
+    constructor(e2, t2) {
+      super("error", { error: e2, data: t2 }), this.error = e2;
     }
   }
   const Ne = new class {
     constructor() {
       this._listeners = {};
     }
-    on(e, t2) {
-      return function(e2, t3, n2) {
-        n2[e2] = n2[e2] || [], n2[e2].push(t3);
-      }(e, t2, this._listeners), this;
+    on(e2, t2) {
+      return function(e3, t3, n2) {
+        n2[e3] = n2[e3] || [], n2[e3].push(t3);
+      }(e2, t2, this._listeners), this;
     }
-    off(e, t2) {
-      return function(e2, t3, n2) {
-        if (n2 && n2[e2]) {
-          const s2 = n2[e2].indexOf(t3);
-          -1 !== s2 && n2[e2].splice(s2, 1);
+    off(e2, t2) {
+      return function(e3, t3, n2) {
+        if (n2 && n2[e3]) {
+          const s2 = n2[e3].indexOf(t3);
+          -1 !== s2 && n2[e3].splice(s2, 1);
         }
-      }(e, t2, this._listeners), this;
+      }(e2, t2, this._listeners), this;
     }
-    fire(e, t2) {
-      if (e instanceof Le)
-        return console.error(e.error), this;
-      const n2 = "string" == typeof e ? new Ue(e, t2 || {}) : e;
+    fire(e2, t2) {
+      if (e2 instanceof Ue)
+        return console.error(e2.error), this;
+      const n2 = "string" == typeof e2 ? new Re(e2, t2 || {}) : e2;
       const s2 = n2.name;
       if (this._listens(s2)) {
         n2.target = this;
-        const e2 = this._listeners[s2] ? [...this._listeners[s2]] : [];
-        for (const t3 of e2)
+        const e3 = this._listeners[s2] ? [...this._listeners[s2]] : [];
+        for (const t3 of e3)
           t3.call(this, n2);
       }
       return this;
     }
-    _listens(e) {
-      return this._listeners[e] && this._listeners[e].length > 0;
+    _listens(e2) {
+      return this._listeners[e2] && this._listeners[e2].length > 0;
     }
   }();
-  function De(e, t2) {
-    Ne.on(e, t2);
+  function De(e2, t2) {
+    Ne.on(e2, t2);
   }
-  function Fe(e, t2 = {}) {
-    Ne.fire(e, t2);
+  function Me(e2, t2 = {}) {
+    Ne.fire(e2, t2);
   }
-  function Me(e, t2) {
-    Ne.off(e, t2);
+  function qe(e2, t2) {
+    Ne.off(e2, t2);
   }
-  const qe = "loginStateChanged", Ke = "loginStateExpire", je = "loginTypeChanged", Be = "anonymousConverted", $e = "refreshAccessToken";
+  const Fe = "loginStateChanged", Ke = "loginStateExpire", je = "loginTypeChanged", Be = "anonymousConverted", $e = "refreshAccessToken";
   var We;
-  !function(e) {
-    e.ANONYMOUS = "ANONYMOUS", e.WECHAT = "WECHAT", e.WECHAT_PUBLIC = "WECHAT-PUBLIC", e.WECHAT_OPEN = "WECHAT-OPEN", e.CUSTOM = "CUSTOM", e.EMAIL = "EMAIL", e.USERNAME = "USERNAME", e.NULL = "NULL";
+  !function(e2) {
+    e2.ANONYMOUS = "ANONYMOUS", e2.WECHAT = "WECHAT", e2.WECHAT_PUBLIC = "WECHAT-PUBLIC", e2.WECHAT_OPEN = "WECHAT-OPEN", e2.CUSTOM = "CUSTOM", e2.EMAIL = "EMAIL", e2.USERNAME = "USERNAME", e2.NULL = "NULL";
   }(We || (We = {}));
-  const ze = ["auth.getJwt", "auth.logout", "auth.signInWithTicket", "auth.signInAnonymously", "auth.signIn", "auth.fetchAccessTokenWithRefreshToken", "auth.signUpWithEmailAndPassword", "auth.activateEndUserMail", "auth.sendPasswordResetEmail", "auth.resetPasswordWithToken", "auth.isUsernameRegistered"], Je = { "X-SDK-Version": "1.3.5" };
-  function He(e, t2, n2) {
-    const s2 = e[t2];
-    e[t2] = function(t3) {
+  const He = ["auth.getJwt", "auth.logout", "auth.signInWithTicket", "auth.signInAnonymously", "auth.signIn", "auth.fetchAccessTokenWithRefreshToken", "auth.signUpWithEmailAndPassword", "auth.activateEndUserMail", "auth.sendPasswordResetEmail", "auth.resetPasswordWithToken", "auth.isUsernameRegistered"], ze = { "X-SDK-Version": "1.3.5" };
+  function Je(e2, t2, n2) {
+    const s2 = e2[t2];
+    e2[t2] = function(t3) {
       const r2 = {}, i2 = {};
       n2.forEach((n3) => {
-        const { data: s3, headers: o3 } = n3.call(e, t3);
+        const { data: s3, headers: o3 } = n3.call(e2, t3);
         Object.assign(r2, s3), Object.assign(i2, o3);
       });
       const o2 = t3.data;
       return o2 && (() => {
-        var e2;
-        if (e2 = o2, "[object FormData]" !== Object.prototype.toString.call(e2))
+        var e3;
+        if (e3 = o2, "[object FormData]" !== Object.prototype.toString.call(e3))
           t3.data = { ...o2, ...r2 };
         else
-          for (const e3 in r2)
-            o2.append(e3, r2[e3]);
-      })(), t3.headers = { ...t3.headers || {}, ...i2 }, s2.call(e, t3);
+          for (const e4 in r2)
+            o2.append(e4, r2[e4]);
+      })(), t3.headers = { ...t3.headers || {}, ...i2 }, s2.call(e2, t3);
     };
   }
-  function Ge() {
-    const e = Math.random().toString(16).slice(2);
-    return { data: { seqId: e }, headers: { ...Je, "x-seqid": e } };
+  function Ve() {
+    const e2 = Math.random().toString(16).slice(2);
+    return { data: { seqId: e2 }, headers: { ...ze, "x-seqid": e2 } };
   }
-  class Ve {
-    constructor(e = {}) {
+  class Ge {
+    constructor(e2 = {}) {
       var t2;
-      this.config = e, this._reqClass = new Ce.adapter.reqClass({ timeout: this.config.timeout, timeoutMsg: `请求在${this.config.timeout / 1e3}s内未完成，已中断`, restrictedMethods: ["post"] }), this._cache = Re(this.config.env), this._localCache = (t2 = this.config.env, xe[t2]), He(this._reqClass, "post", [Ge]), He(this._reqClass, "upload", [Ge]), He(this._reqClass, "download", [Ge]);
+      this.config = e2, this._reqClass = new Ae.adapter.reqClass({ timeout: this.config.timeout, timeoutMsg: `请求在${this.config.timeout / 1e3}s内未完成，已中断`, restrictedMethods: ["post"] }), this._cache = Le(this.config.env), this._localCache = (t2 = this.config.env, Ee[t2]), Je(this._reqClass, "post", [Ve]), Je(this._reqClass, "upload", [Ve]), Je(this._reqClass, "download", [Ve]);
     }
-    async post(e) {
-      return await this._reqClass.post(e);
+    async post(e2) {
+      return await this._reqClass.post(e2);
     }
-    async upload(e) {
-      return await this._reqClass.upload(e);
+    async upload(e2) {
+      return await this._reqClass.upload(e2);
     }
-    async download(e) {
-      return await this._reqClass.download(e);
+    async download(e2) {
+      return await this._reqClass.download(e2);
     }
     async refreshAccessToken() {
-      let e, t2;
+      let e2, t2;
       this._refreshAccessTokenPromise || (this._refreshAccessTokenPromise = this._refreshAccessToken());
       try {
-        e = await this._refreshAccessTokenPromise;
-      } catch (e2) {
-        t2 = e2;
+        e2 = await this._refreshAccessTokenPromise;
+      } catch (e3) {
+        t2 = e3;
       }
       if (this._refreshAccessTokenPromise = null, this._shouldRefreshAccessTokenHook = null, t2)
         throw t2;
-      return e;
+      return e2;
     }
     async _refreshAccessToken() {
-      const { accessTokenKey: e, accessTokenExpireKey: t2, refreshTokenKey: n2, loginTypeKey: s2, anonymousUuidKey: r2 } = this._cache.keys;
-      this._cache.removeStore(e), this._cache.removeStore(t2);
+      const { accessTokenKey: e2, accessTokenExpireKey: t2, refreshTokenKey: n2, loginTypeKey: s2, anonymousUuidKey: r2 } = this._cache.keys;
+      this._cache.removeStore(e2), this._cache.removeStore(t2);
       let i2 = this._cache.getStore(n2);
       if (!i2)
-        throw new ne({ message: "未登录CloudBase" });
+        throw new te({ message: "未登录CloudBase" });
       const o2 = { refresh_token: i2 }, a2 = await this.request("auth.fetchAccessTokenWithRefreshToken", o2);
       if (a2.data.code) {
-        const { code: e2 } = a2.data;
-        if ("SIGN_PARAM_INVALID" === e2 || "REFRESH_TOKEN_EXPIRED" === e2 || "INVALID_REFRESH_TOKEN" === e2) {
-          if (this._cache.getStore(s2) === We.ANONYMOUS && "INVALID_REFRESH_TOKEN" === e2) {
-            const e3 = this._cache.getStore(r2), t3 = this._cache.getStore(n2), s3 = await this.send("auth.signInAnonymously", { anonymous_uuid: e3, refresh_token: t3 });
+        const { code: e3 } = a2.data;
+        if ("SIGN_PARAM_INVALID" === e3 || "REFRESH_TOKEN_EXPIRED" === e3 || "INVALID_REFRESH_TOKEN" === e3) {
+          if (this._cache.getStore(s2) === We.ANONYMOUS && "INVALID_REFRESH_TOKEN" === e3) {
+            const e4 = this._cache.getStore(r2), t3 = this._cache.getStore(n2), s3 = await this.send("auth.signInAnonymously", { anonymous_uuid: e4, refresh_token: t3 });
             return this.setRefreshToken(s3.refresh_token), this._refreshAccessToken();
           }
-          Fe(Ke), this._cache.removeStore(n2);
+          Me(Ke), this._cache.removeStore(n2);
         }
-        throw new ne({ code: a2.data.code, message: `刷新access token失败：${a2.data.code}` });
+        throw new te({ code: a2.data.code, message: `刷新access token失败：${a2.data.code}` });
       }
       if (a2.data.access_token)
-        return Fe($e), this._cache.setStore(e, a2.data.access_token), this._cache.setStore(t2, a2.data.access_token_expire + Date.now()), { accessToken: a2.data.access_token, accessTokenExpire: a2.data.access_token_expire };
+        return Me($e), this._cache.setStore(e2, a2.data.access_token), this._cache.setStore(t2, a2.data.access_token_expire + Date.now()), { accessToken: a2.data.access_token, accessTokenExpire: a2.data.access_token_expire };
       a2.data.refresh_token && (this._cache.removeStore(n2), this._cache.setStore(n2, a2.data.refresh_token), this._refreshAccessToken());
     }
     async getAccessToken() {
-      const { accessTokenKey: e, accessTokenExpireKey: t2, refreshTokenKey: n2 } = this._cache.keys;
+      const { accessTokenKey: e2, accessTokenExpireKey: t2, refreshTokenKey: n2 } = this._cache.keys;
       if (!this._cache.getStore(n2))
-        throw new ne({ message: "refresh token不存在，登录状态异常" });
-      let s2 = this._cache.getStore(e), r2 = this._cache.getStore(t2), i2 = true;
+        throw new te({ message: "refresh token不存在，登录状态异常" });
+      let s2 = this._cache.getStore(e2), r2 = this._cache.getStore(t2), i2 = true;
       return this._shouldRefreshAccessTokenHook && !await this._shouldRefreshAccessTokenHook(s2, r2) && (i2 = false), (!s2 || !r2 || r2 < Date.now()) && i2 ? this.refreshAccessToken() : { accessToken: s2, accessTokenExpire: r2 };
     }
-    async request(e, t2, n2) {
+    async request(e2, t2, n2) {
       const s2 = `x-tcb-trace_${this.config.env}`;
       let r2 = "application/x-www-form-urlencoded";
-      const i2 = { action: e, env: this.config.env, dataVersion: "2019-08-16", ...t2 };
-      if (-1 === ze.indexOf(e)) {
-        const { refreshTokenKey: e2 } = this._cache.keys;
-        this._cache.getStore(e2) && (i2.access_token = (await this.getAccessToken()).accessToken);
+      const i2 = { action: e2, env: this.config.env, dataVersion: "2019-08-16", ...t2 };
+      if (-1 === He.indexOf(e2)) {
+        const { refreshTokenKey: e3 } = this._cache.keys;
+        this._cache.getStore(e3) && (i2.access_token = (await this.getAccessToken()).accessToken);
       }
       let o2;
-      if ("storage.uploadFile" === e) {
+      if ("storage.uploadFile" === e2) {
         o2 = new FormData();
-        for (let e2 in o2)
-          o2.hasOwnProperty(e2) && void 0 !== o2[e2] && o2.append(e2, i2[e2]);
+        for (let e3 in o2)
+          o2.hasOwnProperty(e3) && void 0 !== o2[e3] && o2.append(e3, i2[e3]);
         r2 = "multipart/form-data";
       } else {
         r2 = "application/json", o2 = {};
-        for (let e2 in i2)
-          void 0 !== i2[e2] && (o2[e2] = i2[e2]);
+        for (let e3 in i2)
+          void 0 !== i2[e3] && (o2[e3] = i2[e3]);
       }
       let a2 = { headers: { "content-type": r2 } };
       n2 && n2.onUploadProgress && (a2.onUploadProgress = n2.onUploadProgress);
       const c2 = this._localCache.getStore(s2);
       c2 && (a2.headers["X-TCB-Trace"] = c2);
-      const { parse: u2, inQuery: h2, search: l2 } = t2;
+      const { parse: u2, inQuery: l2, search: h2 } = t2;
       let d2 = { env: this.config.env };
-      u2 && (d2.parse = true), h2 && (d2 = { ...h2, ...d2 });
-      let p2 = function(e2, t3, n3 = {}) {
+      u2 && (d2.parse = true), l2 && (d2 = { ...l2, ...d2 });
+      let p2 = function(e3, t3, n3 = {}) {
         const s3 = /\?/.test(t3);
         let r3 = "";
-        for (let e3 in n3)
-          "" === r3 ? !s3 && (t3 += "?") : r3 += "&", r3 += `${e3}=${encodeURIComponent(n3[e3])}`;
-        return /^http(s)?\:\/\//.test(t3 += r3) ? t3 : `${e2}${t3}`;
-      }(ye, "//tcb-api.tencentcloudapi.com/web", d2);
-      l2 && (p2 += l2);
+        for (let e4 in n3)
+          "" === r3 ? !s3 && (t3 += "?") : r3 += "&", r3 += `${e4}=${encodeURIComponent(n3[e4])}`;
+        return /^http(s)?\:\/\//.test(t3 += r3) ? t3 : `${e3}${t3}`;
+      }(fe, "//tcb-api.tencentcloudapi.com/web", d2);
+      h2 && (p2 += h2);
       const f2 = await this.post({ url: p2, data: o2, ...a2 }), g2 = f2.header && f2.header["x-tcb-trace"];
       if (g2 && this._localCache.setStore(s2, g2), 200 !== Number(f2.status) && 200 !== Number(f2.statusCode) || !f2.data)
-        throw new ne({ code: "NETWORK_ERROR", message: "network request error" });
+        throw new te({ code: "NETWORK_ERROR", message: "network request error" });
       return f2;
     }
-    async send(e, t2 = {}) {
-      const n2 = await this.request(e, t2, { onUploadProgress: t2.onUploadProgress });
-      if ("ACCESS_TOKEN_EXPIRED" === n2.data.code && -1 === ze.indexOf(e)) {
+    async send(e2, t2 = {}) {
+      const n2 = await this.request(e2, t2, { onUploadProgress: t2.onUploadProgress });
+      if ("ACCESS_TOKEN_EXPIRED" === n2.data.code && -1 === He.indexOf(e2)) {
         await this.refreshAccessToken();
-        const n3 = await this.request(e, t2, { onUploadProgress: t2.onUploadProgress });
+        const n3 = await this.request(e2, t2, { onUploadProgress: t2.onUploadProgress });
         if (n3.data.code)
-          throw new ne({ code: n3.data.code, message: n3.data.message });
+          throw new te({ code: n3.data.code, message: n3.data.message });
         return n3.data;
       }
       if (n2.data.code)
-        throw new ne({ code: n2.data.code, message: n2.data.message });
+        throw new te({ code: n2.data.code, message: n2.data.message });
       return n2.data;
     }
-    setRefreshToken(e) {
+    setRefreshToken(e2) {
       const { accessTokenKey: t2, accessTokenExpireKey: n2, refreshTokenKey: s2 } = this._cache.keys;
-      this._cache.removeStore(t2), this._cache.removeStore(n2), this._cache.setStore(s2, e);
+      this._cache.removeStore(t2), this._cache.removeStore(n2), this._cache.setStore(s2, e2);
     }
   }
   const Ye = {};
-  function Qe(e) {
-    return Ye[e];
+  function Qe(e2) {
+    return Ye[e2];
   }
   class Xe {
-    constructor(e) {
-      this.config = e, this._cache = Re(e.env), this._request = Qe(e.env);
+    constructor(e2) {
+      this.config = e2, this._cache = Le(e2.env), this._request = Qe(e2.env);
     }
-    setRefreshToken(e) {
+    setRefreshToken(e2) {
       const { accessTokenKey: t2, accessTokenExpireKey: n2, refreshTokenKey: s2 } = this._cache.keys;
-      this._cache.removeStore(t2), this._cache.removeStore(n2), this._cache.setStore(s2, e);
+      this._cache.removeStore(t2), this._cache.removeStore(n2), this._cache.setStore(s2, e2);
     }
-    setAccessToken(e, t2) {
+    setAccessToken(e2, t2) {
       const { accessTokenKey: n2, accessTokenExpireKey: s2 } = this._cache.keys;
-      this._cache.setStore(n2, e), this._cache.setStore(s2, t2);
+      this._cache.setStore(n2, e2), this._cache.setStore(s2, t2);
     }
     async refreshUserInfo() {
-      const { data: e } = await this._request.send("auth.getUserInfo", {});
-      return this.setLocalUserInfo(e), e;
+      const { data: e2 } = await this._request.send("auth.getUserInfo", {});
+      return this.setLocalUserInfo(e2), e2;
     }
-    setLocalUserInfo(e) {
+    setLocalUserInfo(e2) {
       const { userInfoKey: t2 } = this._cache.keys;
-      this._cache.setStore(t2, e);
+      this._cache.setStore(t2, e2);
     }
   }
   class Ze {
-    constructor(e) {
-      if (!e)
-        throw new ne({ code: "PARAM_ERROR", message: "envId is not defined" });
-      this._envId = e, this._cache = Re(this._envId), this._request = Qe(this._envId), this.setUserInfo();
+    constructor(e2) {
+      if (!e2)
+        throw new te({ code: "PARAM_ERROR", message: "envId is not defined" });
+      this._envId = e2, this._cache = Le(this._envId), this._request = Qe(this._envId), this.setUserInfo();
     }
-    linkWithTicket(e) {
-      if ("string" != typeof e)
-        throw new ne({ code: "PARAM_ERROR", message: "ticket must be string" });
-      return this._request.send("auth.linkWithTicket", { ticket: e });
+    linkWithTicket(e2) {
+      if ("string" != typeof e2)
+        throw new te({ code: "PARAM_ERROR", message: "ticket must be string" });
+      return this._request.send("auth.linkWithTicket", { ticket: e2 });
     }
-    linkWithRedirect(e) {
-      e.signInWithRedirect();
+    linkWithRedirect(e2) {
+      e2.signInWithRedirect();
     }
-    updatePassword(e, t2) {
-      return this._request.send("auth.updatePassword", { oldPassword: t2, newPassword: e });
+    updatePassword(e2, t2) {
+      return this._request.send("auth.updatePassword", { oldPassword: t2, newPassword: e2 });
     }
-    updateEmail(e) {
-      return this._request.send("auth.updateEmail", { newEmail: e });
+    updateEmail(e2) {
+      return this._request.send("auth.updateEmail", { newEmail: e2 });
     }
-    updateUsername(e) {
-      if ("string" != typeof e)
-        throw new ne({ code: "PARAM_ERROR", message: "username must be a string" });
-      return this._request.send("auth.updateUsername", { username: e });
+    updateUsername(e2) {
+      if ("string" != typeof e2)
+        throw new te({ code: "PARAM_ERROR", message: "username must be a string" });
+      return this._request.send("auth.updateUsername", { username: e2 });
     }
     async getLinkedUidList() {
-      const { data: e } = await this._request.send("auth.getLinkedUidList", {});
+      const { data: e2 } = await this._request.send("auth.getLinkedUidList", {});
       let t2 = false;
-      const { users: n2 } = e;
-      return n2.forEach((e2) => {
-        e2.wxOpenId && e2.wxPublicId && (t2 = true);
+      const { users: n2 } = e2;
+      return n2.forEach((e3) => {
+        e3.wxOpenId && e3.wxPublicId && (t2 = true);
       }), { users: n2, hasPrimaryUid: t2 };
     }
-    setPrimaryUid(e) {
-      return this._request.send("auth.setPrimaryUid", { uid: e });
+    setPrimaryUid(e2) {
+      return this._request.send("auth.setPrimaryUid", { uid: e2 });
     }
-    unlink(e) {
-      return this._request.send("auth.unlink", { platform: e });
+    unlink(e2) {
+      return this._request.send("auth.unlink", { platform: e2 });
     }
-    async update(e) {
-      const { nickName: t2, gender: n2, avatarUrl: s2, province: r2, country: i2, city: o2 } = e, { data: a2 } = await this._request.send("auth.updateUserInfo", { nickName: t2, gender: n2, avatarUrl: s2, province: r2, country: i2, city: o2 });
+    async update(e2) {
+      const { nickName: t2, gender: n2, avatarUrl: s2, province: r2, country: i2, city: o2 } = e2, { data: a2 } = await this._request.send("auth.updateUserInfo", { nickName: t2, gender: n2, avatarUrl: s2, province: r2, country: i2, city: o2 });
       this.setLocalUserInfo(a2);
     }
     async refresh() {
-      const { data: e } = await this._request.send("auth.getUserInfo", {});
-      return this.setLocalUserInfo(e), e;
+      const { data: e2 } = await this._request.send("auth.getUserInfo", {});
+      return this.setLocalUserInfo(e2), e2;
     }
     setUserInfo() {
-      const { userInfoKey: e } = this._cache.keys, t2 = this._cache.getStore(e);
-      ["uid", "loginType", "openid", "wxOpenId", "wxPublicId", "unionId", "qqMiniOpenId", "email", "hasPassword", "customUserId", "nickName", "gender", "avatarUrl"].forEach((e2) => {
-        this[e2] = t2[e2];
+      const { userInfoKey: e2 } = this._cache.keys, t2 = this._cache.getStore(e2);
+      ["uid", "loginType", "openid", "wxOpenId", "wxPublicId", "unionId", "qqMiniOpenId", "email", "hasPassword", "customUserId", "nickName", "gender", "avatarUrl"].forEach((e3) => {
+        this[e3] = t2[e3];
       }), this.location = { country: t2.country, province: t2.province, city: t2.city };
     }
-    setLocalUserInfo(e) {
+    setLocalUserInfo(e2) {
       const { userInfoKey: t2 } = this._cache.keys;
-      this._cache.setStore(t2, e), this.setUserInfo();
+      this._cache.setStore(t2, e2), this.setUserInfo();
     }
   }
   class et {
-    constructor(e) {
-      if (!e)
-        throw new ne({ code: "PARAM_ERROR", message: "envId is not defined" });
-      this._cache = Re(e);
+    constructor(e2) {
+      if (!e2)
+        throw new te({ code: "PARAM_ERROR", message: "envId is not defined" });
+      this._cache = Le(e2);
       const { refreshTokenKey: t2, accessTokenKey: n2, accessTokenExpireKey: s2 } = this._cache.keys, r2 = this._cache.getStore(t2), i2 = this._cache.getStore(n2), o2 = this._cache.getStore(s2);
-      this.credential = { refreshToken: r2, accessToken: i2, accessTokenExpire: o2 }, this.user = new Ze(e);
+      this.credential = { refreshToken: r2, accessToken: i2, accessTokenExpire: o2 }, this.user = new Ze(e2);
     }
     get isAnonymousAuth() {
       return this.loginType === We.ANONYMOUS;
@@ -12663,72 +13468,72 @@ This will fail in production.`);
   class tt extends Xe {
     async signIn() {
       this._cache.updatePersistence("local");
-      const { anonymousUuidKey: e, refreshTokenKey: t2 } = this._cache.keys, n2 = this._cache.getStore(e) || void 0, s2 = this._cache.getStore(t2) || void 0, r2 = await this._request.send("auth.signInAnonymously", { anonymous_uuid: n2, refresh_token: s2 });
+      const { anonymousUuidKey: e2, refreshTokenKey: t2 } = this._cache.keys, n2 = this._cache.getStore(e2) || void 0, s2 = this._cache.getStore(t2) || void 0, r2 = await this._request.send("auth.signInAnonymously", { anonymous_uuid: n2, refresh_token: s2 });
       if (r2.uuid && r2.refresh_token) {
-        this._setAnonymousUUID(r2.uuid), this.setRefreshToken(r2.refresh_token), await this._request.refreshAccessToken(), Fe(qe), Fe(je, { env: this.config.env, loginType: We.ANONYMOUS, persistence: "local" });
-        const e2 = new et(this.config.env);
-        return await e2.user.refresh(), e2;
+        this._setAnonymousUUID(r2.uuid), this.setRefreshToken(r2.refresh_token), await this._request.refreshAccessToken(), Me(Fe), Me(je, { env: this.config.env, loginType: We.ANONYMOUS, persistence: "local" });
+        const e3 = new et(this.config.env);
+        return await e3.user.refresh(), e3;
       }
-      throw new ne({ message: "匿名登录失败" });
+      throw new te({ message: "匿名登录失败" });
     }
-    async linkAndRetrieveDataWithTicket(e) {
-      const { anonymousUuidKey: t2, refreshTokenKey: n2 } = this._cache.keys, s2 = this._cache.getStore(t2), r2 = this._cache.getStore(n2), i2 = await this._request.send("auth.linkAndRetrieveDataWithTicket", { anonymous_uuid: s2, refresh_token: r2, ticket: e });
+    async linkAndRetrieveDataWithTicket(e2) {
+      const { anonymousUuidKey: t2, refreshTokenKey: n2 } = this._cache.keys, s2 = this._cache.getStore(t2), r2 = this._cache.getStore(n2), i2 = await this._request.send("auth.linkAndRetrieveDataWithTicket", { anonymous_uuid: s2, refresh_token: r2, ticket: e2 });
       if (i2.refresh_token)
-        return this._clearAnonymousUUID(), this.setRefreshToken(i2.refresh_token), await this._request.refreshAccessToken(), Fe(Be, { env: this.config.env }), Fe(je, { loginType: We.CUSTOM, persistence: "local" }), { credential: { refreshToken: i2.refresh_token } };
-      throw new ne({ message: "匿名转化失败" });
+        return this._clearAnonymousUUID(), this.setRefreshToken(i2.refresh_token), await this._request.refreshAccessToken(), Me(Be, { env: this.config.env }), Me(je, { loginType: We.CUSTOM, persistence: "local" }), { credential: { refreshToken: i2.refresh_token } };
+      throw new te({ message: "匿名转化失败" });
     }
-    _setAnonymousUUID(e) {
+    _setAnonymousUUID(e2) {
       const { anonymousUuidKey: t2, loginTypeKey: n2 } = this._cache.keys;
-      this._cache.removeStore(t2), this._cache.setStore(t2, e), this._cache.setStore(n2, We.ANONYMOUS);
+      this._cache.removeStore(t2), this._cache.setStore(t2, e2), this._cache.setStore(n2, We.ANONYMOUS);
     }
     _clearAnonymousUUID() {
       this._cache.removeStore(this._cache.keys.anonymousUuidKey);
     }
   }
   class nt extends Xe {
-    async signIn(e) {
-      if ("string" != typeof e)
-        throw new ne({ code: "PARAM_ERROR", message: "ticket must be a string" });
-      const { refreshTokenKey: t2 } = this._cache.keys, n2 = await this._request.send("auth.signInWithTicket", { ticket: e, refresh_token: this._cache.getStore(t2) || "" });
+    async signIn(e2) {
+      if ("string" != typeof e2)
+        throw new te({ code: "PARAM_ERROR", message: "ticket must be a string" });
+      const { refreshTokenKey: t2 } = this._cache.keys, n2 = await this._request.send("auth.signInWithTicket", { ticket: e2, refresh_token: this._cache.getStore(t2) || "" });
       if (n2.refresh_token)
-        return this.setRefreshToken(n2.refresh_token), await this._request.refreshAccessToken(), Fe(qe), Fe(je, { env: this.config.env, loginType: We.CUSTOM, persistence: this.config.persistence }), await this.refreshUserInfo(), new et(this.config.env);
-      throw new ne({ message: "自定义登录失败" });
+        return this.setRefreshToken(n2.refresh_token), await this._request.refreshAccessToken(), Me(Fe), Me(je, { env: this.config.env, loginType: We.CUSTOM, persistence: this.config.persistence }), await this.refreshUserInfo(), new et(this.config.env);
+      throw new te({ message: "自定义登录失败" });
     }
   }
   class st extends Xe {
-    async signIn(e, t2) {
-      if ("string" != typeof e)
-        throw new ne({ code: "PARAM_ERROR", message: "email must be a string" });
-      const { refreshTokenKey: n2 } = this._cache.keys, s2 = await this._request.send("auth.signIn", { loginType: "EMAIL", email: e, password: t2, refresh_token: this._cache.getStore(n2) || "" }), { refresh_token: r2, access_token: i2, access_token_expire: o2 } = s2;
+    async signIn(e2, t2) {
+      if ("string" != typeof e2)
+        throw new te({ code: "PARAM_ERROR", message: "email must be a string" });
+      const { refreshTokenKey: n2 } = this._cache.keys, s2 = await this._request.send("auth.signIn", { loginType: "EMAIL", email: e2, password: t2, refresh_token: this._cache.getStore(n2) || "" }), { refresh_token: r2, access_token: i2, access_token_expire: o2 } = s2;
       if (r2)
-        return this.setRefreshToken(r2), i2 && o2 ? this.setAccessToken(i2, o2) : await this._request.refreshAccessToken(), await this.refreshUserInfo(), Fe(qe), Fe(je, { env: this.config.env, loginType: We.EMAIL, persistence: this.config.persistence }), new et(this.config.env);
-      throw s2.code ? new ne({ code: s2.code, message: `邮箱登录失败: ${s2.message}` }) : new ne({ message: "邮箱登录失败" });
+        return this.setRefreshToken(r2), i2 && o2 ? this.setAccessToken(i2, o2) : await this._request.refreshAccessToken(), await this.refreshUserInfo(), Me(Fe), Me(je, { env: this.config.env, loginType: We.EMAIL, persistence: this.config.persistence }), new et(this.config.env);
+      throw s2.code ? new te({ code: s2.code, message: `邮箱登录失败: ${s2.message}` }) : new te({ message: "邮箱登录失败" });
     }
-    async activate(e) {
-      return this._request.send("auth.activateEndUserMail", { token: e });
+    async activate(e2) {
+      return this._request.send("auth.activateEndUserMail", { token: e2 });
     }
-    async resetPasswordWithToken(e, t2) {
-      return this._request.send("auth.resetPasswordWithToken", { token: e, newPassword: t2 });
+    async resetPasswordWithToken(e2, t2) {
+      return this._request.send("auth.resetPasswordWithToken", { token: e2, newPassword: t2 });
     }
   }
   class rt extends Xe {
-    async signIn(e, t2) {
-      if ("string" != typeof e)
-        throw new ne({ code: "PARAM_ERROR", message: "username must be a string" });
+    async signIn(e2, t2) {
+      if ("string" != typeof e2)
+        throw new te({ code: "PARAM_ERROR", message: "username must be a string" });
       "string" != typeof t2 && (t2 = "", console.warn("password is empty"));
-      const { refreshTokenKey: n2 } = this._cache.keys, s2 = await this._request.send("auth.signIn", { loginType: We.USERNAME, username: e, password: t2, refresh_token: this._cache.getStore(n2) || "" }), { refresh_token: r2, access_token_expire: i2, access_token: o2 } = s2;
+      const { refreshTokenKey: n2 } = this._cache.keys, s2 = await this._request.send("auth.signIn", { loginType: We.USERNAME, username: e2, password: t2, refresh_token: this._cache.getStore(n2) || "" }), { refresh_token: r2, access_token_expire: i2, access_token: o2 } = s2;
       if (r2)
-        return this.setRefreshToken(r2), o2 && i2 ? this.setAccessToken(o2, i2) : await this._request.refreshAccessToken(), await this.refreshUserInfo(), Fe(qe), Fe(je, { env: this.config.env, loginType: We.USERNAME, persistence: this.config.persistence }), new et(this.config.env);
-      throw s2.code ? new ne({ code: s2.code, message: `用户名密码登录失败: ${s2.message}` }) : new ne({ message: "用户名密码登录失败" });
+        return this.setRefreshToken(r2), o2 && i2 ? this.setAccessToken(o2, i2) : await this._request.refreshAccessToken(), await this.refreshUserInfo(), Me(Fe), Me(je, { env: this.config.env, loginType: We.USERNAME, persistence: this.config.persistence }), new et(this.config.env);
+      throw s2.code ? new te({ code: s2.code, message: `用户名密码登录失败: ${s2.message}` }) : new te({ message: "用户名密码登录失败" });
     }
   }
   class it {
-    constructor(e) {
-      this.config = e, this._cache = Re(e.env), this._request = Qe(e.env), this._onAnonymousConverted = this._onAnonymousConverted.bind(this), this._onLoginTypeChanged = this._onLoginTypeChanged.bind(this), De(je, this._onLoginTypeChanged);
+    constructor(e2) {
+      this.config = e2, this._cache = Le(e2.env), this._request = Qe(e2.env), this._onAnonymousConverted = this._onAnonymousConverted.bind(this), this._onLoginTypeChanged = this._onLoginTypeChanged.bind(this), De(je, this._onLoginTypeChanged);
     }
     get currentUser() {
-      const e = this.hasLoginState();
-      return e && e.user || null;
+      const e2 = this.hasLoginState();
+      return e2 && e2.user || null;
     }
     get loginType() {
       return this._cache.getStore(this._cache.keys.loginTypeKey);
@@ -12748,183 +13553,183 @@ This will fail in production.`);
     async signInAnonymously() {
       return new tt(this.config).signIn();
     }
-    async signInWithEmailAndPassword(e, t2) {
-      return new st(this.config).signIn(e, t2);
+    async signInWithEmailAndPassword(e2, t2) {
+      return new st(this.config).signIn(e2, t2);
     }
-    signInWithUsernameAndPassword(e, t2) {
-      return new rt(this.config).signIn(e, t2);
+    signInWithUsernameAndPassword(e2, t2) {
+      return new rt(this.config).signIn(e2, t2);
     }
-    async linkAndRetrieveDataWithTicket(e) {
+    async linkAndRetrieveDataWithTicket(e2) {
       this._anonymousAuthProvider || (this._anonymousAuthProvider = new tt(this.config)), De(Be, this._onAnonymousConverted);
-      return await this._anonymousAuthProvider.linkAndRetrieveDataWithTicket(e);
+      return await this._anonymousAuthProvider.linkAndRetrieveDataWithTicket(e2);
     }
     async signOut() {
       if (this.loginType === We.ANONYMOUS)
-        throw new ne({ message: "匿名用户不支持登出操作" });
-      const { refreshTokenKey: e, accessTokenKey: t2, accessTokenExpireKey: n2 } = this._cache.keys, s2 = this._cache.getStore(e);
+        throw new te({ message: "匿名用户不支持登出操作" });
+      const { refreshTokenKey: e2, accessTokenKey: t2, accessTokenExpireKey: n2 } = this._cache.keys, s2 = this._cache.getStore(e2);
       if (!s2)
         return;
       const r2 = await this._request.send("auth.logout", { refresh_token: s2 });
-      return this._cache.removeStore(e), this._cache.removeStore(t2), this._cache.removeStore(n2), Fe(qe), Fe(je, { env: this.config.env, loginType: We.NULL, persistence: this.config.persistence }), r2;
+      return this._cache.removeStore(e2), this._cache.removeStore(t2), this._cache.removeStore(n2), Me(Fe), Me(je, { env: this.config.env, loginType: We.NULL, persistence: this.config.persistence }), r2;
     }
-    async signUpWithEmailAndPassword(e, t2) {
-      return this._request.send("auth.signUpWithEmailAndPassword", { email: e, password: t2 });
+    async signUpWithEmailAndPassword(e2, t2) {
+      return this._request.send("auth.signUpWithEmailAndPassword", { email: e2, password: t2 });
     }
-    async sendPasswordResetEmail(e) {
-      return this._request.send("auth.sendPasswordResetEmail", { email: e });
+    async sendPasswordResetEmail(e2) {
+      return this._request.send("auth.sendPasswordResetEmail", { email: e2 });
     }
-    onLoginStateChanged(e) {
-      De(qe, () => {
+    onLoginStateChanged(e2) {
+      De(Fe, () => {
         const t3 = this.hasLoginState();
-        e.call(this, t3);
+        e2.call(this, t3);
       });
       const t2 = this.hasLoginState();
-      e.call(this, t2);
+      e2.call(this, t2);
     }
-    onLoginStateExpired(e) {
-      De(Ke, e.bind(this));
+    onLoginStateExpired(e2) {
+      De(Ke, e2.bind(this));
     }
-    onAccessTokenRefreshed(e) {
-      De($e, e.bind(this));
+    onAccessTokenRefreshed(e2) {
+      De($e, e2.bind(this));
     }
-    onAnonymousConverted(e) {
-      De(Be, e.bind(this));
+    onAnonymousConverted(e2) {
+      De(Be, e2.bind(this));
     }
-    onLoginTypeChanged(e) {
+    onLoginTypeChanged(e2) {
       De(je, () => {
         const t2 = this.hasLoginState();
-        e.call(this, t2);
+        e2.call(this, t2);
       });
     }
     async getAccessToken() {
       return { accessToken: (await this._request.getAccessToken()).accessToken, env: this.config.env };
     }
     hasLoginState() {
-      const { refreshTokenKey: e } = this._cache.keys;
-      return this._cache.getStore(e) ? new et(this.config.env) : null;
+      const { refreshTokenKey: e2 } = this._cache.keys;
+      return this._cache.getStore(e2) ? new et(this.config.env) : null;
     }
-    async isUsernameRegistered(e) {
-      if ("string" != typeof e)
-        throw new ne({ code: "PARAM_ERROR", message: "username must be a string" });
-      const { data: t2 } = await this._request.send("auth.isUsernameRegistered", { username: e });
+    async isUsernameRegistered(e2) {
+      if ("string" != typeof e2)
+        throw new te({ code: "PARAM_ERROR", message: "username must be a string" });
+      const { data: t2 } = await this._request.send("auth.isUsernameRegistered", { username: e2 });
       return t2 && t2.isRegistered;
     }
     getLoginState() {
       return Promise.resolve(this.hasLoginState());
     }
-    async signInWithTicket(e) {
-      return new nt(this.config).signIn(e);
+    async signInWithTicket(e2) {
+      return new nt(this.config).signIn(e2);
     }
-    shouldRefreshAccessToken(e) {
-      this._request._shouldRefreshAccessTokenHook = e.bind(this);
+    shouldRefreshAccessToken(e2) {
+      this._request._shouldRefreshAccessTokenHook = e2.bind(this);
     }
     getUserInfo() {
-      return this._request.send("auth.getUserInfo", {}).then((e) => e.code ? e : { ...e.data, requestId: e.seqId });
+      return this._request.send("auth.getUserInfo", {}).then((e2) => e2.code ? e2 : { ...e2.data, requestId: e2.seqId });
     }
     getAuthHeader() {
-      const { refreshTokenKey: e, accessTokenKey: t2 } = this._cache.keys, n2 = this._cache.getStore(e);
+      const { refreshTokenKey: e2, accessTokenKey: t2 } = this._cache.keys, n2 = this._cache.getStore(e2);
       return { "x-cloudbase-credentials": this._cache.getStore(t2) + "/@@/" + n2 };
     }
-    _onAnonymousConverted(e) {
-      const { env: t2 } = e.data;
+    _onAnonymousConverted(e2) {
+      const { env: t2 } = e2.data;
       t2 === this.config.env && this._cache.updatePersistence(this.config.persistence);
     }
-    _onLoginTypeChanged(e) {
-      const { loginType: t2, persistence: n2, env: s2 } = e.data;
+    _onLoginTypeChanged(e2) {
+      const { loginType: t2, persistence: n2, env: s2 } = e2.data;
       s2 === this.config.env && (this._cache.updatePersistence(n2), this._cache.setStore(this._cache.keys.loginTypeKey, t2));
     }
   }
-  const ot = function(e, t2) {
+  const ot = function(e2, t2) {
     t2 = t2 || ve();
-    const n2 = Qe(this.config.env), { cloudPath: s2, filePath: r2, onUploadProgress: i2, fileType: o2 = "image" } = e;
-    return n2.send("storage.getUploadMetadata", { path: s2 }).then((e2) => {
-      const { data: { url: a2, authorization: c2, token: u2, fileId: h2, cosFileId: l2 }, requestId: d2 } = e2, p2 = { key: s2, signature: c2, "x-cos-meta-fileid": l2, success_action_status: "201", "x-cos-security-token": u2 };
-      n2.upload({ url: a2, data: p2, file: r2, name: s2, fileType: o2, onUploadProgress: i2 }).then((e3) => {
-        201 === e3.statusCode ? t2(null, { fileID: h2, requestId: d2 }) : t2(new ne({ code: "STORAGE_REQUEST_FAIL", message: `STORAGE_REQUEST_FAIL: ${e3.data}` }));
-      }).catch((e3) => {
-        t2(e3);
+    const n2 = Qe(this.config.env), { cloudPath: s2, filePath: r2, onUploadProgress: i2, fileType: o2 = "image" } = e2;
+    return n2.send("storage.getUploadMetadata", { path: s2 }).then((e3) => {
+      const { data: { url: a2, authorization: c2, token: u2, fileId: l2, cosFileId: h2 }, requestId: d2 } = e3, p2 = { key: s2, signature: c2, "x-cos-meta-fileid": h2, success_action_status: "201", "x-cos-security-token": u2 };
+      n2.upload({ url: a2, data: p2, file: r2, name: s2, fileType: o2, onUploadProgress: i2 }).then((e4) => {
+        201 === e4.statusCode ? t2(null, { fileID: l2, requestId: d2 }) : t2(new te({ code: "STORAGE_REQUEST_FAIL", message: `STORAGE_REQUEST_FAIL: ${e4.data}` }));
+      }).catch((e4) => {
+        t2(e4);
       });
-    }).catch((e2) => {
-      t2(e2);
+    }).catch((e3) => {
+      t2(e3);
     }), t2.promise;
-  }, at = function(e, t2) {
+  }, at = function(e2, t2) {
     t2 = t2 || ve();
-    const n2 = Qe(this.config.env), { cloudPath: s2 } = e;
-    return n2.send("storage.getUploadMetadata", { path: s2 }).then((e2) => {
-      t2(null, e2);
-    }).catch((e2) => {
-      t2(e2);
+    const n2 = Qe(this.config.env), { cloudPath: s2 } = e2;
+    return n2.send("storage.getUploadMetadata", { path: s2 }).then((e3) => {
+      t2(null, e3);
+    }).catch((e3) => {
+      t2(e3);
     }), t2.promise;
-  }, ct = function({ fileList: e }, t2) {
-    if (t2 = t2 || ve(), !e || !Array.isArray(e))
+  }, ct = function({ fileList: e2 }, t2) {
+    if (t2 = t2 || ve(), !e2 || !Array.isArray(e2))
       return { code: "INVALID_PARAM", message: "fileList必须是非空的数组" };
-    for (let t3 of e)
+    for (let t3 of e2)
       if (!t3 || "string" != typeof t3)
         return { code: "INVALID_PARAM", message: "fileList的元素必须是非空的字符串" };
-    const n2 = { fileid_list: e };
-    return Qe(this.config.env).send("storage.batchDeleteFile", n2).then((e2) => {
-      e2.code ? t2(null, e2) : t2(null, { fileList: e2.data.delete_list, requestId: e2.requestId });
-    }).catch((e2) => {
-      t2(e2);
+    const n2 = { fileid_list: e2 };
+    return Qe(this.config.env).send("storage.batchDeleteFile", n2).then((e3) => {
+      e3.code ? t2(null, e3) : t2(null, { fileList: e3.data.delete_list, requestId: e3.requestId });
+    }).catch((e3) => {
+      t2(e3);
     }), t2.promise;
-  }, ut = function({ fileList: e }, t2) {
-    t2 = t2 || ve(), e && Array.isArray(e) || t2(null, { code: "INVALID_PARAM", message: "fileList必须是非空的数组" });
+  }, ut = function({ fileList: e2 }, t2) {
+    t2 = t2 || ve(), e2 && Array.isArray(e2) || t2(null, { code: "INVALID_PARAM", message: "fileList必须是非空的数组" });
     let n2 = [];
-    for (let s3 of e)
+    for (let s3 of e2)
       "object" == typeof s3 ? (s3.hasOwnProperty("fileID") && s3.hasOwnProperty("maxAge") || t2(null, { code: "INVALID_PARAM", message: "fileList的元素必须是包含fileID和maxAge的对象" }), n2.push({ fileid: s3.fileID, max_age: s3.maxAge })) : "string" == typeof s3 ? n2.push({ fileid: s3 }) : t2(null, { code: "INVALID_PARAM", message: "fileList的元素必须是字符串" });
     const s2 = { file_list: n2 };
-    return Qe(this.config.env).send("storage.batchGetDownloadUrl", s2).then((e2) => {
-      e2.code ? t2(null, e2) : t2(null, { fileList: e2.data.download_list, requestId: e2.requestId });
-    }).catch((e2) => {
-      t2(e2);
+    return Qe(this.config.env).send("storage.batchGetDownloadUrl", s2).then((e3) => {
+      e3.code ? t2(null, e3) : t2(null, { fileList: e3.data.download_list, requestId: e3.requestId });
+    }).catch((e3) => {
+      t2(e3);
     }), t2.promise;
-  }, ht = async function({ fileID: e }, t2) {
-    const n2 = (await ut.call(this, { fileList: [{ fileID: e, maxAge: 600 }] })).fileList[0];
+  }, lt = async function({ fileID: e2 }, t2) {
+    const n2 = (await ut.call(this, { fileList: [{ fileID: e2, maxAge: 600 }] })).fileList[0];
     if ("SUCCESS" !== n2.code)
-      return t2 ? t2(n2) : new Promise((e2) => {
-        e2(n2);
+      return t2 ? t2(n2) : new Promise((e3) => {
+        e3(n2);
       });
     const s2 = Qe(this.config.env);
     let r2 = n2.download_url;
     if (r2 = encodeURI(r2), !t2)
       return s2.download({ url: r2 });
     t2(await s2.download({ url: r2 }));
-  }, lt = function({ name: e, data: t2, query: n2, parse: s2, search: r2 }, i2) {
+  }, ht = function({ name: e2, data: t2, query: n2, parse: s2, search: r2 }, i2) {
     const o2 = i2 || ve();
     let a2;
     try {
       a2 = t2 ? JSON.stringify(t2) : "";
-    } catch (e2) {
-      return Promise.reject(e2);
+    } catch (e3) {
+      return Promise.reject(e3);
     }
-    if (!e)
-      return Promise.reject(new ne({ code: "PARAM_ERROR", message: "函数名不能为空" }));
-    const c2 = { inQuery: n2, parse: s2, search: r2, function_name: e, request_data: a2 };
-    return Qe(this.config.env).send("functions.invokeFunction", c2).then((e2) => {
-      if (e2.code)
-        o2(null, e2);
+    if (!e2)
+      return Promise.reject(new te({ code: "PARAM_ERROR", message: "函数名不能为空" }));
+    const c2 = { inQuery: n2, parse: s2, search: r2, function_name: e2, request_data: a2 };
+    return Qe(this.config.env).send("functions.invokeFunction", c2).then((e3) => {
+      if (e3.code)
+        o2(null, e3);
       else {
-        let t3 = e2.data.response_data;
+        let t3 = e3.data.response_data;
         if (s2)
-          o2(null, { result: t3, requestId: e2.requestId });
+          o2(null, { result: t3, requestId: e3.requestId });
         else
           try {
-            t3 = JSON.parse(e2.data.response_data), o2(null, { result: t3, requestId: e2.requestId });
-          } catch (e3) {
-            o2(new ne({ message: "response data must be json" }));
+            t3 = JSON.parse(e3.data.response_data), o2(null, { result: t3, requestId: e3.requestId });
+          } catch (e4) {
+            o2(new te({ message: "response data must be json" }));
           }
       }
       return o2.promise;
-    }).catch((e2) => {
-      o2(e2);
+    }).catch((e3) => {
+      o2(e3);
     }), o2.promise;
   }, dt = { timeout: 15e3, persistence: "session" }, pt = {};
   class ft {
-    constructor(e) {
-      this.config = e || this.config, this.authObj = void 0;
+    constructor(e2) {
+      this.config = e2 || this.config, this.authObj = void 0;
     }
-    init(e) {
-      switch (Ce.adapter || (this.requestClient = new Ce.adapter.reqClass({ timeout: e.timeout || 5e3, timeoutMsg: `请求在${(e.timeout || 5e3) / 1e3}s内未完成，已中断` })), this.config = { ...dt, ...e }, true) {
+    init(e2) {
+      switch (Ae.adapter || (this.requestClient = new Ae.adapter.reqClass({ timeout: e2.timeout || 5e3, timeoutMsg: `请求在${(e2.timeout || 5e3) / 1e3}s内未完成，已中断` })), this.config = { ...dt, ...e2 }, true) {
         case this.config.timeout > 6e5:
           console.warn("timeout大于可配置上限[10分钟]，已重置为上限数值"), this.config.timeout = 6e5;
           break;
@@ -12933,93 +13738,93 @@ This will fail in production.`);
       }
       return new ft(this.config);
     }
-    auth({ persistence: e } = {}) {
+    auth({ persistence: e2 } = {}) {
       if (this.authObj)
         return this.authObj;
-      const t2 = e || Ce.adapter.primaryStorage || dt.persistence;
+      const t2 = e2 || Ae.adapter.primaryStorage || dt.persistence;
       var n2;
-      return t2 !== this.config.persistence && (this.config.persistence = t2), function(e2) {
-        const { env: t3 } = e2;
-        Oe[t3] = new Ee(e2), xe[t3] = new Ee({ ...e2, persistence: "local" });
-      }(this.config), n2 = this.config, Ye[n2.env] = new Ve(n2), this.authObj = new it(this.config), this.authObj;
+      return t2 !== this.config.persistence && (this.config.persistence = t2), function(e3) {
+        const { env: t3 } = e3;
+        Oe[t3] = new xe(e3), Ee[t3] = new xe({ ...e3, persistence: "local" });
+      }(this.config), n2 = this.config, Ye[n2.env] = new Ge(n2), this.authObj = new it(this.config), this.authObj;
     }
-    on(e, t2) {
-      return De.apply(this, [e, t2]);
+    on(e2, t2) {
+      return De.apply(this, [e2, t2]);
     }
-    off(e, t2) {
-      return Me.apply(this, [e, t2]);
+    off(e2, t2) {
+      return qe.apply(this, [e2, t2]);
     }
-    callFunction(e, t2) {
-      return lt.apply(this, [e, t2]);
+    callFunction(e2, t2) {
+      return ht.apply(this, [e2, t2]);
     }
-    deleteFile(e, t2) {
-      return ct.apply(this, [e, t2]);
+    deleteFile(e2, t2) {
+      return ct.apply(this, [e2, t2]);
     }
-    getTempFileURL(e, t2) {
-      return ut.apply(this, [e, t2]);
+    getTempFileURL(e2, t2) {
+      return ut.apply(this, [e2, t2]);
     }
-    downloadFile(e, t2) {
-      return ht.apply(this, [e, t2]);
+    downloadFile(e2, t2) {
+      return lt.apply(this, [e2, t2]);
     }
-    uploadFile(e, t2) {
-      return ot.apply(this, [e, t2]);
+    uploadFile(e2, t2) {
+      return ot.apply(this, [e2, t2]);
     }
-    getUploadMetadata(e, t2) {
-      return at.apply(this, [e, t2]);
+    getUploadMetadata(e2, t2) {
+      return at.apply(this, [e2, t2]);
     }
-    registerExtension(e) {
-      pt[e.name] = e;
+    registerExtension(e2) {
+      pt[e2.name] = e2;
     }
-    async invokeExtension(e, t2) {
-      const n2 = pt[e];
+    async invokeExtension(e2, t2) {
+      const n2 = pt[e2];
       if (!n2)
-        throw new ne({ message: `扩展${e} 必须先注册` });
+        throw new te({ message: `扩展${e2} 必须先注册` });
       return await n2.invoke(t2, this);
     }
-    useAdapters(e) {
-      const { adapter: t2, runtime: n2 } = ke(e) || {};
-      t2 && (Ce.adapter = t2), n2 && (Ce.runtime = n2);
+    useAdapters(e2) {
+      const { adapter: t2, runtime: n2 } = ke(e2) || {};
+      t2 && (Ae.adapter = t2), n2 && (Ae.runtime = n2);
     }
   }
   var gt = new ft();
-  function mt(e, t2, n2) {
+  function mt(e2, t2, n2) {
     void 0 === n2 && (n2 = {});
     var s2 = /\?/.test(t2), r2 = "";
     for (var i2 in n2)
       "" === r2 ? !s2 && (t2 += "?") : r2 += "&", r2 += i2 + "=" + encodeURIComponent(n2[i2]);
-    return /^http(s)?:\/\//.test(t2 += r2) ? t2 : "" + e + t2;
+    return /^http(s)?:\/\//.test(t2 += r2) ? t2 : "" + e2 + t2;
   }
   class yt {
-    post(e) {
-      const { url: t2, data: n2, headers: s2 } = e;
-      return new Promise((e2, r2) => {
-        se.request({ url: mt("https:", t2), data: n2, method: "POST", header: s2, success(t3) {
-          e2(t3);
-        }, fail(e3) {
-          r2(e3);
+    post(e2) {
+      const { url: t2, data: n2, headers: s2 } = e2;
+      return new Promise((e3, r2) => {
+        ne.request({ url: mt("https:", t2), data: n2, method: "POST", header: s2, success(t3) {
+          e3(t3);
+        }, fail(e4) {
+          r2(e4);
         } });
       });
     }
-    upload(e) {
+    upload(e2) {
       return new Promise((t2, n2) => {
-        const { url: s2, file: r2, data: i2, headers: o2, fileType: a2 } = e, c2 = se.uploadFile({ url: mt("https:", s2), name: "file", formData: Object.assign({}, i2), filePath: r2, fileType: a2, header: o2, success(e2) {
-          const n3 = { statusCode: e2.statusCode, data: e2.data || {} };
-          200 === e2.statusCode && i2.success_action_status && (n3.statusCode = parseInt(i2.success_action_status, 10)), t2(n3);
-        }, fail(e2) {
-          n2(new Error(e2.errMsg || "uploadFile:fail"));
+        const { url: s2, file: r2, data: i2, headers: o2, fileType: a2 } = e2, c2 = ne.uploadFile({ url: mt("https:", s2), name: "file", formData: Object.assign({}, i2), filePath: r2, fileType: a2, header: o2, success(e3) {
+          const n3 = { statusCode: e3.statusCode, data: e3.data || {} };
+          200 === e3.statusCode && i2.success_action_status && (n3.statusCode = parseInt(i2.success_action_status, 10)), t2(n3);
+        }, fail(e3) {
+          n2(new Error(e3.errMsg || "uploadFile:fail"));
         } });
-        "function" == typeof e.onUploadProgress && c2 && "function" == typeof c2.onProgressUpdate && c2.onProgressUpdate((t3) => {
-          e.onUploadProgress({ loaded: t3.totalBytesSent, total: t3.totalBytesExpectedToSend });
+        "function" == typeof e2.onUploadProgress && c2 && "function" == typeof c2.onProgressUpdate && c2.onProgressUpdate((t3) => {
+          e2.onUploadProgress({ loaded: t3.totalBytesSent, total: t3.totalBytesExpectedToSend });
         });
       });
     }
   }
-  const _t = { setItem(e, t2) {
-    se.setStorageSync(e, t2);
-  }, getItem: (e) => se.getStorageSync(e), removeItem(e) {
-    se.removeStorageSync(e);
+  const _t = { setItem(e2, t2) {
+    ne.setStorageSync(e2, t2);
+  }, getItem: (e2) => ne.getStorageSync(e2), removeItem(e2) {
+    ne.removeStorageSync(e2);
   }, clear() {
-    se.clearStorageSync();
+    ne.clearStorageSync();
   } };
   var wt = { genAdapter: function() {
     return { root: {}, reqClass: yt, localStorage: _t, primaryStorage: "local" };
@@ -13028,91 +13833,91 @@ This will fail in production.`);
   }, runtime: "uni_app" };
   gt.useAdapters(wt);
   const vt = gt, It = vt.init;
-  vt.init = function(e) {
-    e.env = e.spaceId;
-    const t2 = It.call(this, e);
-    t2.config.provider = "tencent", t2.config.spaceId = e.spaceId;
+  vt.init = function(e2) {
+    e2.env = e2.spaceId;
+    const t2 = It.call(this, e2);
+    t2.config.provider = "tencent", t2.config.spaceId = e2.spaceId;
     const n2 = t2.auth;
-    return t2.auth = function(e2) {
-      const t3 = n2.call(this, e2);
-      return ["linkAndRetrieveDataWithTicket", "signInAnonymously", "signOut", "getAccessToken", "getLoginState", "signInWithTicket", "getUserInfo"].forEach((e3) => {
+    return t2.auth = function(e3) {
+      const t3 = n2.call(this, e3);
+      return ["linkAndRetrieveDataWithTicket", "signInAnonymously", "signOut", "getAccessToken", "getLoginState", "signInWithTicket", "getUserInfo"].forEach((e4) => {
         var n3;
-        t3[e3] = (n3 = t3[e3], function(e4) {
-          e4 = e4 || {};
-          const { success: t4, fail: s2, complete: r2 } = te(e4);
+        t3[e4] = (n3 = t3[e4], function(e5) {
+          e5 = e5 || {};
+          const { success: t4, fail: s2, complete: r2 } = ee(e5);
           if (!(t4 || s2 || r2))
-            return n3.call(this, e4);
-          n3.call(this, e4).then((e5) => {
-            t4 && t4(e5), r2 && r2(e5);
-          }, (e5) => {
-            s2 && s2(e5), r2 && r2(e5);
+            return n3.call(this, e5);
+          n3.call(this, e5).then((e6) => {
+            t4 && t4(e6), r2 && r2(e6);
+          }, (e6) => {
+            s2 && s2(e6), r2 && r2(e6);
           });
         }).bind(t3);
       }), t3;
     }, t2.customAuth = t2.auth, t2;
   };
   var St = vt;
-  var bt = class extends ge {
+  var bt = class extends de {
     getAccessToken() {
-      return new Promise((e, t2) => {
+      return new Promise((e2, t2) => {
         const n2 = "Anonymous_Access_token";
-        this.setAccessToken(n2), e(n2);
+        this.setAccessToken(n2), e2(n2);
       });
     }
-    setupRequest(e, t2) {
-      const n2 = Object.assign({}, e, { spaceId: this.config.spaceId, timestamp: Date.now() }), s2 = { "Content-Type": "application/json" };
-      "auth" !== t2 && (n2.token = this.accessToken, s2["x-basement-token"] = this.accessToken), s2["x-serverless-sign"] = de.sign(n2, this.config.clientSecret);
+    setupRequest(e2, t2) {
+      const n2 = Object.assign({}, e2, { spaceId: this.config.spaceId, timestamp: Date.now() }), s2 = { "Content-Type": "application/json" };
+      "auth" !== t2 && (n2.token = this.accessToken, s2["x-basement-token"] = this.accessToken), s2["x-serverless-sign"] = he.sign(n2, this.config.clientSecret);
       const r2 = le();
       s2["x-client-info"] = encodeURIComponent(JSON.stringify(r2));
-      const { token: i2 } = ie();
+      const { token: i2 } = re();
       return s2["x-client-token"] = i2, { url: this.config.requestUrl, method: "POST", data: n2, dataType: "json", header: JSON.parse(JSON.stringify(s2)) };
     }
-    uploadFileToOSS({ url: e, formData: t2, name: n2, filePath: s2, fileType: r2, onUploadProgress: i2 }) {
+    uploadFileToOSS({ url: e2, formData: t2, name: n2, filePath: s2, fileType: r2, onUploadProgress: i2 }) {
       return new Promise((o2, a2) => {
-        const c2 = this.adapter.uploadFile({ url: e, formData: t2, name: n2, filePath: s2, fileType: r2, success(e2) {
-          e2 && e2.statusCode < 400 ? o2(e2) : a2(new ne({ code: "UPLOAD_FAILED", message: "文件上传失败" }));
-        }, fail(e2) {
-          a2(new ne({ code: e2.code || "UPLOAD_FAILED", message: e2.message || e2.errMsg || "文件上传失败" }));
+        const c2 = this.adapter.uploadFile({ url: e2, formData: t2, name: n2, filePath: s2, fileType: r2, success(e3) {
+          e3 && e3.statusCode < 400 ? o2(e3) : a2(new te({ code: "UPLOAD_FAILED", message: "文件上传失败" }));
+        }, fail(e3) {
+          a2(new te({ code: e3.code || "UPLOAD_FAILED", message: e3.message || e3.errMsg || "文件上传失败" }));
         } });
-        "function" == typeof i2 && c2 && "function" == typeof c2.onProgressUpdate && c2.onProgressUpdate((e2) => {
-          i2({ loaded: e2.totalBytesSent, total: e2.totalBytesExpectedToSend });
+        "function" == typeof i2 && c2 && "function" == typeof c2.onProgressUpdate && c2.onProgressUpdate((e3) => {
+          i2({ loaded: e3.totalBytesSent, total: e3.totalBytesExpectedToSend });
         });
       });
     }
-    uploadFile({ filePath: e, cloudPath: t2, fileType: n2 = "image", onUploadProgress: s2 }) {
+    uploadFile({ filePath: e2, cloudPath: t2, fileType: n2 = "image", onUploadProgress: s2 }) {
       if (!t2)
-        throw new ne({ code: "CLOUDPATH_REQUIRED", message: "cloudPath不可为空" });
+        throw new te({ code: "CLOUDPATH_REQUIRED", message: "cloudPath不可为空" });
       let r2;
       return this.getOSSUploadOptionsFromPath({ cloudPath: t2 }).then((t3) => {
         const { url: i2, formData: o2, name: a2 } = t3.result;
         r2 = t3.result.fileUrl;
-        const c2 = { url: i2, formData: o2, name: a2, filePath: e, fileType: n2 };
+        const c2 = { url: i2, formData: o2, name: a2, filePath: e2, fileType: n2 };
         return this.uploadFileToOSS(Object.assign({}, c2, { onUploadProgress: s2 }));
       }).then(() => this.reportOSSUpload({ cloudPath: t2 })).then((t3) => new Promise((n3, s3) => {
-        t3.success ? n3({ success: true, filePath: e, fileID: r2 }) : s3(new ne({ code: "UPLOAD_FAILED", message: "文件上传失败" }));
+        t3.success ? n3({ success: true, filePath: e2, fileID: r2 }) : s3(new te({ code: "UPLOAD_FAILED", message: "文件上传失败" }));
       }));
     }
-    deleteFile({ fileList: e }) {
-      const t2 = { method: "serverless.file.resource.delete", params: JSON.stringify({ fileList: e }) };
-      return this.request(this.setupRequest(t2)).then((e2) => {
-        if (e2.success)
-          return e2.result;
-        throw new ne({ code: "DELETE_FILE_FAILED", message: "删除文件失败" });
+    deleteFile({ fileList: e2 }) {
+      const t2 = { method: "serverless.file.resource.delete", params: JSON.stringify({ fileList: e2 }) };
+      return this.request(this.setupRequest(t2)).then((e3) => {
+        if (e3.success)
+          return e3.result;
+        throw new te({ code: "DELETE_FILE_FAILED", message: "删除文件失败" });
       });
     }
-    getTempFileURL({ fileList: e } = {}) {
-      if (!Array.isArray(e) || 0 === e.length)
-        throw new ne({ code: "INVALID_PARAM", message: "fileList的元素必须是非空的字符串" });
-      const t2 = { method: "serverless.file.resource.getTempFileURL", params: JSON.stringify({ fileList: e }) };
-      return this.request(this.setupRequest(t2)).then((e2) => {
-        if (e2.success)
-          return { fileList: e2.result.fileList.map((e3) => ({ fileID: e3.fileID, tempFileURL: e3.tempFileURL })) };
-        throw new ne({ code: "GET_TEMP_FILE_URL_FAILED", message: "获取临时文件链接失败" });
+    getTempFileURL({ fileList: e2, maxAge: t2 } = {}) {
+      if (!Array.isArray(e2) || 0 === e2.length)
+        throw new te({ code: "INVALID_PARAM", message: "fileList的元素必须是非空的字符串" });
+      const n2 = { method: "serverless.file.resource.getTempFileURL", params: JSON.stringify({ fileList: e2, maxAge: t2 }) };
+      return this.request(this.setupRequest(n2)).then((e3) => {
+        if (e3.success)
+          return { fileList: e3.result.fileList.map((e4) => ({ fileID: e4.fileID, tempFileURL: e4.tempFileURL })) };
+        throw new te({ code: "GET_TEMP_FILE_URL_FAILED", message: "获取临时文件链接失败" });
       });
     }
   };
-  var kt = { init(e) {
-    const t2 = new bt(e), n2 = { signInAnonymously: function() {
+  var kt = { init(e2) {
+    const t2 = new bt(e2), n2 = { signInAnonymously: function() {
       return t2.authorize();
     }, getLoginState: function() {
       return Promise.resolve(false);
@@ -13120,259 +13925,388 @@ This will fail in production.`);
     return t2.auth = function() {
       return n2;
     }, t2.customAuth = t2.auth, t2;
+  } }, At = n(function(e2, t2) {
+    e2.exports = r.enc.Hex;
+  });
+  function Pt(e2 = "", t2 = {}) {
+    const { data: n2, functionName: s2, method: r2, headers: i2, signHeaderKeys: o2 = [], config: a2 } = t2, c2 = Date.now(), u2 = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(e3) {
+      var t3 = 16 * Math.random() | 0;
+      return ("x" === e3 ? t3 : 3 & t3 | 8).toString(16);
+    }), l2 = Object.assign({}, i2, { "x-from-app-id": a2.appId, "x-from-env-id": a2.envId, "x-to-env-id": a2.envId, "x-from-instance-id": c2, "x-from-function-name": s2, "x-client-timestamp": c2, "x-alipay-source": "client", "x-request-id": u2, "x-alipay-callid": u2 }), h2 = ["x-from-app-id", "x-from-env-id", "x-to-env-id", "x-from-instance-id", "x-from-function-name", "x-client-timestamp"].concat(o2), [d2 = "", p2 = ""] = e2.split("?") || [], f2 = function(e3) {
+      const t3 = e3.signedHeaders.join(";"), n3 = e3.signedHeaders.map((t4) => `${t4.toLowerCase()}:${e3.headers[t4]}
+`).join(""), s3 = _e(e3.body).toString(At), r3 = `${e3.method.toUpperCase()}
+${e3.path}
+${e3.query}
+${n3}
+${t3}
+${s3}
+`, i3 = _e(r3).toString(At), o3 = `HMAC-SHA256
+${e3.timestamp}
+${i3}
+`, a3 = we(o3, e3.secretKey).toString(At);
+      return `HMAC-SHA256 Credential=${e3.secretId}, SignedHeaders=${t3}, Signature=${a3}`;
+    }({ path: d2, query: p2, method: r2, headers: l2, timestamp: c2, body: JSON.stringify(n2), secretId: a2.secretId, secretKey: a2.secretKey, signedHeaders: h2.sort() });
+    return { url: `${a2.endpoint}${e2.replace(/^\//, "")}`, headers: Object.assign({}, l2, { Authorization: f2 }) };
+  }
+  function Tt({ url: e2, data: t2, method: n2 = "POST", headers: s2 = {} }) {
+    return new Promise((r2, i2) => {
+      ne.request({ url: e2, method: n2, data: t2, header: s2, dataType: "json", complete: (e3 = {}) => {
+        if (!e3.statusCode || e3.statusCode >= 400) {
+          const { errMsg: t3 } = e3.data || {};
+          return i2(new te({ code: "SYS_ERR", message: t3 || e3.errMsg || "request:fail" }));
+        }
+        r2({ status: e3.statusCode, data: e3.data, headers: e3.header });
+      } });
+    });
+  }
+  function Ct(e2, t2) {
+    const { path: n2, data: s2, method: r2 = "GET" } = e2, { url: i2, headers: o2 } = Pt(n2, { functionName: "", data: s2, method: r2, headers: { "x-alipay-cloud-mode": "oss", "x-data-api-type": "oss", "x-expire-timestamp": Date.now() + 6e4 }, signHeaderKeys: ["x-data-api-type", "x-expire-timestamp"], config: t2 });
+    return Tt({ url: i2, data: s2, method: r2, headers: o2 }).then((e3) => {
+      const t3 = e3.data || {};
+      if (!t3.success)
+        throw new te({ code: e3.code, message: e3.message, requestId: e3.trace_id });
+      return t3.data || {};
+    }).catch((e3) => {
+      throw new te({ code: e3.errCode, message: e3.errMsg, requestId: e3.requestId });
+    });
+  }
+  function xt(e2 = "") {
+    const t2 = e2.trim().replace(/^cloud:\/\//, ""), n2 = t2.indexOf("/");
+    if (n2 <= 0)
+      throw new te({ code: "INVALID_PARAM", message: "fileID不合法" });
+    const s2 = t2.substring(0, n2), r2 = t2.substring(n2 + 1);
+    return s2 !== this.config.envId && console.warn("file ".concat(e2, " does not belong to env ").concat(this.config.envId)), r2;
+  }
+  var Ot = class {
+    constructor(e2) {
+      ["spaceId", "spaceAppId", "accessKey", "secretKey"].forEach((t3) => {
+        if (!Object.prototype.hasOwnProperty.call(e2, t3))
+          throw new Error(`${t3} required`);
+      });
+      const { spaceAppId: t2, accessKey: n2, ...s2 } = e2;
+      this.config = Object.assign({}, { endpoint: e2.endpoint || `https://${e2.envId}.api-hz.cloudbasefunction.cn/`, envId: e2.spaceId, appId: t2, secretId: n2 }, s2);
+    }
+    callFunction(e2) {
+      return function(e3, t2) {
+        const { name: n2, data: s2 } = e3, r2 = "POST", { url: i2, headers: o2 } = Pt("/functions/invokeFunction", { functionName: n2, data: s2, method: r2, headers: { "x-to-function-name": n2 }, signHeaderKeys: ["x-to-function-name"], config: t2 });
+        return Tt({ url: i2, data: s2, method: r2, headers: o2 }).then((e4) => (e4.errCode = 0, e4.success = true, e4.requestId = e4.requestID || e4.requestId, e4.result = e4.data, delete e4.requestID, delete e4.data, e4)).catch((e4) => {
+          throw new te({ code: e4.errCode, message: e4.errMsg, requestId: e4.requestId });
+        });
+      }(e2, this.config);
+    }
+    uploadFileToOSS({ url: e2, filePath: t2, fileType: n2, formData: s2, onUploadProgress: r2 }) {
+      return new Promise((i2, o2) => {
+        const a2 = ne.uploadFile({ url: e2, filePath: t2, fileType: n2, formData: s2, success(e3) {
+          e3 && e3.statusCode < 400 ? i2(e3) : o2(new te({ code: "UPLOAD_FAILED", message: "文件上传失败" }));
+        }, fail(e3) {
+          o2(new te({ code: e3.code || "UPLOAD_FAILED", message: e3.message || e3.errMsg || "文件上传失败" }));
+        } });
+        "function" == typeof r2 && a2 && "function" == typeof a2.onProgressUpdate && a2.onProgressUpdate((e3) => {
+          r2({ loaded: e3.totalBytesSent, total: e3.totalBytesExpectedToSend });
+        });
+      });
+    }
+    async uploadFile({ filePath: e2, cloudPath: t2 = "", fileType: n2 = "image", onUploadProgress: s2 }) {
+      if ("string" !== f(t2))
+        throw new te({ code: "INVALID_PARAM", message: "cloudPath必须为字符串类型" });
+      if (!(t2 = t2.trim()))
+        throw new te({ code: "INVALID_PARAM", message: "cloudPath不可为空" });
+      if (/:\/\//.test(t2))
+        throw new te({ code: "INVALID_PARAM", message: "cloudPath不合法" });
+      const r2 = await Ct({ path: "/".concat(t2.replace(/^\//, ""), "?post_url") }, this.config), { file_id: i2, upload_url: o2, form_data: a2 } = r2, c2 = a2 && a2.reduce((e3, t3) => (e3[t3.key] = t3.value, e3), {});
+      return this.uploadFileToOSS({ url: o2, filePath: e2, fileType: n2, formData: c2, onUploadProgress: s2 }).then(() => ({ fileID: i2 }));
+    }
+    async getTempFileURL({ fileList: e2 }) {
+      return new Promise((t2, n2) => {
+        (!e2 || e2.length < 0) && n2(new te({ errCode: "INVALID_PARAM", errMsg: "fileList不能为空数组" })), e2.length > 50 && n2(new te({ errCode: "INVALID_PARAM", errMsg: "fileList数组长度不能超过50" }));
+        const s2 = [];
+        for (const t3 of e2) {
+          "string" !== f(t3) && n2(new te({ errCode: "INVALID_PARAM", errMsg: "fileList的元素必须是非空的字符串" }));
+          const e3 = xt.call(this, t3);
+          s2.push({ file_id: e3, expire: 600 });
+        }
+        Ct({ path: "/?download_url", data: { file_list: s2 }, method: "POST" }, this.config).then((e3) => {
+          const { file_list: n3 = [] } = e3;
+          t2({ fileList: n3.map((e4) => ({ fileID: e4.file_id, tempFileURL: e4.download_url })) });
+        }).catch((e3) => n2(e3));
+      });
+    }
+    async deleteFile({ fileList: e2 }) {
+      return new Promise((t2, n2) => {
+        (!e2 || e2.length < 0) && n2(new te({ errCode: "INVALID_PARAM", errMsg: "fileList不能为空数组" })), e2.length > 50 && n2(new te({ errCode: "INVALID_PARAM", errMsg: "fileList数组长度不能超过50" }));
+        const s2 = [];
+        for (const t3 of e2)
+          "string" !== f(t3) && n2(new te({ errCode: "INVALID_PARAM", errMsg: "fileList的元素必须是非空的字符串" })), s2.push(xt.call(this, t3));
+        Ct({ path: "/?delete", data: { file_list: s2 }, method: "POST" }, this.config).then((e3) => {
+          const { file_list: n3 = [] } = e3;
+          t2({ fileList: n3.map((e4) => ({ fileID: e4.file_id, tempFileURL: e4.download_url })) });
+        }).catch((e3) => n2(e3));
+      });
+    }
+  };
+  var Et = { init: (e2) => {
+    e2.envId = e2.spaceId, e2.provider = "alipay";
+    const t2 = new Ot(e2);
+    return t2.auth = function() {
+      return { signInAnonymously: function() {
+        return Promise.resolve();
+      }, getLoginState: function() {
+        return Promise.resolve(true);
+      } };
+    }, t2;
   } };
-  function Ct({ data: e }) {
+  function Lt({ data: e2 }) {
     let t2;
     t2 = le();
-    const n2 = JSON.parse(JSON.stringify(e || {}));
+    const n2 = JSON.parse(JSON.stringify(e2 || {}));
     if (Object.assign(n2, { clientInfo: t2 }), !n2.uniIdToken) {
-      const { token: e2 } = ie();
-      e2 && (n2.uniIdToken = e2);
+      const { token: e3 } = re();
+      e3 && (n2.uniIdToken = e3);
     }
     return n2;
   }
-  async function Tt({ name: e, data: t2 } = {}) {
+  async function Rt({ name: e2, data: t2 } = {}) {
     await this.__dev__.initLocalNetwork();
-    const { localAddress: n2, localPort: s2 } = this.__dev__, r2 = { aliyun: "aliyun", tencent: "tcb" }[this.config.provider], i2 = this.config.spaceId, o2 = `http://${n2}:${s2}/system/check-function`, a2 = `http://${n2}:${s2}/cloudfunctions/${e}`;
+    const { localAddress: n2, localPort: s2 } = this.__dev__, r2 = { aliyun: "aliyun", tencent: "tcb", alipay: "alipay" }[this.config.provider], i2 = this.config.spaceId, o2 = `http://${n2}:${s2}/system/check-function`, a2 = `http://${n2}:${s2}/cloudfunctions/${e2}`;
     return new Promise((t3, n3) => {
-      se.request({ method: "POST", url: o2, data: { name: e, platform: P, provider: r2, spaceId: i2 }, timeout: 3e3, success(e2) {
-        t3(e2);
+      ne.request({ method: "POST", url: o2, data: { name: e2, platform: P, provider: r2, spaceId: i2 }, timeout: 3e3, success(e3) {
+        t3(e3);
       }, fail() {
         t3({ data: { code: "NETWORK_ERROR", message: "连接本地调试服务失败，请检查客户端是否和主机在同一局域网下，自动切换为已部署的云函数。" } });
       } });
-    }).then(({ data: e2 } = {}) => {
-      const { code: t3, message: n3 } = e2 || {};
+    }).then(({ data: e3 } = {}) => {
+      const { code: t3, message: n3 } = e3 || {};
       return { code: 0 === t3 ? 0 : t3 || "SYS_ERR", message: n3 || "SYS_ERR" };
     }).then(({ code: n3, message: s3 }) => {
       if (0 !== n3) {
         switch (n3) {
           case "MODULE_ENCRYPTED":
-            console.error(`此云函数（${e}）依赖加密公共模块不可本地调试，自动切换为云端已部署的云函数`);
+            console.error(`此云函数（${e2}）依赖加密公共模块不可本地调试，自动切换为云端已部署的云函数`);
             break;
           case "FUNCTION_ENCRYPTED":
-            console.error(`此云函数（${e}）已加密不可本地调试，自动切换为云端已部署的云函数`);
+            console.error(`此云函数（${e2}）已加密不可本地调试，自动切换为云端已部署的云函数`);
             break;
           case "ACTION_ENCRYPTED":
             console.error(s3 || "需要访问加密的uni-clientDB-action，自动切换为云端环境");
             break;
           case "NETWORK_ERROR": {
-            const e2 = "连接本地调试服务失败，请检查客户端是否和主机在同一局域网下";
-            throw console.error(e2), new Error(e2);
+            const e3 = "连接本地调试服务失败，请检查客户端是否和主机在同一局域网下";
+            throw console.error(e3), new Error(e3);
           }
           case "SWITCH_TO_CLOUD":
             break;
           default: {
-            const e2 = `检测本地调试服务出现错误：${s3}，请检查网络环境或重启客户端再试`;
-            throw console.error(e2), new Error(e2);
+            const e3 = `检测本地调试服务出现错误：${s3}，请检查网络环境或重启客户端再试`;
+            throw console.error(e3), new Error(e3);
           }
         }
-        return this._callCloudFunction({ name: e, data: t2 });
+        return this._callCloudFunction({ name: e2, data: t2 });
       }
-      return new Promise((e2, n4) => {
-        const s4 = Ct.call(this, { data: t2 });
-        se.request({ method: "POST", url: a2, data: { provider: r2, platform: P, param: s4 }, success: ({ statusCode: t3, data: s5 } = {}) => !t3 || t3 >= 400 ? n4(new ne({ code: s5.code || "SYS_ERR", message: s5.message || "request:fail" })) : e2({ result: s5 }), fail(e3) {
-          n4(new ne({ code: e3.code || e3.errCode || "SYS_ERR", message: e3.message || e3.errMsg || "request:fail" }));
+      return new Promise((e3, n4) => {
+        const s4 = Lt.call(this, { data: t2 });
+        ne.request({ method: "POST", url: a2, data: { provider: r2, platform: P, param: s4 }, success: ({ statusCode: t3, data: s5 } = {}) => !t3 || t3 >= 400 ? n4(new te({ code: s5.code || "SYS_ERR", message: s5.message || "request:fail" })) : e3({ result: s5 }), fail(e4) {
+          n4(new te({ code: e4.code || e4.errCode || "SYS_ERR", message: e4.message || e4.errMsg || "request:fail" }));
         } });
       });
     });
   }
-  const Pt = [{ rule: /fc_function_not_found|FUNCTION_NOT_FOUND/, content: "，云函数[{functionName}]在云端不存在，请检查此云函数名称是否正确以及该云函数是否已上传到服务空间", mode: "append" }];
-  var At = /[\\^$.*+?()[\]{}|]/g, Et = RegExp(At.source);
-  function Ot(e, t2, n2) {
-    return e.replace(new RegExp((s2 = t2) && Et.test(s2) ? s2.replace(At, "\\$&") : s2, "g"), n2);
+  const Ut = [{ rule: /fc_function_not_found|FUNCTION_NOT_FOUND/, content: "，云函数[{functionName}]在云端不存在，请检查此云函数名称是否正确以及该云函数是否已上传到服务空间", mode: "append" }];
+  var Nt = /[\\^$.*+?()[\]{}|]/g, Dt = RegExp(Nt.source);
+  function Mt(e2, t2, n2) {
+    return e2.replace(new RegExp((s2 = t2) && Dt.test(s2) ? s2.replace(Nt, "\\$&") : s2, "g"), n2);
     var s2;
   }
-  const Rt = "request", Ut = "response", Lt = "both";
-  const yn = { code: 2e4, message: "System error" }, _n = { code: 20101, message: "Invalid client" };
-  function In(e) {
-    const { errSubject: t2, subject: n2, errCode: s2, errMsg: r2, code: i2, message: o2, cause: a2 } = e || {};
-    return new ne({ subject: t2 || n2 || "uni-secure-network", code: s2 || i2 || yn.code, message: r2 || o2, cause: a2 });
+  const Ft = "request", Kt = "response", jt = "both";
+  const kn = { code: 2e4, message: "System error" }, An = { code: 20101, message: "Invalid client" };
+  function Cn(e2) {
+    const { errSubject: t2, subject: n2, errCode: s2, errMsg: r2, code: i2, message: o2, cause: a2 } = e2 || {};
+    return new te({ subject: t2 || n2 || "uni-secure-network", code: s2 || i2 || kn.code, message: r2 || o2, cause: a2 });
   }
-  let bn;
-  function An({ secretType: e } = {}) {
-    return e === Rt || e === Ut || e === Lt;
+  let On;
+  function Nn({ secretType: e2 } = {}) {
+    return e2 === Ft || e2 === Kt || e2 === jt;
   }
-  function En({ name: e, data: t2 = {} } = {}) {
-    return "DCloud-clientDB" === e && "encryption" === t2.redirectTo && "getAppClientKey" === t2.action;
+  function Dn({ name: e2, data: t2 = {} } = {}) {
+    return "DCloud-clientDB" === e2 && "encryption" === t2.redirectTo && "getAppClientKey" === t2.action;
   }
-  function On({ provider: e, spaceId: t2, functionName: n2 } = {}) {
-    const { appId: s2, uniPlatform: r2, osName: i2 } = ue();
+  function Mn({ provider: e2, spaceId: t2, functionName: n2 } = {}) {
+    const { appId: s2, uniPlatform: r2, osName: i2 } = ce();
     let o2 = r2;
     "app" === r2 && (o2 = i2);
-    const a2 = function({ provider: e2, spaceId: t3 } = {}) {
-      const n3 = T;
+    const a2 = function({ provider: e3, spaceId: t3 } = {}) {
+      const n3 = A;
       if (!n3)
         return {};
-      e2 = function(e3) {
-        return "tencent" === e3 ? "tcb" : e3;
-      }(e2);
-      const s3 = n3.find((n4) => n4.provider === e2 && n4.spaceId === t3);
+      e3 = function(e4) {
+        return "tencent" === e4 ? "tcb" : e4;
+      }(e3);
+      const s3 = n3.find((n4) => n4.provider === e3 && n4.spaceId === t3);
       return s3 && s3.config;
-    }({ provider: e, spaceId: t2 });
+    }({ provider: e2, spaceId: t2 });
     if (!a2 || !a2.accessControl || !a2.accessControl.enable)
       return false;
     const c2 = a2.accessControl.function || {}, u2 = Object.keys(c2);
     if (0 === u2.length)
       return true;
-    const h2 = function(e2, t3) {
+    const l2 = function(e3, t3) {
       let n3, s3, r3;
-      for (let i3 = 0; i3 < e2.length; i3++) {
-        const o3 = e2[i3];
-        o3 !== t3 ? "*" !== o3 ? o3.split(",").map((e3) => e3.trim()).indexOf(t3) > -1 && (s3 = o3) : r3 = o3 : n3 = o3;
+      for (let i3 = 0; i3 < e3.length; i3++) {
+        const o3 = e3[i3];
+        o3 !== t3 ? "*" !== o3 ? o3.split(",").map((e4) => e4.trim()).indexOf(t3) > -1 && (s3 = o3) : r3 = o3 : n3 = o3;
       }
       return n3 || s3 || r3;
     }(u2, n2);
-    if (!h2)
+    if (!l2)
       return false;
-    if ((c2[h2] || []).find((e2 = {}) => e2.appId === s2 && (e2.platform || "").toLowerCase() === o2.toLowerCase()))
+    if ((c2[l2] || []).find((e3 = {}) => e3.appId === s2 && (e3.platform || "").toLowerCase() === o2.toLowerCase()))
       return true;
-    throw console.error(`此应用[appId: ${s2}, platform: ${o2}]不在云端配置的允许访问的应用列表内，参考：https://uniapp.dcloud.net.cn/uniCloud/secure-network.html#verify-client`), In(_n);
+    throw console.error(`此应用[appId: ${s2}, platform: ${o2}]不在云端配置的允许访问的应用列表内，参考：https://uniapp.dcloud.net.cn/uniCloud/secure-network.html#verify-client`), Cn(An);
   }
-  function xn({ functionName: e, result: t2, logPvd: n2 }) {
+  function qn({ functionName: e2, result: t2, logPvd: n2 }) {
     if (this.__dev__.debugLog && t2 && t2.requestId) {
-      const s2 = JSON.stringify({ spaceId: this.config.spaceId, functionName: e, requestId: t2.requestId });
+      const s2 = JSON.stringify({ spaceId: this.config.spaceId, functionName: e2, requestId: t2.requestId });
       console.log(`[${n2}-request]${s2}[/${n2}-request]`);
     }
   }
-  function Rn(e) {
-    const t2 = e.callFunction, n2 = function(n3) {
+  function Fn(e2) {
+    const t2 = e2.callFunction, n2 = function(n3) {
       const s2 = n3.name;
-      n3.data = Ct.call(e, { data: n3.data });
-      const r2 = { aliyun: "aliyun", tencent: "tcb", tcb: "tcb" }[this.config.provider], i2 = An(n3), o2 = En(n3), a2 = i2 || o2;
-      return t2.call(this, n3).then((e2) => (e2.errCode = 0, !a2 && xn.call(this, { functionName: s2, result: e2, logPvd: r2 }), Promise.resolve(e2)), (e2) => (!a2 && xn.call(this, { functionName: s2, result: e2, logPvd: r2 }), e2 && e2.message && (e2.message = function({ message: e3 = "", extraInfo: t3 = {}, formatter: n4 = [] } = {}) {
+      n3.data = Lt.call(e2, { data: n3.data });
+      const r2 = { aliyun: "aliyun", tencent: "tcb", tcb: "tcb", alipay: "alipay" }[this.config.provider], i2 = Nn(n3), o2 = Dn(n3), a2 = i2 || o2;
+      return t2.call(this, n3).then((e3) => (e3.errCode = 0, !a2 && qn.call(this, { functionName: s2, result: e3, logPvd: r2 }), Promise.resolve(e3)), (e3) => (!a2 && qn.call(this, { functionName: s2, result: e3, logPvd: r2 }), e3 && e3.message && (e3.message = function({ message: e4 = "", extraInfo: t3 = {}, formatter: n4 = [] } = {}) {
         for (let s3 = 0; s3 < n4.length; s3++) {
-          const { rule: r3, content: i3, mode: o3 } = n4[s3], a3 = e3.match(r3);
+          const { rule: r3, content: i3, mode: o3 } = n4[s3], a3 = e4.match(r3);
           if (!a3)
             continue;
           let c2 = i3;
-          for (let e4 = 1; e4 < a3.length; e4++)
-            c2 = Ot(c2, `{$${e4}}`, a3[e4]);
-          for (const e4 in t3)
-            c2 = Ot(c2, `{${e4}}`, t3[e4]);
-          return "replace" === o3 ? c2 : e3 + c2;
+          for (let e5 = 1; e5 < a3.length; e5++)
+            c2 = Mt(c2, `{$${e5}}`, a3[e5]);
+          for (const e5 in t3)
+            c2 = Mt(c2, `{${e5}}`, t3[e5]);
+          return "replace" === o3 ? c2 : e4 + c2;
         }
-        return e3;
-      }({ message: `[${n3.name}]: ${e2.message}`, formatter: Pt, extraInfo: { functionName: s2 } })), Promise.reject(e2)));
+        return e4;
+      }({ message: `[${n3.name}]: ${e3.message}`, formatter: Ut, extraInfo: { functionName: s2 } })), Promise.reject(e3)));
     };
-    e.callFunction = function(t3) {
-      const { provider: s2, spaceId: r2 } = e.config, i2 = t3.name;
+    e2.callFunction = function(t3) {
+      const { provider: s2, spaceId: r2 } = e2.config, i2 = t3.name;
       let o2, a2;
-      if (t3.data = t3.data || {}, e.__dev__.debugInfo && !e.__dev__.debugInfo.forceRemote && E ? (e._callCloudFunction || (e._callCloudFunction = n2, e._callLocalFunction = Tt), o2 = Tt) : o2 = n2, o2 = o2.bind(e), En(t3))
-        a2 = n2.call(e, t3);
-      else if (An(t3)) {
-        a2 = new bn({ secretType: t3.secretType, uniCloudIns: e }).wrapEncryptDataCallFunction(n2.bind(e))(t3);
-      } else if (On({ provider: s2, spaceId: r2, functionName: i2 })) {
-        a2 = new bn({ secretType: t3.secretType, uniCloudIns: e }).wrapVerifyClientCallFunction(n2.bind(e))(t3);
+      if (t3.data = t3.data || {}, e2.__dev__.debugInfo && !e2.__dev__.debugInfo.forceRemote && C ? (e2._callCloudFunction || (e2._callCloudFunction = n2, e2._callLocalFunction = Rt), o2 = Rt) : o2 = n2, o2 = o2.bind(e2), Dn(t3))
+        a2 = n2.call(e2, t3);
+      else if (Nn(t3)) {
+        a2 = new On({ secretType: t3.secretType, uniCloudIns: e2 }).wrapEncryptDataCallFunction(n2.bind(e2))(t3);
+      } else if (Mn({ provider: s2, spaceId: r2, functionName: i2 })) {
+        a2 = new On({ secretType: t3.secretType, uniCloudIns: e2 }).wrapVerifyClientCallFunction(n2.bind(e2))(t3);
       } else
         a2 = o2(t3);
       return Object.defineProperty(a2, "result", { get: () => (console.warn("当前返回结果为Promise类型，不可直接访问其result属性，详情请参考：https://uniapp.dcloud.net.cn/uniCloud/faq?id=promise"), {}) }), a2;
     };
   }
-  bn = class {
+  On = class {
     constructor() {
-      throw In({ message: `Platform ${P} is not enabled, please check whether secure network module is enabled in your manifest.json` });
+      throw Cn({ message: `Platform ${P} is not enabled, please check whether secure network module is enabled in your manifest.json` });
     }
   };
-  const Un = Symbol("CLIENT_DB_INTERNAL");
-  function Ln(e, t2) {
-    return e.then = "DoNotReturnProxyWithAFunctionNamedThen", e._internalType = Un, e.inspect = null, e.__v_raw = void 0, new Proxy(e, { get(e2, n2, s2) {
+  const Kn = Symbol("CLIENT_DB_INTERNAL");
+  function jn(e2, t2) {
+    return e2.then = "DoNotReturnProxyWithAFunctionNamedThen", e2._internalType = Kn, e2.inspect = null, e2.__v_raw = void 0, new Proxy(e2, { get(e3, n2, s2) {
       if ("_uniClient" === n2)
         return null;
       if ("symbol" == typeof n2)
-        return e2[n2];
-      if (n2 in e2 || "string" != typeof n2) {
-        const t3 = e2[n2];
-        return "function" == typeof t3 ? t3.bind(e2) : t3;
+        return e3[n2];
+      if (n2 in e3 || "string" != typeof n2) {
+        const t3 = e3[n2];
+        return "function" == typeof t3 ? t3.bind(e3) : t3;
       }
-      return t2.get(e2, n2, s2);
+      return t2.get(e3, n2, s2);
     } });
   }
-  function Nn(e) {
+  function Bn(e2) {
     return { on: (t2, n2) => {
-      e[t2] = e[t2] || [], e[t2].indexOf(n2) > -1 || e[t2].push(n2);
+      e2[t2] = e2[t2] || [], e2[t2].indexOf(n2) > -1 || e2[t2].push(n2);
     }, off: (t2, n2) => {
-      e[t2] = e[t2] || [];
-      const s2 = e[t2].indexOf(n2);
-      -1 !== s2 && e[t2].splice(s2, 1);
+      e2[t2] = e2[t2] || [];
+      const s2 = e2[t2].indexOf(n2);
+      -1 !== s2 && e2[t2].splice(s2, 1);
     } };
   }
-  const Dn = ["db.Geo", "db.command", "command.aggregate"];
-  function Fn(e, t2) {
-    return Dn.indexOf(`${e}.${t2}`) > -1;
+  const $n = ["db.Geo", "db.command", "command.aggregate"];
+  function Wn(e2, t2) {
+    return $n.indexOf(`${e2}.${t2}`) > -1;
   }
-  function Mn(e) {
-    switch (g(e = re(e))) {
+  function Hn(e2) {
+    switch (f(e2 = se(e2))) {
       case "array":
-        return e.map((e2) => Mn(e2));
+        return e2.map((e3) => Hn(e3));
       case "object":
-        return e._internalType === Un || Object.keys(e).forEach((t2) => {
-          e[t2] = Mn(e[t2]);
-        }), e;
+        return e2._internalType === Kn || Object.keys(e2).forEach((t2) => {
+          e2[t2] = Hn(e2[t2]);
+        }), e2;
       case "regexp":
-        return { $regexp: { source: e.source, flags: e.flags } };
+        return { $regexp: { source: e2.source, flags: e2.flags } };
       case "date":
-        return { $date: e.toISOString() };
+        return { $date: e2.toISOString() };
       default:
-        return e;
+        return e2;
     }
   }
-  function qn(e) {
-    return e && e.content && e.content.$method;
+  function zn(e2) {
+    return e2 && e2.content && e2.content.$method;
   }
-  class Kn {
-    constructor(e, t2, n2) {
-      this.content = e, this.prevStage = t2 || null, this.udb = null, this._database = n2;
+  class Jn {
+    constructor(e2, t2, n2) {
+      this.content = e2, this.prevStage = t2 || null, this.udb = null, this._database = n2;
     }
     toJSON() {
-      let e = this;
-      const t2 = [e.content];
-      for (; e.prevStage; )
-        e = e.prevStage, t2.push(e.content);
-      return { $db: t2.reverse().map((e2) => ({ $method: e2.$method, $param: Mn(e2.$param) })) };
+      let e2 = this;
+      const t2 = [e2.content];
+      for (; e2.prevStage; )
+        e2 = e2.prevStage, t2.push(e2.content);
+      return { $db: t2.reverse().map((e3) => ({ $method: e3.$method, $param: Hn(e3.$param) })) };
     }
     toString() {
       return JSON.stringify(this.toJSON());
     }
     getAction() {
-      const e = this.toJSON().$db.find((e2) => "action" === e2.$method);
-      return e && e.$param && e.$param[0];
+      const e2 = this.toJSON().$db.find((e3) => "action" === e3.$method);
+      return e2 && e2.$param && e2.$param[0];
     }
     getCommand() {
-      return { $db: this.toJSON().$db.filter((e) => "action" !== e.$method) };
+      return { $db: this.toJSON().$db.filter((e2) => "action" !== e2.$method) };
     }
     get isAggregate() {
-      let e = this;
-      for (; e; ) {
-        const t2 = qn(e), n2 = qn(e.prevStage);
+      let e2 = this;
+      for (; e2; ) {
+        const t2 = zn(e2), n2 = zn(e2.prevStage);
         if ("aggregate" === t2 && "collection" === n2 || "pipeline" === t2)
           return true;
-        e = e.prevStage;
+        e2 = e2.prevStage;
       }
       return false;
     }
     get isCommand() {
-      let e = this;
-      for (; e; ) {
-        if ("command" === qn(e))
+      let e2 = this;
+      for (; e2; ) {
+        if ("command" === zn(e2))
           return true;
-        e = e.prevStage;
+        e2 = e2.prevStage;
       }
       return false;
     }
     get isAggregateCommand() {
-      let e = this;
-      for (; e; ) {
-        const t2 = qn(e), n2 = qn(e.prevStage);
+      let e2 = this;
+      for (; e2; ) {
+        const t2 = zn(e2), n2 = zn(e2.prevStage);
         if ("aggregate" === t2 && "command" === n2)
           return true;
-        e = e.prevStage;
+        e2 = e2.prevStage;
       }
       return false;
     }
-    getNextStageFn(e) {
+    getNextStageFn(e2) {
       const t2 = this;
       return function() {
-        return jn({ $method: e, $param: Mn(Array.from(arguments)) }, t2, t2._database);
+        return Vn({ $method: e2, $param: Hn(Array.from(arguments)) }, t2, t2._database);
       };
     }
     get count() {
@@ -13404,339 +14338,339 @@ This will fail in production.`);
         throw new Error("JQL禁止使用set方法");
       };
     }
-    _send(e, t2) {
+    _send(e2, t2) {
       const n2 = this.getAction(), s2 = this.getCommand();
-      if (s2.$db.push({ $method: e, $param: Mn(t2) }), b) {
-        const e2 = s2.$db.find((e3) => "collection" === e3.$method), t3 = e2 && e2.$param;
-        t3 && 1 === t3.length && "string" == typeof e2.$param[0] && e2.$param[0].indexOf(",") > -1 && console.warn("检测到使用JQL语法联表查询时，未使用getTemp先过滤主表数据，在主表数据量大的情况下可能会查询缓慢。\n- 如何优化请参考此文档：https://uniapp.dcloud.net.cn/uniCloud/jql?id=lookup-with-temp \n- 如果主表数据量很小请忽略此信息，项目发行时不会出现此提示。");
+      if (s2.$db.push({ $method: e2, $param: Hn(t2) }), S) {
+        const e3 = s2.$db.find((e4) => "collection" === e4.$method), t3 = e3 && e3.$param;
+        t3 && 1 === t3.length && "string" == typeof e3.$param[0] && e3.$param[0].indexOf(",") > -1 && console.warn("检测到使用JQL语法联表查询时，未使用getTemp先过滤主表数据，在主表数据量大的情况下可能会查询缓慢。\n- 如何优化请参考此文档：https://uniapp.dcloud.net.cn/uniCloud/jql?id=lookup-with-temp \n- 如果主表数据量很小请忽略此信息，项目发行时不会出现此提示。");
       }
       return this._database._callCloudFunction({ action: n2, command: s2 });
     }
   }
-  function jn(e, t2, n2) {
-    return Ln(new Kn(e, t2, n2), { get(e2, t3) {
+  function Vn(e2, t2, n2) {
+    return jn(new Jn(e2, t2, n2), { get(e3, t3) {
       let s2 = "db";
-      return e2 && e2.content && (s2 = e2.content.$method), Fn(s2, t3) ? jn({ $method: t3 }, e2, n2) : function() {
-        return jn({ $method: t3, $param: Mn(Array.from(arguments)) }, e2, n2);
+      return e3 && e3.content && (s2 = e3.content.$method), Wn(s2, t3) ? Vn({ $method: t3 }, e3, n2) : function() {
+        return Vn({ $method: t3, $param: Hn(Array.from(arguments)) }, e3, n2);
       };
     } });
   }
-  function Bn({ path: e, method: t2 }) {
+  function Gn({ path: e2, method: t2 }) {
     return class {
       constructor() {
         this.param = Array.from(arguments);
       }
       toJSON() {
-        return { $newDb: [...e.map((e2) => ({ $method: e2 })), { $method: t2, $param: this.param }] };
+        return { $newDb: [...e2.map((e3) => ({ $method: e3 })), { $method: t2, $param: this.param }] };
       }
       toString() {
         return JSON.stringify(this.toJSON());
       }
     };
   }
-  function $n(e, t2 = {}) {
-    return Ln(new e(t2), { get: (e2, t3) => Fn("db", t3) ? jn({ $method: t3 }, null, e2) : function() {
-      return jn({ $method: t3, $param: Mn(Array.from(arguments)) }, null, e2);
+  function Yn(e2, t2 = {}) {
+    return jn(new e2(t2), { get: (e3, t3) => Wn("db", t3) ? Vn({ $method: t3 }, null, e3) : function() {
+      return Vn({ $method: t3, $param: Hn(Array.from(arguments)) }, null, e3);
     } });
   }
-  class Wn extends class {
-    constructor({ uniClient: e = {}, isJQL: t2 = false } = {}) {
-      this._uniClient = e, this._authCallBacks = {}, this._dbCallBacks = {}, e._isDefault && (this._dbCallBacks = U("_globalUniCloudDatabaseCallback")), t2 || (this.auth = Nn(this._authCallBacks)), this._isJQL = t2, Object.assign(this, Nn(this._dbCallBacks)), this.env = Ln({}, { get: (e2, t3) => ({ $env: t3 }) }), this.Geo = Ln({}, { get: (e2, t3) => Bn({ path: ["Geo"], method: t3 }) }), this.serverDate = Bn({ path: [], method: "serverDate" }), this.RegExp = Bn({ path: [], method: "RegExp" });
+  class Qn extends class {
+    constructor({ uniClient: e2 = {}, isJQL: t2 = false } = {}) {
+      this._uniClient = e2, this._authCallBacks = {}, this._dbCallBacks = {}, e2._isDefault && (this._dbCallBacks = L("_globalUniCloudDatabaseCallback")), t2 || (this.auth = Bn(this._authCallBacks)), this._isJQL = t2, Object.assign(this, Bn(this._dbCallBacks)), this.env = jn({}, { get: (e3, t3) => ({ $env: t3 }) }), this.Geo = jn({}, { get: (e3, t3) => Gn({ path: ["Geo"], method: t3 }) }), this.serverDate = Gn({ path: [], method: "serverDate" }), this.RegExp = Gn({ path: [], method: "RegExp" });
     }
-    getCloudEnv(e) {
-      if ("string" != typeof e || !e.trim())
+    getCloudEnv(e2) {
+      if ("string" != typeof e2 || !e2.trim())
         throw new Error("getCloudEnv参数错误");
-      return { $env: e.replace("$cloudEnv_", "") };
+      return { $env: e2.replace("$cloudEnv_", "") };
     }
-    _callback(e, t2) {
+    _callback(e2, t2) {
       const n2 = this._dbCallBacks;
-      n2[e] && n2[e].forEach((e2) => {
-        e2(...t2);
+      n2[e2] && n2[e2].forEach((e3) => {
+        e3(...t2);
       });
     }
-    _callbackAuth(e, t2) {
+    _callbackAuth(e2, t2) {
       const n2 = this._authCallBacks;
-      n2[e] && n2[e].forEach((e2) => {
-        e2(...t2);
+      n2[e2] && n2[e2].forEach((e3) => {
+        e3(...t2);
       });
     }
     multiSend() {
-      const e = Array.from(arguments), t2 = e.map((e2) => {
-        const t3 = e2.getAction(), n2 = e2.getCommand();
+      const e2 = Array.from(arguments), t2 = e2.map((e3) => {
+        const t3 = e3.getAction(), n2 = e3.getCommand();
         if ("getTemp" !== n2.$db[n2.$db.length - 1].$method)
           throw new Error("multiSend只支持子命令内使用getTemp");
         return { action: t3, command: n2 };
       });
-      return this._callCloudFunction({ multiCommand: t2, queryList: e });
+      return this._callCloudFunction({ multiCommand: t2, queryList: e2 });
     }
   } {
-    _parseResult(e) {
-      return this._isJQL ? e.result : e;
+    _parseResult(e2) {
+      return this._isJQL ? e2.result : e2;
     }
-    _callCloudFunction({ action: e, command: t2, multiCommand: n2, queryList: s2 }) {
-      function r2(e2, t3) {
+    _callCloudFunction({ action: e2, command: t2, multiCommand: n2, queryList: s2 }) {
+      function r2(e3, t3) {
         if (n2 && s2)
           for (let n3 = 0; n3 < s2.length; n3++) {
             const r3 = s2[n3];
-            r3.udb && "function" == typeof r3.udb.setResult && (t3 ? r3.udb.setResult(t3) : r3.udb.setResult(e2.result.dataList[n3]));
+            r3.udb && "function" == typeof r3.udb.setResult && (t3 ? r3.udb.setResult(t3) : r3.udb.setResult(e3.result.dataList[n3]));
           }
       }
       const i2 = this, o2 = this._isJQL ? "databaseForJQL" : "database";
-      function a2(e2) {
-        return i2._callback("error", [e2]), M(q(o2, "fail"), e2).then(() => M(q(o2, "complete"), e2)).then(() => (r2(null, e2), Q(B, { type: z, content: e2 }), Promise.reject(e2)));
+      function a2(e3) {
+        return i2._callback("error", [e3]), M(q(o2, "fail"), e3).then(() => M(q(o2, "complete"), e3)).then(() => (r2(null, e3), Y(j, { type: W, content: e3 }), Promise.reject(e3)));
       }
       const c2 = M(q(o2, "invoke")), u2 = this._uniClient;
-      return c2.then(() => u2.callFunction({ name: "DCloud-clientDB", type: l, data: { action: e, command: t2, multiCommand: n2 } })).then((e2) => {
-        const { code: t3, message: n3, token: s3, tokenExpired: c3, systemInfo: u3 = [] } = e2.result;
+      return c2.then(() => u2.callFunction({ name: "DCloud-clientDB", type: l, data: { action: e2, command: t2, multiCommand: n2 } })).then((e3) => {
+        const { code: t3, message: n3, token: s3, tokenExpired: c3, systemInfo: u3 = [] } = e3.result;
         if (u3)
-          for (let e3 = 0; e3 < u3.length; e3++) {
-            const { level: t4, message: n4, detail: s4 } = u3[e3], r3 = console["warn" === t4 ? "error" : t4] || console.log;
+          for (let e4 = 0; e4 < u3.length; e4++) {
+            const { level: t4, message: n4, detail: s4 } = u3[e4], r3 = console["warn" === t4 ? "error" : t4] || console.log;
             let i3 = "[System Info]" + n4;
             s4 && (i3 = `${i3}
 详细信息：${s4}`), r3(i3);
           }
         if (t3) {
-          return a2(new ne({ code: t3, message: n3, requestId: e2.requestId }));
+          return a2(new te({ code: t3, message: n3, requestId: e3.requestId }));
         }
-        e2.result.errCode = e2.result.errCode || e2.result.code, e2.result.errMsg = e2.result.errMsg || e2.result.message, s3 && c3 && (oe({ token: s3, tokenExpired: c3 }), this._callbackAuth("refreshToken", [{ token: s3, tokenExpired: c3 }]), this._callback("refreshToken", [{ token: s3, tokenExpired: c3 }]), Q(W, { token: s3, tokenExpired: c3 }));
-        const h2 = [{ prop: "affectedDocs", tips: "affectedDocs不再推荐使用，请使用inserted/deleted/updated/data.length替代" }, { prop: "code", tips: "code不再推荐使用，请使用errCode替代" }, { prop: "message", tips: "message不再推荐使用，请使用errMsg替代" }];
-        for (let t4 = 0; t4 < h2.length; t4++) {
-          const { prop: n4, tips: s4 } = h2[t4];
-          if (n4 in e2.result) {
-            const t5 = e2.result[n4];
-            Object.defineProperty(e2.result, n4, { get: () => (console.warn(s4), t5) });
+        e3.result.errCode = e3.result.errCode || e3.result.code, e3.result.errMsg = e3.result.errMsg || e3.result.message, s3 && c3 && (ie({ token: s3, tokenExpired: c3 }), this._callbackAuth("refreshToken", [{ token: s3, tokenExpired: c3 }]), this._callback("refreshToken", [{ token: s3, tokenExpired: c3 }]), Y($, { token: s3, tokenExpired: c3 }));
+        const l2 = [{ prop: "affectedDocs", tips: "affectedDocs不再推荐使用，请使用inserted/deleted/updated/data.length替代" }, { prop: "code", tips: "code不再推荐使用，请使用errCode替代" }, { prop: "message", tips: "message不再推荐使用，请使用errMsg替代" }];
+        for (let t4 = 0; t4 < l2.length; t4++) {
+          const { prop: n4, tips: s4 } = l2[t4];
+          if (n4 in e3.result) {
+            const t5 = e3.result[n4];
+            Object.defineProperty(e3.result, n4, { get: () => (console.warn(s4), t5) });
           }
         }
-        return function(e3) {
-          return M(q(o2, "success"), e3).then(() => M(q(o2, "complete"), e3)).then(() => {
-            r2(e3, null);
-            const t4 = i2._parseResult(e3);
-            return Q(B, { type: z, content: t4 }), Promise.resolve(t4);
+        return function(e4) {
+          return M(q(o2, "success"), e4).then(() => M(q(o2, "complete"), e4)).then(() => {
+            r2(e4, null);
+            const t4 = i2._parseResult(e4);
+            return Y(j, { type: W, content: t4 }), Promise.resolve(t4);
           });
-        }(e2);
-      }, (e2) => {
-        /fc_function_not_found|FUNCTION_NOT_FOUND/g.test(e2.message) && console.warn("clientDB未初始化，请在web控制台保存一次schema以开启clientDB");
-        return a2(new ne({ code: e2.code || "SYSTEM_ERROR", message: e2.message, requestId: e2.requestId }));
+        }(e3);
+      }, (e3) => {
+        /fc_function_not_found|FUNCTION_NOT_FOUND/g.test(e3.message) && console.warn("clientDB未初始化，请在web控制台保存一次schema以开启clientDB");
+        return a2(new te({ code: e3.code || "SYSTEM_ERROR", message: e3.message, requestId: e3.requestId }));
       });
     }
   }
-  const zn = "token无效，跳转登录页面", Jn = "token过期，跳转登录页面", Hn = { TOKEN_INVALID_TOKEN_EXPIRED: Jn, TOKEN_INVALID_INVALID_CLIENTID: zn, TOKEN_INVALID: zn, TOKEN_INVALID_WRONG_TOKEN: zn, TOKEN_INVALID_ANONYMOUS_USER: zn }, Gn = { "uni-id-token-expired": Jn, "uni-id-check-token-failed": zn, "uni-id-token-not-exist": zn, "uni-id-check-device-feature-failed": zn };
-  function Vn(e, t2) {
+  const Xn = "token无效，跳转登录页面", Zn = "token过期，跳转登录页面", es = { TOKEN_INVALID_TOKEN_EXPIRED: Zn, TOKEN_INVALID_INVALID_CLIENTID: Xn, TOKEN_INVALID: Xn, TOKEN_INVALID_WRONG_TOKEN: Xn, TOKEN_INVALID_ANONYMOUS_USER: Xn }, ts = { "uni-id-token-expired": Zn, "uni-id-check-token-failed": Xn, "uni-id-token-not-exist": Xn, "uni-id-check-device-feature-failed": Xn };
+  function ns(e2, t2) {
     let n2 = "";
-    return n2 = e ? `${e}/${t2}` : t2, n2.replace(/^\//, "");
+    return n2 = e2 ? `${e2}/${t2}` : t2, n2.replace(/^\//, "");
   }
-  function Yn(e = [], t2 = "") {
+  function ss(e2 = [], t2 = "") {
     const n2 = [], s2 = [];
-    return e.forEach((e2) => {
-      true === e2.needLogin ? n2.push(Vn(t2, e2.path)) : false === e2.needLogin && s2.push(Vn(t2, e2.path));
+    return e2.forEach((e3) => {
+      true === e3.needLogin ? n2.push(ns(t2, e3.path)) : false === e3.needLogin && s2.push(ns(t2, e3.path));
     }), { needLoginPage: n2, notNeedLoginPage: s2 };
   }
-  function Qn(e) {
-    return e.split("?")[0].replace(/^\//, "");
+  function rs(e2) {
+    return e2.split("?")[0].replace(/^\//, "");
   }
-  function Xn() {
-    return function(e) {
-      let t2 = e && e.$page && e.$page.fullPath || "";
+  function is() {
+    return function(e2) {
+      let t2 = e2 && e2.$page && e2.$page.fullPath || "";
       return t2 ? ("/" !== t2.charAt(0) && (t2 = "/" + t2), t2) : t2;
     }(function() {
-      const e = getCurrentPages();
-      return e[e.length - 1];
+      const e2 = getCurrentPages();
+      return e2[e2.length - 1];
     }());
   }
-  function Zn() {
-    return Qn(Xn());
+  function os$1() {
+    return rs(is());
   }
-  function es(e = "", t2 = {}) {
-    if (!e)
+  function as(e2 = "", t2 = {}) {
+    if (!e2)
       return false;
     if (!(t2 && t2.list && t2.list.length))
       return false;
-    const n2 = t2.list, s2 = Qn(e);
-    return n2.some((e2) => e2.pagePath === s2);
+    const n2 = t2.list, s2 = rs(e2);
+    return n2.some((e3) => e3.pagePath === s2);
   }
-  const ts = !!t.uniIdRouter;
-  const { loginPage: ns, routerNeedLogin: ss, resToLogin: rs, needLoginPage: is, notNeedLoginPage: os$1, loginPageInTabBar: as } = function({ pages: e = [], subPackages: n2 = [], uniIdRouter: s2 = {}, tabBar: r2 = {} } = t) {
-    const { loginPage: i2, needLogin: o2 = [], resToLogin: a2 = true } = s2, { needLoginPage: c2, notNeedLoginPage: u2 } = Yn(e), { needLoginPage: h2, notNeedLoginPage: l2 } = function(e2 = []) {
-      const t2 = [], n3 = [];
+  const cs = !!e.uniIdRouter;
+  const { loginPage: us, routerNeedLogin: ls, resToLogin: hs, needLoginPage: ds, notNeedLoginPage: ps, loginPageInTabBar: fs } = function({ pages: t2 = [], subPackages: n2 = [], uniIdRouter: s2 = {}, tabBar: r2 = {} } = e) {
+    const { loginPage: i2, needLogin: o2 = [], resToLogin: a2 = true } = s2, { needLoginPage: c2, notNeedLoginPage: u2 } = ss(t2), { needLoginPage: l2, notNeedLoginPage: h2 } = function(e2 = []) {
+      const t3 = [], n3 = [];
       return e2.forEach((e3) => {
-        const { root: s3, pages: r3 = [] } = e3, { needLoginPage: i3, notNeedLoginPage: o3 } = Yn(r3, s3);
-        t2.push(...i3), n3.push(...o3);
-      }), { needLoginPage: t2, notNeedLoginPage: n3 };
+        const { root: s3, pages: r3 = [] } = e3, { needLoginPage: i3, notNeedLoginPage: o3 } = ss(r3, s3);
+        t3.push(...i3), n3.push(...o3);
+      }), { needLoginPage: t3, notNeedLoginPage: n3 };
     }(n2);
-    return { loginPage: i2, routerNeedLogin: o2, resToLogin: a2, needLoginPage: [...c2, ...h2], notNeedLoginPage: [...u2, ...l2], loginPageInTabBar: es(i2, r2) };
+    return { loginPage: i2, routerNeedLogin: o2, resToLogin: a2, needLoginPage: [...c2, ...l2], notNeedLoginPage: [...u2, ...h2], loginPageInTabBar: as(i2, r2) };
   }();
-  if (is.indexOf(ns) > -1)
-    throw new Error(`Login page [${ns}] should not be "needLogin", please check your pages.json`);
-  function cs(e) {
-    const t2 = Zn();
-    if ("/" === e.charAt(0))
-      return e;
-    const [n2, s2] = e.split("?"), r2 = n2.replace(/^\//, "").split("/"), i2 = t2.split("/");
+  if (ds.indexOf(us) > -1)
+    throw new Error(`Login page [${us}] should not be "needLogin", please check your pages.json`);
+  function gs(e2) {
+    const t2 = os$1();
+    if ("/" === e2.charAt(0))
+      return e2;
+    const [n2, s2] = e2.split("?"), r2 = n2.replace(/^\//, "").split("/"), i2 = t2.split("/");
     i2.pop();
-    for (let e2 = 0; e2 < r2.length; e2++) {
-      const t3 = r2[e2];
+    for (let e3 = 0; e3 < r2.length; e3++) {
+      const t3 = r2[e3];
       ".." === t3 ? i2.pop() : "." !== t3 && i2.push(t3);
     }
     return "" === i2[0] && i2.shift(), "/" + i2.join("/") + (s2 ? "?" + s2 : "");
   }
-  function us(e) {
-    const t2 = Qn(cs(e));
-    return !(os$1.indexOf(t2) > -1) && (is.indexOf(t2) > -1 || ss.some((t3) => function(e2, t4) {
-      return new RegExp(t4).test(e2);
-    }(e, t3)));
+  function ms(e2) {
+    const t2 = rs(gs(e2));
+    return !(ps.indexOf(t2) > -1) && (ds.indexOf(t2) > -1 || ls.some((t3) => function(e3, t4) {
+      return new RegExp(t4).test(e3);
+    }(e2, t3)));
   }
-  function hs({ redirect: e }) {
-    const t2 = Qn(e), n2 = Qn(ns);
-    return Zn() !== n2 && t2 !== n2;
+  function ys({ redirect: e2 }) {
+    const t2 = rs(e2), n2 = rs(us);
+    return os$1() !== n2 && t2 !== n2;
   }
-  function ls({ api: e, redirect: t2 } = {}) {
-    if (!t2 || !hs({ redirect: t2 }))
+  function _s({ api: e2, redirect: t2 } = {}) {
+    if (!t2 || !ys({ redirect: t2 }))
       return;
-    const n2 = function(e2, t3) {
-      return "/" !== e2.charAt(0) && (e2 = "/" + e2), t3 ? e2.indexOf("?") > -1 ? e2 + `&uniIdRedirectUrl=${encodeURIComponent(t3)}` : e2 + `?uniIdRedirectUrl=${encodeURIComponent(t3)}` : e2;
-    }(ns, t2);
-    as ? "navigateTo" !== e && "redirectTo" !== e || (e = "switchTab") : "switchTab" === e && (e = "navigateTo");
+    const n2 = function(e3, t3) {
+      return "/" !== e3.charAt(0) && (e3 = "/" + e3), t3 ? e3.indexOf("?") > -1 ? e3 + `&uniIdRedirectUrl=${encodeURIComponent(t3)}` : e3 + `?uniIdRedirectUrl=${encodeURIComponent(t3)}` : e3;
+    }(us, t2);
+    fs ? "navigateTo" !== e2 && "redirectTo" !== e2 || (e2 = "switchTab") : "switchTab" === e2 && (e2 = "navigateTo");
     const s2 = { navigateTo: uni.navigateTo, redirectTo: uni.redirectTo, switchTab: uni.switchTab, reLaunch: uni.reLaunch };
     setTimeout(() => {
-      s2[e]({ url: n2 });
+      s2[e2]({ url: n2 });
     });
   }
-  function ds({ url: e } = {}) {
+  function ws({ url: e2 } = {}) {
     const t2 = { abortLoginPageJump: false, autoToLoginPage: false }, n2 = function() {
-      const { token: e2, tokenExpired: t3 } = ie();
+      const { token: e3, tokenExpired: t3 } = re();
       let n3;
-      if (e2) {
+      if (e3) {
         if (t3 < Date.now()) {
-          const e3 = "uni-id-token-expired";
-          n3 = { errCode: e3, errMsg: Gn[e3] };
+          const e4 = "uni-id-token-expired";
+          n3 = { errCode: e4, errMsg: ts[e4] };
         }
       } else {
-        const e3 = "uni-id-check-token-failed";
-        n3 = { errCode: e3, errMsg: Gn[e3] };
+        const e4 = "uni-id-check-token-failed";
+        n3 = { errCode: e4, errMsg: ts[e4] };
       }
       return n3;
     }();
-    if (us(e) && n2) {
-      n2.uniIdRedirectUrl = e;
-      if (G($).length > 0)
+    if (ms(e2) && n2) {
+      n2.uniIdRedirectUrl = e2;
+      if (J(B).length > 0)
         return setTimeout(() => {
-          Q($, n2);
+          Y(B, n2);
         }, 0), t2.abortLoginPageJump = true, t2;
       t2.autoToLoginPage = true;
     }
     return t2;
   }
-  function ps() {
+  function vs() {
     !function() {
-      const e2 = Xn(), { abortLoginPageJump: t2, autoToLoginPage: n2 } = ds({ url: e2 });
-      t2 || n2 && ls({ api: "redirectTo", redirect: e2 });
+      const e3 = is(), { abortLoginPageJump: t2, autoToLoginPage: n2 } = ws({ url: e3 });
+      t2 || n2 && _s({ api: "redirectTo", redirect: e3 });
     }();
-    const e = ["navigateTo", "redirectTo", "reLaunch", "switchTab"];
-    for (let t2 = 0; t2 < e.length; t2++) {
-      const n2 = e[t2];
-      uni.addInterceptor(n2, { invoke(e2) {
-        const { abortLoginPageJump: t3, autoToLoginPage: s2 } = ds({ url: e2.url });
-        return t3 ? e2 : s2 ? (ls({ api: n2, redirect: cs(e2.url) }), false) : e2;
+    const e2 = ["navigateTo", "redirectTo", "reLaunch", "switchTab"];
+    for (let t2 = 0; t2 < e2.length; t2++) {
+      const n2 = e2[t2];
+      uni.addInterceptor(n2, { invoke(e3) {
+        const { abortLoginPageJump: t3, autoToLoginPage: s2 } = ws({ url: e3.url });
+        return t3 ? e3 : s2 ? (_s({ api: n2, redirect: gs(e3.url) }), false) : e3;
       } });
     }
   }
-  function fs() {
-    this.onResponse((e) => {
-      const { type: t2, content: n2 } = e;
+  function Is() {
+    this.onResponse((e2) => {
+      const { type: t2, content: n2 } = e2;
       let s2 = false;
       switch (t2) {
         case "cloudobject":
-          s2 = function(e2) {
-            if ("object" != typeof e2)
+          s2 = function(e3) {
+            if ("object" != typeof e3)
               return false;
-            const { errCode: t3 } = e2 || {};
-            return t3 in Gn;
+            const { errCode: t3 } = e3 || {};
+            return t3 in ts;
           }(n2);
           break;
         case "clientdb":
-          s2 = function(e2) {
-            if ("object" != typeof e2)
+          s2 = function(e3) {
+            if ("object" != typeof e3)
               return false;
-            const { errCode: t3 } = e2 || {};
-            return t3 in Hn;
+            const { errCode: t3 } = e3 || {};
+            return t3 in es;
           }(n2);
       }
-      s2 && function(e2 = {}) {
-        const t3 = G($);
-        ee().then(() => {
-          const n3 = Xn();
-          if (n3 && hs({ redirect: n3 }))
-            return t3.length > 0 ? Q($, Object.assign({ uniIdRedirectUrl: n3 }, e2)) : void (ns && ls({ api: "navigateTo", redirect: n3 }));
+      s2 && function(e3 = {}) {
+        const t3 = J(B);
+        Z().then(() => {
+          const n3 = is();
+          if (n3 && ys({ redirect: n3 }))
+            return t3.length > 0 ? Y(B, Object.assign({ uniIdRedirectUrl: n3 }, e3)) : void (us && _s({ api: "navigateTo", redirect: n3 }));
         });
       }(n2);
     });
   }
-  function gs(e) {
-    !function(e2) {
-      e2.onResponse = function(e3) {
-        V(B, e3);
-      }, e2.offResponse = function(e3) {
-        Y(B, e3);
+  function Ss(e2) {
+    !function(e3) {
+      e3.onResponse = function(e4) {
+        V(j, e4);
+      }, e3.offResponse = function(e4) {
+        G(j, e4);
       };
-    }(e), function(e2) {
-      e2.onNeedLogin = function(e3) {
-        V($, e3);
-      }, e2.offNeedLogin = function(e3) {
-        Y($, e3);
-      }, ts && (U("_globalUniCloudStatus").needLoginInit || (U("_globalUniCloudStatus").needLoginInit = true, ee().then(() => {
-        ps.call(e2);
-      }), rs && fs.call(e2)));
-    }(e), function(e2) {
-      e2.onRefreshToken = function(e3) {
-        V(W, e3);
-      }, e2.offRefreshToken = function(e3) {
-        Y(W, e3);
+    }(e2), function(e3) {
+      e3.onNeedLogin = function(e4) {
+        V(B, e4);
+      }, e3.offNeedLogin = function(e4) {
+        G(B, e4);
+      }, cs && (L("_globalUniCloudStatus").needLoginInit || (L("_globalUniCloudStatus").needLoginInit = true, Z().then(() => {
+        vs.call(e3);
+      }), hs && Is.call(e3)));
+    }(e2), function(e3) {
+      e3.onRefreshToken = function(e4) {
+        V($, e4);
+      }, e3.offRefreshToken = function(e4) {
+        G($, e4);
       };
-    }(e);
+    }(e2);
   }
-  let ms;
-  const ys = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=", _s = /^(?:[A-Za-z\d+/]{4})*?(?:[A-Za-z\d+/]{2}(?:==)?|[A-Za-z\d+/]{3}=?)?$/;
-  function ws() {
-    const e = ie().token || "", t2 = e.split(".");
-    if (!e || 3 !== t2.length)
+  let bs;
+  const ks = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=", As = /^(?:[A-Za-z\d+/]{4})*?(?:[A-Za-z\d+/]{2}(?:==)?|[A-Za-z\d+/]{3}=?)?$/;
+  function Ps() {
+    const e2 = re().token || "", t2 = e2.split(".");
+    if (!e2 || 3 !== t2.length)
       return { uid: null, role: [], permission: [], tokenExpired: 0 };
     let n2;
     try {
-      n2 = JSON.parse((s2 = t2[1], decodeURIComponent(ms(s2).split("").map(function(e2) {
-        return "%" + ("00" + e2.charCodeAt(0).toString(16)).slice(-2);
+      n2 = JSON.parse((s2 = t2[1], decodeURIComponent(bs(s2).split("").map(function(e3) {
+        return "%" + ("00" + e3.charCodeAt(0).toString(16)).slice(-2);
       }).join(""))));
-    } catch (e2) {
-      throw new Error("获取当前用户信息出错，详细错误信息为：" + e2.message);
+    } catch (e3) {
+      throw new Error("获取当前用户信息出错，详细错误信息为：" + e3.message);
     }
     var s2;
     return n2.tokenExpired = 1e3 * n2.exp, delete n2.exp, delete n2.iat, n2;
   }
-  ms = "function" != typeof atob ? function(e) {
-    if (e = String(e).replace(/[\t\n\f\r ]+/g, ""), !_s.test(e))
+  bs = "function" != typeof atob ? function(e2) {
+    if (e2 = String(e2).replace(/[\t\n\f\r ]+/g, ""), !As.test(e2))
       throw new Error("Failed to execute 'atob' on 'Window': The string to be decoded is not correctly encoded.");
     var t2;
-    e += "==".slice(2 - (3 & e.length));
-    for (var n2, s2, r2 = "", i2 = 0; i2 < e.length; )
-      t2 = ys.indexOf(e.charAt(i2++)) << 18 | ys.indexOf(e.charAt(i2++)) << 12 | (n2 = ys.indexOf(e.charAt(i2++))) << 6 | (s2 = ys.indexOf(e.charAt(i2++))), r2 += 64 === n2 ? String.fromCharCode(t2 >> 16 & 255) : 64 === s2 ? String.fromCharCode(t2 >> 16 & 255, t2 >> 8 & 255) : String.fromCharCode(t2 >> 16 & 255, t2 >> 8 & 255, 255 & t2);
+    e2 += "==".slice(2 - (3 & e2.length));
+    for (var n2, s2, r2 = "", i2 = 0; i2 < e2.length; )
+      t2 = ks.indexOf(e2.charAt(i2++)) << 18 | ks.indexOf(e2.charAt(i2++)) << 12 | (n2 = ks.indexOf(e2.charAt(i2++))) << 6 | (s2 = ks.indexOf(e2.charAt(i2++))), r2 += 64 === n2 ? String.fromCharCode(t2 >> 16 & 255) : 64 === s2 ? String.fromCharCode(t2 >> 16 & 255, t2 >> 8 & 255) : String.fromCharCode(t2 >> 16 & 255, t2 >> 8 & 255, 255 & t2);
     return r2;
   } : atob;
-  var vs = s(function(e, t2) {
+  var Ts = n(function(e2, t2) {
     Object.defineProperty(t2, "__esModule", { value: true });
     const n2 = "chooseAndUploadFile:ok", s2 = "chooseAndUploadFile:fail";
-    function r2(e2, t3) {
-      return e2.tempFiles.forEach((e3, n3) => {
-        e3.name || (e3.name = e3.path.substring(e3.path.lastIndexOf("/") + 1)), t3 && (e3.fileType = t3), e3.cloudPath = Date.now() + "_" + n3 + e3.name.substring(e3.name.lastIndexOf("."));
-      }), e2.tempFilePaths || (e2.tempFilePaths = e2.tempFiles.map((e3) => e3.path)), e2;
+    function r2(e3, t3) {
+      return e3.tempFiles.forEach((e4, n3) => {
+        e4.name || (e4.name = e4.path.substring(e4.path.lastIndexOf("/") + 1)), t3 && (e4.fileType = t3), e4.cloudPath = Date.now() + "_" + n3 + e4.name.substring(e4.name.lastIndexOf("."));
+      }), e3.tempFilePaths || (e3.tempFilePaths = e3.tempFiles.map((e4) => e4.path)), e3;
     }
-    function i2(e2, t3, { onChooseFile: s3, onUploadProgress: r3 }) {
-      return t3.then((e3) => {
+    function i2(e3, t3, { onChooseFile: s3, onUploadProgress: r3 }) {
+      return t3.then((e4) => {
         if (s3) {
-          const t4 = s3(e3);
+          const t4 = s3(e4);
           if (void 0 !== t4)
-            return Promise.resolve(t4).then((t5) => void 0 === t5 ? e3 : t5);
+            return Promise.resolve(t4).then((t5) => void 0 === t5 ? e4 : t5);
         }
-        return e3;
-      }).then((t4) => false === t4 ? { errMsg: n2, tempFilePaths: [], tempFiles: [] } : function(e3, t5, s4 = 5, r4) {
+        return e4;
+      }).then((t4) => false === t4 ? { errMsg: n2, tempFilePaths: [], tempFiles: [] } : function(e4, t5, s4 = 5, r4) {
         (t5 = Object.assign({}, t5)).errMsg = n2;
         const i3 = t5.tempFiles, o2 = i3.length;
         let a2 = 0;
@@ -13746,86 +14680,86 @@ This will fail in production.`);
           function c2() {
             const s5 = a2++;
             if (s5 >= o2)
-              return void (!i3.find((e4) => !e4.url && !e4.errMsg) && n3(t5));
+              return void (!i3.find((e5) => !e5.url && !e5.errMsg) && n3(t5));
             const u2 = i3[s5];
-            e3.uploadFile({ filePath: u2.path, cloudPath: u2.cloudPath, fileType: u2.fileType, onUploadProgress(e4) {
-              e4.index = s5, e4.tempFile = u2, e4.tempFilePath = u2.path, r4 && r4(e4);
-            } }).then((e4) => {
-              u2.url = e4.fileID, s5 < o2 && c2();
-            }).catch((e4) => {
-              u2.errMsg = e4.errMsg || e4.message, s5 < o2 && c2();
+            e4.uploadFile({ filePath: u2.path, cloudPath: u2.cloudPath, fileType: u2.fileType, cloudPathAsRealPath: u2.cloudPathAsRealPath, onUploadProgress(e5) {
+              e5.index = s5, e5.tempFile = u2, e5.tempFilePath = u2.path, r4 && r4(e5);
+            } }).then((e5) => {
+              u2.url = e5.fileID, s5 < o2 && c2();
+            }).catch((e5) => {
+              u2.errMsg = e5.errMsg || e5.message, s5 < o2 && c2();
             });
           }
         });
-      }(e2, t4, 5, r3));
+      }(e3, t4, 5, r3));
     }
-    t2.initChooseAndUploadFile = function(e2) {
+    t2.initChooseAndUploadFile = function(e3) {
       return function(t3 = { type: "all" }) {
-        return "image" === t3.type ? i2(e2, function(e3) {
-          const { count: t4, sizeType: n3, sourceType: i3 = ["album", "camera"], extension: o2 } = e3;
-          return new Promise((e4, a2) => {
+        return "image" === t3.type ? i2(e3, function(e4) {
+          const { count: t4, sizeType: n3, sourceType: i3 = ["album", "camera"], extension: o2 } = e4;
+          return new Promise((e5, a2) => {
             uni.chooseImage({ count: t4, sizeType: n3, sourceType: i3, extension: o2, success(t5) {
-              e4(r2(t5, "image"));
-            }, fail(e5) {
-              a2({ errMsg: e5.errMsg.replace("chooseImage:fail", s2) });
+              e5(r2(t5, "image"));
+            }, fail(e6) {
+              a2({ errMsg: e6.errMsg.replace("chooseImage:fail", s2) });
             } });
           });
-        }(t3), t3) : "video" === t3.type ? i2(e2, function(e3) {
-          const { camera: t4, compressed: n3, maxDuration: i3, sourceType: o2 = ["album", "camera"], extension: a2 } = e3;
-          return new Promise((e4, c2) => {
+        }(t3), t3) : "video" === t3.type ? i2(e3, function(e4) {
+          const { camera: t4, compressed: n3, maxDuration: i3, sourceType: o2 = ["album", "camera"], extension: a2 } = e4;
+          return new Promise((e5, c2) => {
             uni.chooseVideo({ camera: t4, compressed: n3, maxDuration: i3, sourceType: o2, extension: a2, success(t5) {
               const { tempFilePath: n4, duration: s3, size: i4, height: o3, width: a3 } = t5;
-              e4(r2({ errMsg: "chooseVideo:ok", tempFilePaths: [n4], tempFiles: [{ name: t5.tempFile && t5.tempFile.name || "", path: n4, size: i4, type: t5.tempFile && t5.tempFile.type || "", width: a3, height: o3, duration: s3, fileType: "video", cloudPath: "" }] }, "video"));
-            }, fail(e5) {
-              c2({ errMsg: e5.errMsg.replace("chooseVideo:fail", s2) });
+              e5(r2({ errMsg: "chooseVideo:ok", tempFilePaths: [n4], tempFiles: [{ name: t5.tempFile && t5.tempFile.name || "", path: n4, size: i4, type: t5.tempFile && t5.tempFile.type || "", width: a3, height: o3, duration: s3, fileType: "video", cloudPath: "" }] }, "video"));
+            }, fail(e6) {
+              c2({ errMsg: e6.errMsg.replace("chooseVideo:fail", s2) });
             } });
           });
-        }(t3), t3) : i2(e2, function(e3) {
-          const { count: t4, extension: n3 } = e3;
-          return new Promise((e4, i3) => {
+        }(t3), t3) : i2(e3, function(e4) {
+          const { count: t4, extension: n3 } = e4;
+          return new Promise((e5, i3) => {
             let o2 = uni.chooseFile;
             if ("undefined" != typeof wx && "function" == typeof wx.chooseMessageFile && (o2 = wx.chooseMessageFile), "function" != typeof o2)
               return i3({ errMsg: s2 + " 请指定 type 类型，该平台仅支持选择 image 或 video。" });
             o2({ type: "all", count: t4, extension: n3, success(t5) {
-              e4(r2(t5));
-            }, fail(e5) {
-              i3({ errMsg: e5.errMsg.replace("chooseFile:fail", s2) });
+              e5(r2(t5));
+            }, fail(e6) {
+              i3({ errMsg: e6.errMsg.replace("chooseFile:fail", s2) });
             } });
           });
         }(t3), t3);
       };
     };
-  }), Is = n(vs);
-  const Ss = "manual";
-  function bs(e) {
+  }), Cs = t(Ts);
+  const xs = "manual";
+  function Os(e2) {
     return { props: { localdata: { type: Array, default: () => [] }, options: { type: [Object, Array], default: () => ({}) }, spaceInfo: { type: Object, default: () => ({}) }, collection: { type: [String, Array], default: "" }, action: { type: String, default: "" }, field: { type: String, default: "" }, orderby: { type: String, default: "" }, where: { type: [String, Object], default: "" }, pageData: { type: String, default: "add" }, pageCurrent: { type: Number, default: 1 }, pageSize: { type: Number, default: 20 }, getcount: { type: [Boolean, String], default: false }, gettree: { type: [Boolean, String], default: false }, gettreepath: { type: [Boolean, String], default: false }, startwith: { type: String, default: "" }, limitlevel: { type: Number, default: 10 }, groupby: { type: String, default: "" }, groupField: { type: String, default: "" }, distinct: { type: [Boolean, String], default: false }, foreignKey: { type: String, default: "" }, loadtime: { type: String, default: "auto" }, manual: { type: Boolean, default: false } }, data: () => ({ mixinDatacomLoading: false, mixinDatacomHasMore: false, mixinDatacomResData: [], mixinDatacomErrorMessage: "", mixinDatacomPage: {} }), created() {
       this.mixinDatacomPage = { current: this.pageCurrent, size: this.pageSize, count: 0 }, this.$watch(() => {
-        var e2 = [];
+        var e3 = [];
         return ["pageCurrent", "pageSize", "localdata", "collection", "action", "field", "orderby", "where", "getont", "getcount", "gettree", "groupby", "groupField", "distinct"].forEach((t2) => {
-          e2.push(this[t2]);
-        }), e2;
-      }, (e2, t2) => {
-        if (this.loadtime === Ss)
+          e3.push(this[t2]);
+        }), e3;
+      }, (e3, t2) => {
+        if (this.loadtime === xs)
           return;
         let n2 = false;
         const s2 = [];
-        for (let r2 = 2; r2 < e2.length; r2++)
-          e2[r2] !== t2[r2] && (s2.push(e2[r2]), n2 = true);
-        e2[0] !== t2[0] && (this.mixinDatacomPage.current = this.pageCurrent), this.mixinDatacomPage.size = this.pageSize, this.onMixinDatacomPropsChange(n2, s2);
+        for (let r2 = 2; r2 < e3.length; r2++)
+          e3[r2] !== t2[r2] && (s2.push(e3[r2]), n2 = true);
+        e3[0] !== t2[0] && (this.mixinDatacomPage.current = this.pageCurrent), this.mixinDatacomPage.size = this.pageSize, this.onMixinDatacomPropsChange(n2, s2);
       });
-    }, methods: { onMixinDatacomPropsChange(e2, t2) {
-    }, mixinDatacomEasyGet({ getone: e2 = false, success: t2, fail: n2 } = {}) {
+    }, methods: { onMixinDatacomPropsChange(e3, t2) {
+    }, mixinDatacomEasyGet({ getone: e3 = false, success: t2, fail: n2 } = {}) {
       this.mixinDatacomLoading || (this.mixinDatacomLoading = true, this.mixinDatacomErrorMessage = "", this.mixinDatacomGet().then((n3) => {
         this.mixinDatacomLoading = false;
         const { data: s2, count: r2 } = n3.result;
         this.getcount && (this.mixinDatacomPage.count = r2), this.mixinDatacomHasMore = s2.length < this.pageSize;
-        const i2 = e2 ? s2.length ? s2[0] : void 0 : s2;
+        const i2 = e3 ? s2.length ? s2[0] : void 0 : s2;
         this.mixinDatacomResData = i2, t2 && t2(i2);
-      }).catch((e3) => {
-        this.mixinDatacomLoading = false, this.mixinDatacomErrorMessage = e3, n2 && n2(e3);
+      }).catch((e4) => {
+        this.mixinDatacomLoading = false, this.mixinDatacomErrorMessage = e4, n2 && n2(e4);
       }));
     }, mixinDatacomGet(t2 = {}) {
-      let n2 = e.database(this.spaceInfo);
+      let n2 = e2.database(this.spaceInfo);
       const s2 = t2.action || this.action;
       s2 && (n2 = n2.action(s2));
       const r2 = t2.collection || this.collection;
@@ -13841,189 +14775,189 @@ This will fail in production.`);
       const u2 = t2.groupField || this.groupField;
       u2 && (n2 = n2.groupField(u2));
       true === (void 0 !== t2.distinct ? t2.distinct : this.distinct) && (n2 = n2.distinct());
-      const h2 = t2.orderby || this.orderby;
-      h2 && (n2 = n2.orderBy(h2));
-      const l2 = void 0 !== t2.pageCurrent ? t2.pageCurrent : this.mixinDatacomPage.current, d2 = void 0 !== t2.pageSize ? t2.pageSize : this.mixinDatacomPage.size, p2 = void 0 !== t2.getcount ? t2.getcount : this.getcount, f2 = void 0 !== t2.gettree ? t2.gettree : this.gettree, g2 = void 0 !== t2.gettreepath ? t2.gettreepath : this.gettreepath, m2 = { getCount: p2 }, y2 = { limitLevel: void 0 !== t2.limitlevel ? t2.limitlevel : this.limitlevel, startWith: void 0 !== t2.startwith ? t2.startwith : this.startwith };
-      return f2 && (m2.getTree = y2), g2 && (m2.getTreePath = y2), n2 = n2.skip(d2 * (l2 - 1)).limit(d2).get(m2), n2;
+      const l2 = t2.orderby || this.orderby;
+      l2 && (n2 = n2.orderBy(l2));
+      const h2 = void 0 !== t2.pageCurrent ? t2.pageCurrent : this.mixinDatacomPage.current, d2 = void 0 !== t2.pageSize ? t2.pageSize : this.mixinDatacomPage.size, p2 = void 0 !== t2.getcount ? t2.getcount : this.getcount, f2 = void 0 !== t2.gettree ? t2.gettree : this.gettree, g2 = void 0 !== t2.gettreepath ? t2.gettreepath : this.gettreepath, m2 = { getCount: p2 }, y2 = { limitLevel: void 0 !== t2.limitlevel ? t2.limitlevel : this.limitlevel, startWith: void 0 !== t2.startwith ? t2.startwith : this.startwith };
+      return f2 && (m2.getTree = y2), g2 && (m2.getTreePath = y2), n2 = n2.skip(d2 * (h2 - 1)).limit(d2).get(m2), n2;
     } } };
   }
-  function ks(e) {
+  function Es(e2) {
     return function(t2, n2 = {}) {
-      n2 = function(e2, t3 = {}) {
-        return e2.customUI = t3.customUI || e2.customUI, e2.parseSystemError = t3.parseSystemError || e2.parseSystemError, Object.assign(e2.loadingOptions, t3.loadingOptions), Object.assign(e2.errorOptions, t3.errorOptions), "object" == typeof t3.secretMethods && (e2.secretMethods = t3.secretMethods), e2;
+      n2 = function(e3, t3 = {}) {
+        return e3.customUI = t3.customUI || e3.customUI, e3.parseSystemError = t3.parseSystemError || e3.parseSystemError, Object.assign(e3.loadingOptions, t3.loadingOptions), Object.assign(e3.errorOptions, t3.errorOptions), "object" == typeof t3.secretMethods && (e3.secretMethods = t3.secretMethods), e3;
       }({ customUI: false, loadingOptions: { title: "加载中...", mask: true }, errorOptions: { type: "modal", retry: false } }, n2);
       const { customUI: s2, loadingOptions: r2, errorOptions: i2, parseSystemError: o2 } = n2, a2 = !s2;
-      return new Proxy({}, { get: (s3, c2) => function({ fn: e2, interceptorName: t3, getCallbackArgs: n3 } = {}) {
+      return new Proxy({}, { get: (s3, c2) => function({ fn: e3, interceptorName: t3, getCallbackArgs: n3 } = {}) {
         return async function(...s4) {
           const r3 = n3 ? n3({ params: s4 }) : {};
           let i3, o3;
           try {
-            return await M(q(t3, "invoke"), { ...r3 }), i3 = await e2(...s4), await M(q(t3, "success"), { ...r3, result: i3 }), i3;
-          } catch (e3) {
-            throw o3 = e3, await M(q(t3, "fail"), { ...r3, error: o3 }), o3;
+            return await M(q(t3, "invoke"), { ...r3 }), i3 = await e3(...s4), await M(q(t3, "success"), { ...r3, result: i3 }), i3;
+          } catch (e4) {
+            throw o3 = e4, await M(q(t3, "fail"), { ...r3, error: o3 }), o3;
           } finally {
             await M(q(t3, "complete"), o3 ? { ...r3, error: o3 } : { ...r3, result: i3 });
           }
         };
-      }({ fn: async function s4(...u2) {
-        let l2;
+      }({ fn: async function s4(...l2) {
+        let h2;
         a2 && uni.showLoading({ title: r2.title, mask: r2.mask });
-        const d2 = { name: t2, type: h, data: { method: c2, params: u2 } };
-        "object" == typeof n2.secretMethods && function(e2, t3) {
-          const n3 = t3.data.method, s5 = e2.secretMethods || {}, r3 = s5[n3] || s5["*"];
+        const d2 = { name: t2, type: u, data: { method: c2, params: l2 } };
+        "object" == typeof n2.secretMethods && function(e3, t3) {
+          const n3 = t3.data.method, s5 = e3.secretMethods || {}, r3 = s5[n3] || s5["*"];
           r3 && (t3.secretType = r3);
         }(n2, d2);
         let p2 = false;
         try {
-          l2 = await e.callFunction(d2);
-        } catch (e2) {
-          p2 = true, l2 = { result: new ne(e2) };
+          h2 = await e2.callFunction(d2);
+        } catch (e3) {
+          p2 = true, h2 = { result: new te(e3) };
         }
-        const { errSubject: f2, errCode: g2, errMsg: m2, newToken: y2 } = l2.result || {};
-        if (a2 && uni.hideLoading(), y2 && y2.token && y2.tokenExpired && (oe(y2), Q(W, { ...y2 })), g2) {
-          let e2 = m2;
+        const { errSubject: f2, errCode: g2, errMsg: m2, newToken: y2 } = h2.result || {};
+        if (a2 && uni.hideLoading(), y2 && y2.token && y2.tokenExpired && (ie(y2), Y($, { ...y2 })), g2) {
+          let e3 = m2;
           if (p2 && o2) {
-            e2 = (await o2({ objectName: t2, methodName: c2, params: u2, errSubject: f2, errCode: g2, errMsg: m2 })).errMsg || m2;
+            e3 = (await o2({ objectName: t2, methodName: c2, params: l2, errSubject: f2, errCode: g2, errMsg: m2 })).errMsg || m2;
           }
           if (a2)
             if ("toast" === i2.type)
-              uni.showToast({ title: e2, icon: "none" });
+              uni.showToast({ title: e3, icon: "none" });
             else {
               if ("modal" !== i2.type)
                 throw new Error(`Invalid errorOptions.type: ${i2.type}`);
               {
-                const { confirm: t3 } = await async function({ title: e3, content: t4, showCancel: n4, cancelText: s5, confirmText: r3 } = {}) {
+                const { confirm: t3 } = await async function({ title: e4, content: t4, showCancel: n4, cancelText: s5, confirmText: r3 } = {}) {
                   return new Promise((i3, o3) => {
-                    uni.showModal({ title: e3, content: t4, showCancel: n4, cancelText: s5, confirmText: r3, success(e4) {
-                      i3(e4);
+                    uni.showModal({ title: e4, content: t4, showCancel: n4, cancelText: s5, confirmText: r3, success(e5) {
+                      i3(e5);
                     }, fail() {
                       i3({ confirm: false, cancel: true });
                     } });
                   });
-                }({ title: "提示", content: e2, showCancel: i2.retry, cancelText: "取消", confirmText: i2.retry ? "重试" : "确定" });
+                }({ title: "提示", content: e3, showCancel: i2.retry, cancelText: "取消", confirmText: i2.retry ? "重试" : "确定" });
                 if (i2.retry && t3)
-                  return s4(...u2);
+                  return s4(...l2);
               }
             }
-          const n3 = new ne({ subject: f2, code: g2, message: m2, requestId: l2.requestId });
-          throw n3.detail = l2.result, Q(B, { type: H, content: n3 }), n3;
+          const n3 = new te({ subject: f2, code: g2, message: m2, requestId: h2.requestId });
+          throw n3.detail = h2.result, Y(j, { type: z, content: n3 }), n3;
         }
-        return Q(B, { type: H, content: l2.result }), l2.result;
-      }, interceptorName: "callObject", getCallbackArgs: function({ params: e2 } = {}) {
-        return { objectName: t2, methodName: c2, params: e2 };
+        return Y(j, { type: z, content: h2.result }), h2.result;
+      }, interceptorName: "callObject", getCallbackArgs: function({ params: e3 } = {}) {
+        return { objectName: t2, methodName: c2, params: e3 };
       } }) });
     };
   }
-  function Cs(e) {
-    return U("_globalUniCloudSecureNetworkCache__{spaceId}".replace("{spaceId}", e.config.spaceId));
+  function Ls(e2) {
+    return L("_globalUniCloudSecureNetworkCache__{spaceId}".replace("{spaceId}", e2.config.spaceId));
   }
-  async function Ts({ openid: e, callLoginByWeixin: t2 = false } = {}) {
-    Cs(this);
+  async function Rs({ openid: e2, callLoginByWeixin: t2 = false } = {}) {
+    Ls(this);
     throw new Error(`[SecureNetwork] API \`initSecureNetworkByWeixin\` is not supported on platform \`${P}\``);
   }
-  async function Ps(e) {
-    const t2 = Cs(this);
-    return t2.initPromise || (t2.initPromise = Ts.call(this, e)), t2.initPromise;
+  async function Us(e2) {
+    const t2 = Ls(this);
+    return t2.initPromise || (t2.initPromise = Rs.call(this, e2)), t2.initPromise;
   }
-  function As(e) {
+  function Ns(e2) {
     return function({ openid: t2, callLoginByWeixin: n2 = false } = {}) {
-      return Ps.call(e, { openid: t2, callLoginByWeixin: n2 });
+      return Us.call(e2, { openid: t2, callLoginByWeixin: n2 });
     };
   }
-  function Es(e) {
+  function Ds(e2) {
     const t2 = { getSystemInfo: uni.getSystemInfo, getPushClientId: uni.getPushClientId };
     return function(n2) {
       return new Promise((s2, r2) => {
-        t2[e]({ ...n2, success(e2) {
-          s2(e2);
-        }, fail(e2) {
-          r2(e2);
+        t2[e2]({ ...n2, success(e3) {
+          s2(e3);
+        }, fail(e3) {
+          r2(e3);
         } });
       });
     };
   }
-  class Os extends class {
+  class Ms extends class {
     constructor() {
       this._callback = {};
     }
-    addListener(e, t2) {
-      this._callback[e] || (this._callback[e] = []), this._callback[e].push(t2);
+    addListener(e2, t2) {
+      this._callback[e2] || (this._callback[e2] = []), this._callback[e2].push(t2);
     }
-    on(e, t2) {
-      return this.addListener(e, t2);
+    on(e2, t2) {
+      return this.addListener(e2, t2);
     }
-    removeListener(e, t2) {
+    removeListener(e2, t2) {
       if (!t2)
         throw new Error('The "listener" argument must be of type function. Received undefined');
-      const n2 = this._callback[e];
+      const n2 = this._callback[e2];
       if (!n2)
         return;
-      const s2 = function(e2, t3) {
-        for (let n3 = e2.length - 1; n3 >= 0; n3--)
-          if (e2[n3] === t3)
+      const s2 = function(e3, t3) {
+        for (let n3 = e3.length - 1; n3 >= 0; n3--)
+          if (e3[n3] === t3)
             return n3;
         return -1;
       }(n2, t2);
       n2.splice(s2, 1);
     }
-    off(e, t2) {
-      return this.removeListener(e, t2);
+    off(e2, t2) {
+      return this.removeListener(e2, t2);
     }
-    removeAllListener(e) {
-      delete this._callback[e];
+    removeAllListener(e2) {
+      delete this._callback[e2];
     }
-    emit(e, ...t2) {
-      const n2 = this._callback[e];
+    emit(e2, ...t2) {
+      const n2 = this._callback[e2];
       if (n2)
-        for (let e2 = 0; e2 < n2.length; e2++)
-          n2[e2](...t2);
+        for (let e3 = 0; e3 < n2.length; e3++)
+          n2[e3](...t2);
     }
   } {
     constructor() {
       super(), this._uniPushMessageCallback = this._receivePushMessage.bind(this), this._currentMessageId = -1, this._payloadQueue = [];
     }
     init() {
-      return Promise.all([Es("getSystemInfo")(), Es("getPushClientId")()]).then(([{ appId: e } = {}, { cid: t2 } = {}] = []) => {
-        if (!e)
+      return Promise.all([Ds("getSystemInfo")(), Ds("getPushClientId")()]).then(([{ appId: e2 } = {}, { cid: t2 } = {}] = []) => {
+        if (!e2)
           throw new Error("Invalid appId, please check the manifest.json file");
         if (!t2)
           throw new Error("Invalid push client id");
-        this._appId = e, this._pushClientId = t2, this._seqId = Date.now() + "-" + Math.floor(9e5 * Math.random() + 1e5), this.emit("open"), this._initMessageListener();
-      }, (e) => {
-        throw this.emit("error", e), this.close(), e;
+        this._appId = e2, this._pushClientId = t2, this._seqId = Date.now() + "-" + Math.floor(9e5 * Math.random() + 1e5), this.emit("open"), this._initMessageListener();
+      }, (e2) => {
+        throw this.emit("error", e2), this.close(), e2;
       });
     }
     async open() {
       return this.init();
     }
-    _isUniCloudSSE(e) {
-      if ("receive" !== e.type)
+    _isUniCloudSSE(e2) {
+      if ("receive" !== e2.type)
         return false;
-      const t2 = e && e.data && e.data.payload;
+      const t2 = e2 && e2.data && e2.data.payload;
       return !(!t2 || "UNI_CLOUD_SSE" !== t2.channel || t2.seqId !== this._seqId);
     }
-    _receivePushMessage(e) {
-      if (!this._isUniCloudSSE(e))
+    _receivePushMessage(e2) {
+      if (!this._isUniCloudSSE(e2))
         return;
-      const t2 = e && e.data && e.data.payload, { action: n2, messageId: s2, message: r2 } = t2;
+      const t2 = e2 && e2.data && e2.data.payload, { action: n2, messageId: s2, message: r2 } = t2;
       this._payloadQueue.push({ action: n2, messageId: s2, message: r2 }), this._consumMessage();
     }
     _consumMessage() {
       for (; ; ) {
-        const e = this._payloadQueue.find((e2) => e2.messageId === this._currentMessageId + 1);
-        if (!e)
+        const e2 = this._payloadQueue.find((e3) => e3.messageId === this._currentMessageId + 1);
+        if (!e2)
           break;
-        this._currentMessageId++, this._parseMessagePayload(e);
+        this._currentMessageId++, this._parseMessagePayload(e2);
       }
     }
-    _parseMessagePayload(e) {
-      const { action: t2, messageId: n2, message: s2 } = e;
+    _parseMessagePayload(e2) {
+      const { action: t2, messageId: n2, message: s2 } = e2;
       "end" === t2 ? this._end({ messageId: n2, message: s2 }) : "message" === t2 && this._appendMessage({ messageId: n2, message: s2 });
     }
-    _appendMessage({ messageId: e, message: t2 } = {}) {
+    _appendMessage({ messageId: e2, message: t2 } = {}) {
       this.emit("message", t2);
     }
-    _end({ messageId: e, message: t2 } = {}) {
+    _end({ messageId: e2, message: t2 } = {}) {
       this.emit("end", t2), this.close();
     }
     _initMessageListener() {
@@ -14039,40 +14973,40 @@ This will fail in production.`);
       this._destroy(), this.emit("close");
     }
   }
-  async function xs(e, t2) {
-    const n2 = `http://${e}:${t2}/system/ping`;
+  async function qs(e2, t2) {
+    const n2 = `http://${e2}:${t2}/system/ping`;
     try {
-      const e2 = await (s2 = { url: n2, timeout: 500 }, new Promise((e3, t3) => {
-        se.request({ ...s2, success(t4) {
-          e3(t4);
-        }, fail(e4) {
-          t3(e4);
+      const e3 = await (s2 = { url: n2, timeout: 500 }, new Promise((e4, t3) => {
+        ne.request({ ...s2, success(t4) {
+          e4(t4);
+        }, fail(e5) {
+          t3(e5);
         } });
       }));
-      return !(!e2.data || 0 !== e2.data.code);
-    } catch (e2) {
+      return !(!e3.data || 0 !== e3.data.code);
+    } catch (e3) {
       return false;
     }
     var s2;
   }
-  async function Rs(e) {
+  async function Fs(e2) {
     {
-      const { osName: e2, osVersion: t3 } = ue();
-      "ios" === e2 && function(e3) {
-        if (!e3 || "string" != typeof e3)
+      const { osName: e3, osVersion: t3 } = ce();
+      "ios" === e3 && function(e4) {
+        if (!e4 || "string" != typeof e4)
           return 0;
-        const t4 = e3.match(/^(\d+)./);
+        const t4 = e4.match(/^(\d+)./);
         return t4 && t4[1] ? parseInt(t4[1]) : 0;
       }(t3) >= 14 && console.warn("iOS 14及以上版本连接uniCloud本地调试服务需要允许客户端查找并连接到本地网络上的设备（仅开发模式生效，发行模式会连接uniCloud云端服务）");
     }
-    const t2 = e.__dev__;
+    const t2 = e2.__dev__;
     if (!t2.debugInfo)
       return;
-    const { address: n2, servePort: s2 } = t2.debugInfo, { address: r2 } = await async function(e2, t3) {
+    const { address: n2, servePort: s2 } = t2.debugInfo, { address: r2 } = await async function(e3, t3) {
       let n3;
-      for (let s3 = 0; s3 < e2.length; s3++) {
-        const r3 = e2[s3];
-        if (await xs(r3, t3)) {
+      for (let s3 = 0; s3 < e3.length; s3++) {
+        const r3 = e3[s3];
+        if (await qs(r3, t3)) {
           n3 = r3;
           break;
         }
@@ -14087,117 +15021,117 @@ This will fail in production.`);
       throw new Error(o2);
     i2(o2);
   }
-  function Us(e) {
-    e._initPromiseHub || (e._initPromiseHub = new I({ createPromise: function() {
+  function Ks(e2) {
+    e2._initPromiseHub || (e2._initPromiseHub = new v({ createPromise: function() {
       let t2 = Promise.resolve();
       var n2;
-      n2 = 1, t2 = new Promise((e2) => {
+      n2 = 1, t2 = new Promise((e3) => {
         setTimeout(() => {
-          e2();
+          e3();
         }, n2);
       });
-      const s2 = e.auth();
-      return t2.then(() => s2.getLoginState()).then((e2) => e2 ? Promise.resolve() : s2.signInAnonymously());
+      const s2 = e2.auth();
+      return t2.then(() => s2.getLoginState()).then((e3) => e3 ? Promise.resolve() : s2.signInAnonymously());
     } }));
   }
-  const Ls = { tcb: St, tencent: St, aliyun: me, private: kt };
-  let Ns = new class {
-    init(e) {
+  const js = { tcb: St, tencent: St, aliyun: pe, private: kt, alipay: Et };
+  let Bs = new class {
+    init(e2) {
       let t2 = {};
-      const n2 = Ls[e.provider];
+      const n2 = js[e2.provider];
       if (!n2)
         throw new Error("未提供正确的provider参数");
-      t2 = n2.init(e), function(e2) {
+      t2 = n2.init(e2), function(e3) {
         const t3 = {};
-        e2.__dev__ = t3, t3.debugLog = "app" === P;
-        const n3 = A;
+        e3.__dev__ = t3, t3.debugLog = "app" === P;
+        const n3 = T;
         n3 && !n3.code && (t3.debugInfo = n3);
-        const s2 = new I({ createPromise: function() {
-          return Rs(e2);
+        const s2 = new v({ createPromise: function() {
+          return Fs(e3);
         } });
         t3.initLocalNetwork = function() {
           return s2.exec();
         };
-      }(t2), Us(t2), Rn(t2), function(e2) {
-        const t3 = e2.uploadFile;
-        e2.uploadFile = function(e3) {
-          return t3.call(this, e3);
+      }(t2), Ks(t2), Fn(t2), function(e3) {
+        const t3 = e3.uploadFile;
+        e3.uploadFile = function(e4) {
+          return t3.call(this, e4);
         };
-      }(t2), function(e2) {
-        e2.database = function(t3) {
+      }(t2), function(e3) {
+        e3.database = function(t3) {
           if (t3 && Object.keys(t3).length > 0)
-            return e2.init(t3).database();
+            return e3.init(t3).database();
           if (this._database)
             return this._database;
-          const n3 = $n(Wn, { uniClient: e2 });
+          const n3 = Yn(Qn, { uniClient: e3 });
           return this._database = n3, n3;
-        }, e2.databaseForJQL = function(t3) {
+        }, e3.databaseForJQL = function(t3) {
           if (t3 && Object.keys(t3).length > 0)
-            return e2.init(t3).databaseForJQL();
+            return e3.init(t3).databaseForJQL();
           if (this._databaseForJQL)
             return this._databaseForJQL;
-          const n3 = $n(Wn, { uniClient: e2, isJQL: true });
+          const n3 = Yn(Qn, { uniClient: e3, isJQL: true });
           return this._databaseForJQL = n3, n3;
         };
-      }(t2), function(e2) {
-        e2.getCurrentUserInfo = ws, e2.chooseAndUploadFile = Is.initChooseAndUploadFile(e2), Object.assign(e2, { get mixinDatacom() {
-          return bs(e2);
-        } }), e2.SSEChannel = Os, e2.initSecureNetworkByWeixin = As(e2), e2.importObject = ks(e2);
+      }(t2), function(e3) {
+        e3.getCurrentUserInfo = Ps, e3.chooseAndUploadFile = Cs.initChooseAndUploadFile(e3), Object.assign(e3, { get mixinDatacom() {
+          return Os(e3);
+        } }), e3.SSEChannel = Ms, e3.initSecureNetworkByWeixin = Ns(e3), e3.importObject = Es(e3);
       }(t2);
-      return ["callFunction", "uploadFile", "deleteFile", "getTempFileURL", "downloadFile", "chooseAndUploadFile"].forEach((e2) => {
-        if (!t2[e2])
+      return ["callFunction", "uploadFile", "deleteFile", "getTempFileURL", "downloadFile", "chooseAndUploadFile"].forEach((e3) => {
+        if (!t2[e3])
           return;
-        const n3 = t2[e2];
-        t2[e2] = function() {
+        const n3 = t2[e3];
+        t2[e3] = function() {
           return n3.apply(t2, Array.from(arguments));
-        }, t2[e2] = function(e3, t3) {
+        }, t2[e3] = function(e4, t3) {
           return function(n4) {
             let s2 = false;
             if ("callFunction" === t3) {
-              const e4 = n4 && n4.type || u;
-              s2 = e4 !== u;
+              const e5 = n4 && n4.type || c;
+              s2 = e5 !== c;
             }
             const r2 = "callFunction" === t3 && !s2, i2 = this._initPromiseHub.exec();
             n4 = n4 || {};
-            const { success: o2, fail: a2, complete: c2 } = te(n4), h2 = i2.then(() => s2 ? Promise.resolve() : M(q(t3, "invoke"), n4)).then(() => e3.call(this, n4)).then((e4) => s2 ? Promise.resolve(e4) : M(q(t3, "success"), e4).then(() => M(q(t3, "complete"), e4)).then(() => (r2 && Q(B, { type: J, content: e4 }), Promise.resolve(e4))), (e4) => s2 ? Promise.reject(e4) : M(q(t3, "fail"), e4).then(() => M(q(t3, "complete"), e4)).then(() => (Q(B, { type: J, content: e4 }), Promise.reject(e4))));
-            if (!(o2 || a2 || c2))
-              return h2;
-            h2.then((e4) => {
-              o2 && o2(e4), c2 && c2(e4), r2 && Q(B, { type: J, content: e4 });
-            }, (e4) => {
-              a2 && a2(e4), c2 && c2(e4), r2 && Q(B, { type: J, content: e4 });
+            const { success: o2, fail: a2, complete: u2 } = ee(n4), l2 = i2.then(() => s2 ? Promise.resolve() : M(q(t3, "invoke"), n4)).then(() => e4.call(this, n4)).then((e5) => s2 ? Promise.resolve(e5) : M(q(t3, "success"), e5).then(() => M(q(t3, "complete"), e5)).then(() => (r2 && Y(j, { type: H, content: e5 }), Promise.resolve(e5))), (e5) => s2 ? Promise.reject(e5) : M(q(t3, "fail"), e5).then(() => M(q(t3, "complete"), e5)).then(() => (Y(j, { type: H, content: e5 }), Promise.reject(e5))));
+            if (!(o2 || a2 || u2))
+              return l2;
+            l2.then((e5) => {
+              o2 && o2(e5), u2 && u2(e5), r2 && Y(j, { type: H, content: e5 });
+            }, (e5) => {
+              a2 && a2(e5), u2 && u2(e5), r2 && Y(j, { type: H, content: e5 });
             });
           };
-        }(t2[e2], e2).bind(t2);
+        }(t2[e3], e3).bind(t2);
       }), t2.init = this.init, t2;
     }
   }();
   (() => {
-    const e = E;
+    const e2 = C;
     let t2 = {};
-    if (e && 1 === e.length)
-      t2 = e[0], Ns = Ns.init(t2), Ns._isDefault = true;
+    if (e2 && 1 === e2.length)
+      t2 = e2[0], Bs = Bs.init(t2), Bs._isDefault = true;
     else {
       const t3 = ["auth", "callFunction", "uploadFile", "deleteFile", "getTempFileURL", "downloadFile", "database", "getCurrentUSerInfo", "importObject"];
       let n2;
-      n2 = e && e.length > 0 ? "应用有多个服务空间，请通过uniCloud.init方法指定要使用的服务空间" : "应用未关联服务空间，请在uniCloud目录右键关联服务空间", t3.forEach((e2) => {
-        Ns[e2] = function() {
-          return console.error(n2), Promise.reject(new ne({ code: "SYS_ERR", message: n2 }));
+      n2 = e2 && e2.length > 0 ? "应用有多个服务空间，请通过uniCloud.init方法指定要使用的服务空间" : "应用未关联服务空间，请在uniCloud目录右键关联服务空间", t3.forEach((e3) => {
+        Bs[e3] = function() {
+          return console.error(n2), Promise.reject(new te({ code: "SYS_ERR", message: n2 }));
         };
       });
     }
-    Object.assign(Ns, { get mixinDatacom() {
-      return bs(Ns);
-    } }), gs(Ns), Ns.addInterceptor = D, Ns.removeInterceptor = F, Ns.interceptObject = K;
+    Object.assign(Bs, { get mixinDatacom() {
+      return Os(Bs);
+    } }), Ss(Bs), Bs.addInterceptor = N, Bs.removeInterceptor = D, Bs.interceptObject = F;
   })();
-  var Ds = Ns;
-  const _sfc_main$G = {
+  var $s = Bs;
+  const _sfc_main$I = {
     name: "loading1",
     data() {
       return {};
     }
   };
-  function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock("view", { class: "container loading1" }, [
       vue.createElementVNode("view", { class: "shape shape1" }),
       vue.createElementVNode("view", { class: "shape shape2" }),
@@ -14205,14 +15139,14 @@ This will fail in production.`);
       vue.createElementVNode("view", { class: "shape shape4" })
     ]);
   }
-  const Loading1 = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["render", _sfc_render$f], ["__scopeId", "data-v-0e645258"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-loading/loading1.vue"]]);
-  const _sfc_main$F = {
+  const Loading1 = /* @__PURE__ */ _export_sfc(_sfc_main$I, [["render", _sfc_render$b], ["__scopeId", "data-v-0e645258"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-loading/loading1.vue"]]);
+  const _sfc_main$H = {
     name: "loading2",
     data() {
       return {};
     }
   };
-  function _sfc_render$e(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock("view", { class: "container loading2" }, [
       vue.createElementVNode("view", { class: "shape shape1" }),
       vue.createElementVNode("view", { class: "shape shape2" }),
@@ -14220,14 +15154,14 @@ This will fail in production.`);
       vue.createElementVNode("view", { class: "shape shape4" })
     ]);
   }
-  const Loading2 = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["render", _sfc_render$e], ["__scopeId", "data-v-3df48dc2"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-loading/loading2.vue"]]);
-  const _sfc_main$E = {
+  const Loading2 = /* @__PURE__ */ _export_sfc(_sfc_main$H, [["render", _sfc_render$a], ["__scopeId", "data-v-3df48dc2"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-loading/loading2.vue"]]);
+  const _sfc_main$G = {
     name: "loading3",
     data() {
       return {};
     }
   };
-  function _sfc_render$d(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock("view", { class: "container loading3" }, [
       vue.createElementVNode("view", { class: "shape shape1" }),
       vue.createElementVNode("view", { class: "shape shape2" }),
@@ -14235,14 +15169,14 @@ This will fail in production.`);
       vue.createElementVNode("view", { class: "shape shape4" })
     ]);
   }
-  const Loading3 = /* @__PURE__ */ _export_sfc(_sfc_main$E, [["render", _sfc_render$d], ["__scopeId", "data-v-27a8293c"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-loading/loading3.vue"]]);
-  const _sfc_main$D = {
+  const Loading3 = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["render", _sfc_render$9], ["__scopeId", "data-v-27a8293c"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-loading/loading3.vue"]]);
+  const _sfc_main$F = {
     name: "loading5",
     data() {
       return {};
     }
   };
-  function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock("view", { class: "container loading5" }, [
       vue.createElementVNode("view", { class: "shape shape1" }),
       vue.createElementVNode("view", { class: "shape shape2" }),
@@ -14250,14 +15184,14 @@ This will fail in production.`);
       vue.createElementVNode("view", { class: "shape shape4" })
     ]);
   }
-  const Loading4 = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["render", _sfc_render$c], ["__scopeId", "data-v-2e7deb83"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-loading/loading4.vue"]]);
-  const _sfc_main$C = {
+  const Loading4 = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["render", _sfc_render$8], ["__scopeId", "data-v-2e7deb83"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-loading/loading4.vue"]]);
+  const _sfc_main$E = {
     name: "loading6",
     data() {
       return {};
     }
   };
-  function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock("view", { class: "container loading6" }, [
       vue.createElementVNode("view", { class: "shape shape1" }),
       vue.createElementVNode("view", { class: "shape shape2" }),
@@ -14265,8 +15199,8 @@ This will fail in production.`);
       vue.createElementVNode("view", { class: "shape shape4" })
     ]);
   }
-  const Loading5 = /* @__PURE__ */ _export_sfc(_sfc_main$C, [["render", _sfc_render$b], ["__scopeId", "data-v-ef674bbb"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-loading/loading5.vue"]]);
-  const _sfc_main$B = {
+  const Loading5 = /* @__PURE__ */ _export_sfc(_sfc_main$E, [["render", _sfc_render$7], ["__scopeId", "data-v-ef674bbb"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-loading/loading5.vue"]]);
+  const _sfc_main$D = {
     components: { Loading1, Loading2, Loading3, Loading4, Loading5 },
     name: "qiun-loading",
     props: {
@@ -14279,7 +15213,7 @@ This will fail in production.`);
       return {};
     }
   };
-  function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_Loading1 = vue.resolveComponent("Loading1");
     const _component_Loading2 = vue.resolveComponent("Loading2");
     const _component_Loading3 = vue.resolveComponent("Loading3");
@@ -14293,8 +15227,8 @@ This will fail in production.`);
       $props.loadingType == 5 ? (vue.openBlock(), vue.createBlock(_component_Loading5, { key: 4 })) : vue.createCommentVNode("v-if", true)
     ]);
   }
-  const __easycom_0$1 = /* @__PURE__ */ _export_sfc(_sfc_main$B, [["render", _sfc_render$a], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.vue"]]);
-  const _sfc_main$A = {
+  const __easycom_0 = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["render", _sfc_render$6], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.vue"]]);
+  const _sfc_main$C = {
     name: "qiun-error",
     props: {
       errorMessage: {
@@ -14306,7 +15240,7 @@ This will fail in production.`);
       return {};
     }
   };
-  function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
     return vue.openBlock(), vue.createElementBlock("view", { class: "chartsview" }, [
       vue.createElementVNode("view", { class: "charts-error" }),
       vue.createElementVNode(
@@ -14318,7 +15252,7 @@ This will fail in production.`);
       )
     ]);
   }
-  const __easycom_1$3 = /* @__PURE__ */ _export_sfc(_sfc_main$A, [["render", _sfc_render$9], ["__scopeId", "data-v-a99d579b"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.vue"]]);
+  const __easycom_1$2 = /* @__PURE__ */ _export_sfc(_sfc_main$C, [["render", _sfc_render$5], ["__scopeId", "data-v-a99d579b"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.vue"]]);
   const color$1 = ["#1890FF", "#91CB74", "#FAC858", "#EE6666", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"];
   const formatDateTime = (timeStamp, returnType) => {
     var date2 = /* @__PURE__ */ new Date();
@@ -15296,7 +16230,7 @@ This will fail in production.`);
       }
     }
   };
-  const block0$1 = (Comp) => {
+  const block0 = (Comp) => {
     (Comp.$renderjs || (Comp.$renderjs = [])).push("rdcharts");
     (Comp.$renderjsModules || (Comp.$renderjsModules = {}))["rdcharts"] = "f9cb76fc";
   };
@@ -15334,9 +16268,9 @@ This will fail in production.`);
     var currentdate = year + seperator + month + seperator + strDate;
     return currentdate;
   }
-  const _sfc_main$z = {
+  const _sfc_main$B = {
     name: "qiun-data-charts",
-    mixins: [Ds.mixinDatacom],
+    mixins: [$s.mixinDatacom],
     props: {
       type: {
         type: String,
@@ -15774,21 +16708,21 @@ This will fail in production.`);
             }
           }
         } else {
-          for (let k2 = 0; k2 < tmpseries.length; k2++) {
+          for (let k = 0; k < tmpseries.length; k++) {
             if (tmpcategories.length > 0) {
               for (let j2 = 0; j2 < tmpcategories.length; j2++) {
                 let seriesdata = 0;
                 for (let i2 = 0; i2 < resdata.length; i2++) {
-                  if (tmpseries[k2].name == resdata[i2].group && resdata[i2].text == tmpcategories[j2]) {
+                  if (tmpseries[k].name == resdata[i2].group && resdata[i2].text == tmpcategories[j2]) {
                     seriesdata = resdata[i2].value;
                   }
                 }
-                tmpseries[k2].data.push(seriesdata);
+                tmpseries[k].data.push(seriesdata);
               }
             } else {
               for (let i2 = 0; i2 < resdata.length; i2++) {
-                if (tmpseries[k2].name == resdata[i2].group) {
-                  tmpseries[k2].data.push(resdata[i2].value);
+                if (tmpseries[k].name == resdata[i2].group) {
+                  tmpseries[k].data.push(resdata[i2].value);
                 }
               }
             }
@@ -16024,8 +16958,8 @@ This will fail in production.`);
           });
         }
       },
-      _error(e) {
-        this.mixinDatacomErrorMessage = e.detail.errMsg;
+      _error(e2) {
+        this.mixinDatacomErrorMessage = e2.detail.errMsg;
       },
       emitMsg(msg) {
         this.$emit(msg.name, msg.params);
@@ -16040,9 +16974,9 @@ This will fail in production.`);
       }
     }
   };
-  function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
-    const _component_qiun_loading = resolveEasycom(vue.resolveDynamicComponent("qiun-loading"), __easycom_0$1);
-    const _component_qiun_error = resolveEasycom(vue.resolveDynamicComponent("qiun-error"), __easycom_1$3);
+  function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
+    const _component_qiun_loading = resolveEasycom(vue.resolveDynamicComponent("qiun-loading"), __easycom_0);
+    const _component_qiun_error = resolveEasycom(vue.resolveDynamicComponent("qiun-error"), __easycom_1$2);
     return vue.openBlock(), vue.createElementBlock("view", {
       class: "chartsview",
       id: "ChartBoxId" + $data.cid
@@ -16097,10 +17031,10 @@ This will fail in production.`);
       vue.createCommentVNode(" 其他小程序通过vue渲染图表 ")
     ], 8, ["id"]);
   }
-  if (typeof block0$1 === "function")
-    block0$1(_sfc_main$z);
-  const __easycom_1$2 = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["render", _sfc_render$8], ["__scopeId", "data-v-0ca34aee"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue"]]);
-  const _sfc_main$y = {
+  if (typeof block0 === "function")
+    block0(_sfc_main$B);
+  const __easycom_1$1 = /* @__PURE__ */ _export_sfc(_sfc_main$B, [["render", _sfc_render$4], ["__scopeId", "data-v-0ca34aee"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue"]]);
+  const _sfc_main$A = {
     data() {
       return {
         aaa: [
@@ -16521,9 +17455,9 @@ This will fail in production.`);
       }
     }
   };
-  function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$7);
-    const _component_qiun_data_charts = resolveEasycom(vue.resolveDynamicComponent("qiun-data-charts"), __easycom_1$2);
+    const _component_qiun_data_charts = resolveEasycom(vue.resolveDynamicComponent("qiun-data-charts"), __easycom_1$1);
     return vue.openBlock(), vue.createElementBlock("view", {
       class: "",
       style: { "padding": "30rpx" }
@@ -16594,8 +17528,8 @@ This will fail in production.`);
       ])
     ]);
   }
-  const PagesProfileIndex = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["render", _sfc_render$7], ["__scopeId", "data-v-201c0da5"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/profile/index.vue"]]);
-  const props$4 = {
+  const PagesProfileIndex = /* @__PURE__ */ _export_sfc(_sfc_main$A, [["render", _sfc_render$3], ["__scopeId", "data-v-201c0da5"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/profile/index.vue"]]);
+  const props = {
     props: {
       // 搜索框形状，round-圆形，square-方形
       shape: {
@@ -16717,9 +17651,9 @@ This will fail in production.`);
       }
     }
   };
-  const _sfc_main$x = {
+  const _sfc_main$z = {
     name: "u-search",
-    mixins: [mpMixin, mixin, props$4],
+    mixins: [mpMixin, mixin, props],
     data() {
       return {
         keyword: "",
@@ -16752,8 +17686,8 @@ This will fail in production.`);
     emits: ["clear", "search", "custom", "focus", "blur", "click", "clickIcon", "update:modelValue", "change"],
     methods: {
       // 目前HX2.6.9 v-model双向绑定无效，故监听input事件获取输入框内容的变化
-      inputChange(e) {
-        this.keyword = e.detail.value;
+      inputChange(e2) {
+        this.keyword = e2.detail.value;
       },
       // 清空输入
       // 也可以作为用户通过this.$refs形式调用清空输入框内容
@@ -16764,11 +17698,11 @@ This will fail in production.`);
         });
       },
       // 确定搜索
-      search(e) {
-        this.$emit("search", e.detail.value);
+      search(e2) {
+        this.$emit("search", e2.detail.value);
         try {
           uni.hideKeyboard();
-        } catch (e2) {
+        } catch (e3) {
         }
       },
       // 点击右边自定义按钮的事件
@@ -16776,7 +17710,7 @@ This will fail in production.`);
         this.$emit("custom", this.keyword);
         try {
           uni.hideKeyboard();
-        } catch (e) {
+        } catch (e2) {
         }
       },
       // 获取焦点
@@ -16800,16 +17734,16 @@ This will fail in production.`);
           this.$emit("click");
       },
       // 点击左边图标
-      clickIcon(e) {
+      clickIcon(e2) {
         this.$emit("clickIcon", this.keyword);
         try {
           uni.hideKeyboard();
-        } catch (e2) {
+        } catch (e3) {
         }
       }
     }
   };
-  function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
+  function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$7);
     return vue.openBlock(), vue.createElementBlock(
       "view",
@@ -16903,8 +17837,8 @@ This will fail in production.`);
       /* STYLE */
     );
   }
-  const __easycom_1$1 = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["render", _sfc_render$6], ["__scopeId", "data-v-ed789780"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-search/u-search.vue"]]);
-  const _sfc_main$w = {
+  const __easycom_1 = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["render", _sfc_render$2], ["__scopeId", "data-v-ed789780"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-search/u-search.vue"]]);
+  const _sfc_main$y = {
     __name: "feedList",
     setup(__props) {
       const navgo = (url2) => {
@@ -16935,29 +17869,10 @@ This will fail in production.`);
         });
       };
       return (_ctx, _cache) => {
-        const _component_u_search = resolveEasycom(vue.resolveDynamicComponent("u-search"), __easycom_1$1);
+        const _component_u_search = resolveEasycom(vue.resolveDynamicComponent("u-search"), __easycom_1);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
-          vue.createElementVNode("view", { class: "card" }, [
-            vue.createElementVNode("view", { class: "tit" }, [
-              vue.createElementVNode("view", { class: "" }, " 农户名称: 1号土地 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 种养殖类型: 土豆 "),
-              vue.createElementVNode("view", { class: "" }, " 养殖头数: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 土地面积: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 公猪: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 养殖种类: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 母猪: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 具体种类: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 幼崽: 的划分等级 ")
-            ])
-          ]),
+          vue.createCommentVNode(' <view class="card">\r\n			<view class="tit">\r\n				<view class="">\r\n					农户名称: 1号土地\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					种养殖类型: 土豆\r\n				</view>\r\n				<view class="">\r\n					养殖头数: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					土地面积: 20亩\r\n				</view>\r\n				<view class="">\r\n					公猪: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					养殖种类: 20亩\r\n				</view>\r\n				<view class="">\r\n					母猪: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					具体种类: 20亩\r\n				</view>\r\n				<view class="">\r\n					幼崽: 的划分等级\r\n				</view>\r\n			</view>\r\n			\r\n		</view> '),
+          vue.createVNode(farmersCard$1),
           vue.createElementVNode("view", { class: "serch" }, [
             vue.createVNode(_component_u_search, {
               bgColor: "white",
@@ -16980,7 +17895,7 @@ This will fail in production.`);
               return vue.openBlock(), vue.createElementBlock("view", {
                 class: "card",
                 key: index2,
-                onClick: _cache[1] || (_cache[1] = ($event) => navgo("/pages/feedIng/feedDetail"))
+                onClick: ($event) => navgo(`/pages/feedIng/feedDetail?id=${item.id}`)
               }, [
                 vue.createElementVNode("view", { class: "tit" }, [
                   vue.createElementVNode(
@@ -17034,21 +17949,21 @@ This will fail in production.`);
                     /* TEXT */
                   )
                 ])
-              ]);
+              ], 8, ["onClick"]);
             }),
             128
             /* KEYED_FRAGMENT */
           )),
           vue.createElementVNode("view", {
             class: "ripe-btn",
-            onClick: _cache[2] || (_cache[2] = ($event) => navgo("/pages/feedIng/addPoultry"))
+            onClick: _cache[1] || (_cache[1] = ($event) => navgo("/pages/feedIng/addPoultry"))
           }, " 添加新动物 ")
         ]);
       };
     }
   };
-  const PagesFeedIngFeedList = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["__scopeId", "data-v-369a728b"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/feedList.vue"]]);
-  const _sfc_main$v = {
+  const PagesFeedIngFeedList = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__scopeId", "data-v-369a728b"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/feedList.vue"]]);
+  const _sfc_main$x = {
     __name: "feedDetail",
     setup(__props) {
       const selectList = vue.reactive([
@@ -17057,9 +17972,10 @@ This will fail in production.`);
         "生病隔离中",
         "可出栏"
       ]);
+      const actionList = vue.reactive({});
       const value = vue.ref("");
       const selectAct = vue.ref(false);
-      const selectFoucsFn = (e) => {
+      const selectFoucsFn = (e2) => {
         selectAct.value = true;
       };
       const indexs = vue.ref(0);
@@ -17068,10 +17984,27 @@ This will fail in production.`);
         value.value = selectList[index2];
         formData.status = index2 + 1;
       };
-      const animal_id = vue.ref(0);
+      const animal_id2 = vue.ref(0);
+      const baseData = vue.reactive({});
       onLoad((options) => {
-        animal_id.value = options.id;
+        animal_id2.value = options.id;
         formData.animal_id = options.id;
+        animalInfoAPI$1({
+          animal_id: options.id
+        }).then((res) => {
+          for (let key in res.data) {
+            baseData[key] = res.data[key];
+          }
+          formData.animal_weight = baseData.animal_weight;
+          value.value = selectList[baseData.animal_status - 1];
+          indexs.value = baseData.animal_status - 1;
+        });
+        animalChangeListAPI({
+          animal_id: animal_id2.value
+        }).then((res) => {
+          formatAppLog("log", "at pages/feedIng/feedDetail.vue:174", res.data);
+          return;
+        });
       });
       const navgo = (url2) => {
         uni.navigateTo({
@@ -17094,9 +18027,8 @@ This will fail in production.`);
         });
       };
       const outBar = () => {
-        animalStatusAPI({
-          status: 4,
-          animal_id: animal_id.value
+        animalSellAPI({
+          animal_id: animal_id2.value
         }).then((res) => {
           uni.showToast({
             title: res.msg,
@@ -17110,36 +18042,18 @@ This will fail in production.`);
         });
       };
       return (_ctx, _cache) => {
+        var _a;
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
         return vue.openBlock(), vue.createElementBlock(
           "view",
           {
             class: "content",
-            onClickCapture: _cache[3] || (_cache[3] = ($event) => selectAct.value = false)
+            onClickCapture: _cache[4] || (_cache[4] = ($event) => selectAct.value = false)
           },
           [
-            vue.createElementVNode("view", { class: "card" }, [
-              vue.createElementVNode("view", { class: "tit" }, [
-                vue.createElementVNode("view", { class: "" }, " 农户名称: 1号土地 ")
-              ]),
-              vue.createElementVNode("view", { class: "card-li" }, [
-                vue.createElementVNode("view", { class: "" }, " 种养殖类型: 土豆 "),
-                vue.createElementVNode("view", { class: "" }, " 养殖头数: 的划分等级 ")
-              ]),
-              vue.createElementVNode("view", { class: "card-li" }, [
-                vue.createElementVNode("view", { class: "" }, " 土地面积: 20亩 "),
-                vue.createElementVNode("view", { class: "" }, " 公猪: 的划分等级 ")
-              ]),
-              vue.createElementVNode("view", { class: "card-li" }, [
-                vue.createElementVNode("view", { class: "" }, " 养殖种类: 20亩 "),
-                vue.createElementVNode("view", { class: "" }, " 母猪: 的划分等级 ")
-              ]),
-              vue.createElementVNode("view", { class: "card-li" }, [
-                vue.createElementVNode("view", { class: "" }, " 具体种类: 20亩 "),
-                vue.createElementVNode("view", { class: "" }, " 幼崽: 的划分等级 ")
-              ])
-            ]),
+            vue.createCommentVNode(' <view class="card">\r\n			<view class="tit">\r\n				<view class="">\r\n					农户名称: 1号土地\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					种养殖类型: 土豆\r\n				</view>\r\n				<view class="">\r\n					养殖头数: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					土地面积: 20亩\r\n				</view>\r\n				<view class="">\r\n					公猪: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					养殖种类: 20亩\r\n				</view>\r\n				<view class="">\r\n					母猪: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					具体种类: 20亩\r\n				</view>\r\n				<view class="">\r\n					幼崽: 的划分等级\r\n				</view>\r\n			</view>\r\n		</view> '),
+            vue.createVNode(farmersCard$1),
             vue.createCommentVNode(` <view class="serch">\r
 			<u-search bgColor='white' height='63.08rpx' :show-action="false" actionText="搜索"\r
 				:animation="true"></u-search>\r
@@ -17148,10 +18062,16 @@ This will fail in production.`);
 			</view>\r
 		</view> `),
             vue.createElementVNode("view", { class: "title" }, [
-              vue.createElementVNode("view", { class: "" }, " 编号: 13645 "),
+              vue.createElementVNode(
+                "view",
+                { class: "" },
+                " 编号: " + vue.toDisplayString(baseData.animal_code),
+                1
+                /* TEXT */
+              ),
               vue.createElementVNode("view", {
                 class: "more-jt",
-                onClick: _cache[0] || (_cache[0] = ($event) => navgo(`/pages/feedIng/SingleDetail?id=${animal_id.value}`))
+                onClick: _cache[0] || (_cache[0] = ($event) => navgo(`/pages/feedIng/SingleDetail?id=${animal_id2.value}`))
               }, [
                 vue.createTextVNode(" 查看养殖详情 "),
                 vue.createVNode(_component_u__image, {
@@ -17170,9 +18090,9 @@ This will fail in production.`);
                     class: "",
                     onClickCapture: selectFoucsFn
                   },
-                  " 养殖类型: 母猪 ",
-                  32
-                  /* HYDRATE_EVENTS */
+                  " 养殖类型: " + vue.toDisplayString(baseData.animal_kind),
+                  33
+                  /* TEXT, HYDRATE_EVENTS */
                 ),
                 vue.createElementVNode("view", {
                   class: "",
@@ -17192,7 +18112,13 @@ This will fail in production.`);
                 class: "card-li",
                 style: { "align-items": "center" }
               }, [
-                vue.createElementVNode("view", { class: "" }, " 年龄: 2年 "),
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 年龄: " + vue.toDisplayString(baseData.animal_age) + "年 ",
+                  1
+                  /* TEXT */
+                ),
                 vue.createElementVNode("view", { class: "select" }, [
                   vue.createTextVNode(" 状态: "),
                   vue.createVNode(_component_up_input, {
@@ -17266,20 +18192,51 @@ This will fail in production.`);
                   ])
                 ])
               ]),
-              vue.createVNode(imgCard),
+              vue.createVNode(imgCard, {
+                imgUrl: (_a = baseData == null ? void 0 : baseData.pic_detail) == null ? void 0 : _a.pic
+              }, null, 8, ["imgUrl"]),
               vue.createElementVNode("view", {
                 class: "up-plant-btn",
                 onClick: updataStatusFn
               }, " 确认更新 ")
             ]),
-            vue.createElementVNode("view", { class: "title" }, [
-              vue.createElementVNode("view", { class: "" }, " 饲养记录 "),
-              vue.createElementVNode("view", { class: "updata-btn" }, " 更新生长记录 ")
-            ]),
-            vue.createVNode(myTable, {
-              tit: "查看历史饲养记录",
-              route: "/pages/feedIng/allFeed"
-            }),
+            (vue.openBlock(true), vue.createElementBlock(
+              vue.Fragment,
+              null,
+              vue.renderList(actionList, (item, index2) => {
+                return vue.openBlock(), vue.createElementBlock("view", {
+                  class: "circumstance",
+                  key: index2
+                }, [
+                  vue.createElementVNode("view", { class: "card-tit" }, [
+                    vue.createElementVNode(
+                      "view",
+                      { class: "" },
+                      vue.toDisplayString(index2),
+                      1
+                      /* TEXT */
+                    ),
+                    vue.createElementVNode(
+                      "view",
+                      {
+                        class: "updata-btn",
+                        onClick: _cache[3] || (_cache[3] = ($event) => navgo("/pages/growRecord/index"))
+                      },
+                      " 更新" + vue.toDisplayString(index2.slice(0, -2)),
+                      1
+                      /* TEXT */
+                    )
+                  ]),
+                  vue.createVNode(myTable, {
+                    tit: `查看${index2.slice(0, -2)}`,
+                    dataList: item.action_record,
+                    route: `/pages/feedIng/allRecording?id=${animal_id2.value}`
+                  }, null, 8, ["tit", "dataList", "route"])
+                ]);
+              }),
+              128
+              /* KEYED_FRAGMENT */
+            )),
             vue.createElementVNode("view", {
               class: "ripe-btn",
               onClick: outBar
@@ -17291,81 +18248,291 @@ This will fail in production.`);
       };
     }
   };
-  const PagesFeedIngFeedDetail = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["__scopeId", "data-v-693c046c"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/feedDetail.vue"]]);
-  const _sfc_main$u = {
-    __name: "histroyFeed",
+  const PagesFeedIngFeedDetail = /* @__PURE__ */ _export_sfc(_sfc_main$x, [["__scopeId", "data-v-693c046c"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/feedDetail.vue"]]);
+  const _sfc_main$w = {
+    __name: "detailCard",
+    props: {
+      id: String,
+      showImg: Boolean
+    },
     setup(__props) {
+      const props2 = __props;
+      const dateFn = () => {
+        var today = /* @__PURE__ */ new Date();
+        var year = today.getFullYear();
+        var month = today.getMonth() + 1;
+        var day = today.getDate();
+        var dateStr = year + "-" + month + "-" + day;
+        return dateStr;
+      };
+      const navgo = (url2) => {
+        uni.navigateTo({
+          url: url2
+        });
+      };
+      const objFn = (res, data) => {
+        for (let key in res) {
+          data[key] = res[key];
+        }
+      };
+      const animal_detail = vue.reactive({});
+      vue.watch(props2, (newValue, oldVlaue) => {
+        if (props2 == null ? void 0 : props2.id) {
+          animalInfoAPI$1({
+            animal_id: Number(props2.id)
+          }).then((res) => {
+            objFn(res.data, animal_detail);
+          });
+        }
+      }, {
+        // 页面加载会先执行一次
+        immediate: true
+      });
       const updateImgFn = () => {
         uplodeImg().then((res) => {
+          animal_detail.pic_detail.pic = res.data.image;
           addAnimalPicAPI$1({
-            animal_id: Number(animal_id.value),
+            animal_id: Number(props2.id),
+            pic: res.data.image
+          });
+        });
+      };
+      return (_ctx, _cache) => {
+        var _a;
+        const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
+        return vue.openBlock(), vue.createElementBlock(
+          vue.Fragment,
+          null,
+          [
+            props2.showImg ? (vue.openBlock(), vue.createElementBlock("view", {
+              key: 0,
+              class: ""
+            }, [
+              ((_a = animal_detail == null ? void 0 : animal_detail.pic_detail) == null ? void 0 : _a.pic) ? (vue.openBlock(), vue.createElementBlock("view", {
+                key: 0,
+                class: ""
+              }, [
+                vue.createVNode(imgCard, {
+                  imgUrl: animal_detail.pic_detail.pic
+                }, null, 8, ["imgUrl"])
+              ])) : vue.createCommentVNode("v-if", true),
+              vue.createElementVNode("view", { class: "bad-info" }, [
+                vue.createElementVNode("view", {
+                  class: "",
+                  style: { "display": "flex", "align-items": "center" }
+                }, [
+                  vue.createVNode(_component_u__image, {
+                    src: "/static/img/sj.png')",
+                    style: { "margin": "0 5rpx" },
+                    width: "28.04rpx",
+                    height: "28.04rpx"
+                  }),
+                  vue.createElementVNode(
+                    "text",
+                    null,
+                    "刷新时间:" + vue.toDisplayString(dateFn()),
+                    1
+                    /* TEXT */
+                  )
+                ]),
+                vue.createElementVNode("view", {
+                  style: { "display": "flex" },
+                  onClick: _cache[0] || (_cache[0] = ($event) => navgo(`/pages/feedIng/histroyFeed?id=${props2.id}`))
+                }, [
+                  vue.createTextVNode(" 查看历史条件 "),
+                  vue.createVNode(_component_u__image, {
+                    src: "/static/img/CKGD.png",
+                    style: { "margin-left": "5rpx" },
+                    width: "31.54rpx",
+                    height: "31.54rpx"
+                  })
+                ])
+              ]),
+              vue.createElementVNode("view", {
+                class: "up-plant-btn",
+                onClick: updateImgFn
+              }, " 上传新的种植情况 ")
+            ])) : vue.createCommentVNode("v-if", true),
+            vue.createElementVNode("view", { class: "card" }, [
+              vue.createElementVNode("view", { class: "tit" }, [
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 溯源码: " + vue.toDisplayString(animal_detail.animal_code),
+                  1
+                  /* TEXT */
+                )
+              ]),
+              vue.createElementVNode("view", { class: "card-li" }, [
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 养殖品种: " + vue.toDisplayString(animal_detail.animal_kind),
+                  1
+                  /* TEXT */
+                ),
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 年龄: " + vue.toDisplayString(animal_detail.animal_age),
+                  1
+                  /* TEXT */
+                )
+              ]),
+              vue.createElementVNode("view", { class: "card-li" }, [
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 养殖类型: " + vue.toDisplayString(animal_detail.animal_breed),
+                  1
+                  /* TEXT */
+                ),
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 体重:" + vue.toDisplayString(animal_detail.animal_weight),
+                  1
+                  /* TEXT */
+                )
+              ])
+            ]),
+            vue.createElementVNode("view", { class: "card" }, [
+              vue.createElementVNode("view", { class: "card-li" }, [
+                vue.createElementVNode("view", {
+                  class: "",
+                  style: { "display": "flex", "align-items": "center" }
+                }, [
+                  vue.createVNode(_component_u__image, {
+                    src: "/static/img/GG.png",
+                    style: { "margin": "0 21rpx" },
+                    width: "80rpx",
+                    height: "80rpx"
+                  }),
+                  vue.createTextVNode(" 当前养殖状态 ")
+                ]),
+                animal_detail.animal_status == 1 ? (vue.openBlock(), vue.createElementBlock("view", {
+                  key: 0,
+                  class: "",
+                  style: { "color": "#00A15E" }
+                }, " 健康 ")) : vue.createCommentVNode("v-if", true),
+                animal_detail.animal_status == 2 ? (vue.openBlock(), vue.createElementBlock("view", {
+                  key: 1,
+                  class: "",
+                  style: { "color": "#FFD736" }
+                }, " 怀孕中 ")) : vue.createCommentVNode("v-if", true),
+                animal_detail.animal_status == 4 ? (vue.openBlock(), vue.createElementBlock("view", {
+                  key: 2,
+                  class: "",
+                  style: { "color": "#3274F9" }
+                }, " 可出栏 ")) : vue.createCommentVNode("v-if", true),
+                animal_detail.animal_status == 3 ? (vue.openBlock(), vue.createElementBlock("view", {
+                  key: 3,
+                  class: "",
+                  style: { "color": "#F84221" }
+                }, " 生病隔离中 ")) : vue.createCommentVNode("v-if", true)
+              ])
+            ])
+          ],
+          64
+          /* STABLE_FRAGMENT */
+        );
+      };
+    }
+  };
+  const detailCard$1 = /* @__PURE__ */ _export_sfc(_sfc_main$w, [["__scopeId", "data-v-ee959ecb"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/animal/detailCard.vue"]]);
+  const _sfc_main$v = {
+    __name: "histroyFeed",
+    setup(__props) {
+      const img = vue.ref("");
+      const updateImgFn = () => {
+        uplodeImg().then((res) => {
+          img.value = res.data.image;
+          addAnimalPicAPI$1({
+            animal_id: Number(animal_id2.value),
             pic: res.data.image
           }).then((res2) => {
-            formatAppLog("log", "at pages/feedIng/histroyFeed.vue:82", res2);
+            imgList.unshift(img.value);
           });
         });
       };
       const imgList = vue.reactive([]);
-      const animal_id = vue.ref("");
+      const animal_id2 = vue.ref("");
       onLoad((option) => {
-        animal_id.value = option.id;
+        animal_id2.value = option.id;
         animalPicListAPI$1({
           animal_id: option.id
         }).then((res) => {
           res.data.forEach((item) => {
-            imgList.push(item);
+            imgList.push(item.pic);
           });
         });
       });
+      const previewImage = (index2) => {
+        uni.previewImage({
+          urls: imgList,
+          current: index2
+        });
+      };
       return (_ctx, _cache) => {
-        const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
-          vue.createElementVNode("view", { class: "card" }, [
-            vue.createElementVNode("view", { class: "tit" }, [
-              vue.createElementVNode("view", { class: "" }, " 编号: 52656 "),
-              vue.createElementVNode("view", { class: "" }, " 溯源码: 52656 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 养殖品种: 土豆 "),
-              vue.createElementVNode("view", { class: "" }, " 年龄: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 养殖类型: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 体重: 45kg ")
-            ])
-          ]),
-          vue.createElementVNode("view", { class: "card" }, [
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", {
-                class: "",
-                style: { "display": "flex", "align-items": "center" }
-              }, [
-                vue.createVNode(_component_u__image, {
-                  src: "/static/img/GG.png",
-                  style: { "margin": "0 21rpx" },
-                  width: "80rpx",
-                  height: "80rpx"
-                }),
-                vue.createTextVNode(" 当前养殖状态 ")
-              ]),
-              vue.createElementVNode("view", {
-                class: "",
-                style: { "color": "green" }
-              }, " 健康 ")
-            ])
-          ]),
+          vue.createCommentVNode(` <view class="card">\r
+			<view class="tit">\r
+\r
+				<view class="">\r
+					溯源码: {{animal_detail.animal_code}}\r
+				</view>\r
+			</view>\r
+			<view class="card-li">\r
+				<view class="">\r
+					养殖品种: {{animal_detail.animal_kind}}\r
+				</view>\r
+				<view class="">\r
+					年龄: {{animal_detail.animal_age}}\r
+				</view>\r
+			</view>\r
+			<view class="card-li">\r
+				<view class="">\r
+					养殖类型: {{animal_detail.animal_breed}}\r
+				</view>\r
+				<view class="">\r
+					体重:{{animal_detail.animal_weight}}\r
+				</view>\r
+			</view>\r
+		</view>\r
+\r
+		<view class="card">\r
+			<view class="card-li">\r
+				<view class="" style="display: flex;align-items: center;">\r
+					<u--image src="/static/img/GG.png" style="margin: 0 21rpx;" width="80rpx" height="80rpx"></u--image>\r
+					当前养殖状态\r
+				</view>\r
+				<view class="" style="color: #00A15E;" v-if='animal_detail.animal_status==1'>\r
+					健康\r
+				</view>\r
+				<view class="" style="color: #FFD736;" v-if='animal_detail.animal_status==2'>\r
+					怀孕中\r
+				</view>\r
+				<view class="" style="color: #3274F9;" v-if='animal_detail.animal_status==4'>\r
+					可出栏\r
+				</view>\r
+				<view class="" style="color: #F84221;" v-if='animal_detail.animal_status==3'>\r
+					生病隔离中\r
+				</view>\r
+			</view>\r
+\r
+		</view> `),
+          vue.createVNode(detailCard$1, { id: animal_id2.value }, null, 8, ["id"]),
           vue.createElementVNode("view", { class: "" }, [
-            vue.createElementVNode("view", { class: "" }, " 今日养殖状态 "),
-            vue.createVNode(imgCard),
             vue.createElementVNode("view", { class: "" }, " 养殖情况 "),
             (vue.openBlock(true), vue.createElementBlock(
               vue.Fragment,
               null,
               vue.renderList(imgList, (item, index2) => {
                 return vue.openBlock(), vue.createBlock(imgCard, {
-                  imgUrl: item.pic,
-                  key: index2
-                }, null, 8, ["imgUrl"]);
+                  imgUrl: item,
+                  key: index2,
+                  onClick: ($event) => previewImage(index2)
+                }, null, 8, ["imgUrl", "onClick"]);
               }),
               128
               /* KEYED_FRAGMENT */
@@ -17379,8 +18546,8 @@ This will fail in production.`);
       };
     }
   };
-  const PagesFeedIngHistroyFeed = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__scopeId", "data-v-7de95975"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/histroyFeed.vue"]]);
-  const _sfc_main$t = {
+  const PagesFeedIngHistroyFeed = /* @__PURE__ */ _export_sfc(_sfc_main$v, [["__scopeId", "data-v-7de95975"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/histroyFeed.vue"]]);
+  const _sfc_main$u = {
     __name: "updateFeed",
     setup(__props) {
       const showPop = vue.ref(false);
@@ -17388,8 +18555,8 @@ This will fail in production.`);
         value: ""
       });
       return (_ctx, _cache) => {
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
-        const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_2$3);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
+        const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_1$4);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
           vue.createElementVNode("view", { class: "card" }, [
             vue.createElementVNode("view", { class: "tit" }, [
@@ -17538,338 +18705,8 @@ This will fail in production.`);
       };
     }
   };
-  const PagesFeedIngUpdateFeed = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__scopeId", "data-v-d1a9a218"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/updateFeed.vue"]]);
-  const MIN_DISTANCE = 10;
-  function getDirection(x2, y2) {
-    if (x2 > y2 && x2 > MIN_DISTANCE) {
-      return "horizontal";
-    }
-    if (y2 > x2 && y2 > MIN_DISTANCE) {
-      return "vertical";
-    }
-    return "";
-  }
-  const touch = {
-    methods: {
-      getTouchPoint(e) {
-        if (!e) {
-          return {
-            x: 0,
-            y: 0
-          };
-        }
-        if (e.touches && e.touches[0]) {
-          return {
-            x: e.touches[0].pageX,
-            y: e.touches[0].pageY
-          };
-        }
-        if (e.changedTouches && e.changedTouches[0]) {
-          return {
-            x: e.changedTouches[0].pageX,
-            y: e.changedTouches[0].pageY
-          };
-        }
-        return {
-          x: e.clientX || 0,
-          y: e.clientY || 0
-        };
-      },
-      resetTouchStatus() {
-        this.direction = "";
-        this.deltaX = 0;
-        this.deltaY = 0;
-        this.offsetX = 0;
-        this.offsetY = 0;
-      },
-      touchStart(event) {
-        this.resetTouchStatus();
-        const touch2 = this.getTouchPoint(event);
-        this.startX = touch2.x;
-        this.startY = touch2.y;
-      },
-      touchMove(event) {
-        const touch2 = this.getTouchPoint(event);
-        this.deltaX = touch2.x - this.startX;
-        this.deltaY = touch2.y - this.startY;
-        this.offsetX = Math.abs(this.deltaX);
-        this.offsetY = Math.abs(this.deltaY);
-        this.direction = this.direction || getDirection(this.offsetX, this.offsetY);
-      }
-    }
-  };
-  const props$3 = {
-    props: {
-      // 控制打开或者关闭
-      show: {
-        type: Boolean,
-        default: props$i.swipeActionItem.show
-      },
-      // 标识符，如果是v-for，可用index索引值
-      name: {
-        type: [String, Number],
-        default: props$i.swipeActionItem.name
-      },
-      // 是否禁用
-      disabled: {
-        type: Boolean,
-        default: props$i.swipeActionItem.disabled
-      },
-      // 是否自动关闭其他swipe按钮组
-      autoClose: {
-        type: Boolean,
-        default: props$i.swipeActionItem.autoClose
-      },
-      // 滑动距离阈值，只有大于此值，才被认为是要打开菜单
-      threshold: {
-        type: Number,
-        default: props$i.swipeActionItem.threshold
-      },
-      // 右侧按钮内容
-      options: {
-        type: Array,
-        default() {
-          return uni.$u.props.swipeActionItem.rightOptions;
-        }
-      },
-      // 动画过渡时间，单位ms
-      duration: {
-        type: [String, Number],
-        default: props$i.swipeActionItem.duration
-      }
-    }
-  };
-  const wxs = {
-    methods: {
-      // 关闭时执行
-      closeHandler() {
-        this.status = "close";
-      },
-      setState(status) {
-        this.status = status;
-      },
-      closeOther() {
-        this.parent && this.parent.closeOther(this);
-      }
-    }
-  };
-  const block0 = (Comp) => {
-    (Comp.$wxs || (Comp.$wxs = [])).push("wxs");
-    (Comp.$wxsModules || (Comp.$wxsModules = {}))["wxs"] = "229ea0d2";
-  };
-  const _sfc_main$s = {
-    name: "u-swipe-action-item",
-    emits: ["click"],
-    mixins: [mpMixin, mixin, props$3, touch],
-    mixins: [mpMixin, mixin, props$3, touch, wxs],
-    data() {
-      return {
-        // 按钮的尺寸信息
-        size: {},
-        // 父组件u-swipe-action的参数
-        parentData: {
-          autoClose: true
-        },
-        // 当前状态，open-打开，close-关闭
-        status: "close"
-      };
-    },
-    watch: {
-      // 由于wxs无法直接读取外部的值，需要在外部值变化时，重新执行赋值逻辑
-      wxsInit(newValue, oldValue) {
-        this.queryRect();
-      }
-    },
-    computed: {
-      wxsInit() {
-        return [this.disabled, this.autoClose, this.threshold, this.options, this.duration];
-      }
-    },
-    mounted() {
-      this.init();
-    },
-    methods: {
-      init() {
-        this.updateParentData();
-        uni.$u.sleep().then(() => {
-          this.queryRect();
-        });
-      },
-      updateParentData() {
-        this.getParentData("u-swipe-action");
-      },
-      // 查询节点
-      queryRect() {
-        this.$uGetRect(".u-swipe-action-item__right__button", true).then((buttons) => {
-          this.size = {
-            buttons,
-            show: this.show,
-            disabled: this.disabled,
-            threshold: this.threshold,
-            duration: this.duration
-          };
-        });
-      },
-      // 按钮被点击
-      buttonClickHandler(item, index2) {
-        this.$emit("click", {
-          index: index2,
-          name: this.name
-        });
-      }
-    }
-  };
-  function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
-    const _component_u_icon = resolveEasycom(vue.resolveDynamicComponent("u-icon"), __easycom_0$7);
-    return vue.openBlock(), vue.createElementBlock(
-      "view",
-      {
-        class: "u-swipe-action-item",
-        ref: "u-swipe-action-item"
-      },
-      [
-        vue.createElementVNode("view", { class: "u-swipe-action-item__right" }, [
-          vue.renderSlot(_ctx.$slots, "button", {}, () => [
-            (vue.openBlock(true), vue.createElementBlock(
-              vue.Fragment,
-              null,
-              vue.renderList(_ctx.options, (item, index2) => {
-                return vue.openBlock(), vue.createElementBlock("view", {
-                  key: index2,
-                  class: "u-swipe-action-item__right__button",
-                  ref_for: true,
-                  ref: `u-swipe-action-item__right__button-${index2}`,
-                  style: vue.normalizeStyle([{
-                    alignItems: item.style && item.style.borderRadius ? "center" : "stretch"
-                  }]),
-                  onClick: ($event) => $options.buttonClickHandler(item, index2)
-                }, [
-                  vue.createElementVNode(
-                    "view",
-                    {
-                      class: "u-swipe-action-item__right__button__wrapper",
-                      style: vue.normalizeStyle([{
-                        backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : "#C7C6CD",
-                        borderRadius: item.style && item.style.borderRadius ? item.style.borderRadius : "0",
-                        padding: item.style && item.style.borderRadius ? "0" : "0 15px"
-                      }, item.style])
-                    },
-                    [
-                      item.icon ? (vue.openBlock(), vue.createBlock(_component_u_icon, {
-                        key: 0,
-                        name: item.icon,
-                        color: item.style && item.style.color ? item.style.color : "#ffffff",
-                        size: item.iconSize ? _ctx.$u.addUnit(item.iconSize) : item.style && item.style.fontSize ? _ctx.$u.getPx(item.style.fontSize) * 1.2 : 17,
-                        customStyle: {
-                          marginRight: item.text ? "2px" : 0
-                        }
-                      }, null, 8, ["name", "color", "size", "customStyle"])) : vue.createCommentVNode("v-if", true),
-                      item.text ? (vue.openBlock(), vue.createElementBlock(
-                        "text",
-                        {
-                          key: 1,
-                          class: "u-swipe-action-item__right__button__wrapper__text u-line-1",
-                          style: vue.normalizeStyle([{
-                            color: item.style && item.style.color ? item.style.color : "#ffffff",
-                            fontSize: item.style && item.style.fontSize ? item.style.fontSize : "16px",
-                            lineHeight: item.style && item.style.fontSize ? item.style.fontSize : "16px"
-                          }])
-                        },
-                        vue.toDisplayString(item.text),
-                        5
-                        /* TEXT, STYLE */
-                      )) : vue.createCommentVNode("v-if", true)
-                    ],
-                    4
-                    /* STYLE */
-                  )
-                ], 12, ["onClick"]);
-              }),
-              128
-              /* KEYED_FRAGMENT */
-            ))
-          ], true)
-        ]),
-        vue.createElementVNode("view", {
-          class: "u-swipe-action-item__content",
-          onTouchstart: _cache[0] || (_cache[0] = (...args) => _ctx.wxs.touchstart && _ctx.wxs.touchstart(...args)),
-          onTouchmove: _cache[1] || (_cache[1] = (...args) => _ctx.wxs.touchmove && _ctx.wxs.touchmove(...args)),
-          onTouchend: _cache[2] || (_cache[2] = (...args) => _ctx.wxs.touchend && _ctx.wxs.touchend(...args)),
-          status: vue.wp($data.status),
-          "change:status": _ctx.wxs.statusChange,
-          size: vue.wp($data.size),
-          "change:size": _ctx.wxs.sizeChange
-        }, [
-          vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
-        ], 40, ["status", "change:status", "size", "change:size"])
-      ],
-      512
-      /* NEED_PATCH */
-    );
-  }
-  if (typeof block0 === "function")
-    block0(_sfc_main$s);
-  const __easycom_2 = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["render", _sfc_render$5], ["__scopeId", "data-v-8b5d76c2"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-swipe-action-item/u-swipe-action-item.vue"]]);
-  const props$2 = {
-    props: {
-      // 是否自动关闭其他swipe按钮组
-      autoClose: {
-        type: Boolean,
-        default: props$i.swipeAction.autoClose
-      }
-    }
-  };
-  const _sfc_main$r = {
-    name: "u-swipe-action",
-    mixins: [mpMixin, mixin, props$2],
-    data() {
-      return {};
-    },
-    provide() {
-      return {
-        swipeAction: this
-      };
-    },
-    computed: {
-      // 这里computed的变量，都是子组件u-swipe-action-item需要用到的，由于头条小程序的兼容性差异，子组件无法实时监听父组件参数的变化
-      // 所以需要手动通知子组件，这里返回一个parentData变量，供watch监听，在其中去通知每一个子组件重新从父组件(u-swipe-action-item)
-      // 拉取父组件新的变化后的参数
-      parentData() {
-        return [this.autoClose];
-      }
-    },
-    watch: {
-      // 当父组件需要子组件需要共享的参数发生了变化，手动通知子组件
-      parentData() {
-        if (this.children.length) {
-          this.children.map((child) => {
-            typeof child.updateParentData === "function" && child.updateParentData();
-          });
-        }
-      }
-    },
-    created() {
-      this.children = [];
-    },
-    methods: {
-      closeOther(child) {
-        if (this.autoClose) {
-          this.children.map((item, index2) => {
-            if (child !== item) {
-              item.closeHandler();
-            }
-          });
-        }
-      }
-    }
-  };
-  function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
-    return vue.openBlock(), vue.createElementBlock("view", { class: "u-swipe-action" }, [
-      vue.renderSlot(_ctx.$slots, "default")
-    ]);
-  }
-  const __easycom_3 = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["render", _sfc_render$4], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-swipe-action/u-swipe-action.vue"]]);
-  const _sfc_main$q = {
+  const PagesFeedIngUpdateFeed = /* @__PURE__ */ _export_sfc(_sfc_main$u, [["__scopeId", "data-v-d1a9a218"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/updateFeed.vue"]]);
+  const _sfc_main$t = {
     __name: "vaccineInfo",
     setup(__props) {
       const options1 = vue.reactive([{
@@ -17924,7 +18761,7 @@ This will fail in production.`);
         });
       };
       return (_ctx, _cache) => {
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
         const _component_u_swipe_action_item = resolveEasycom(vue.resolveDynamicComponent("u-swipe-action-item"), __easycom_2);
         const _component_u_swipe_action = resolveEasycom(vue.resolveDynamicComponent("u-swipe-action"), __easycom_3);
@@ -18038,8 +18875,8 @@ This will fail in production.`);
       };
     }
   };
-  const PagesFeedIngVaccineInfo = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["__scopeId", "data-v-b7c58360"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/vaccineInfo.vue"]]);
-  const _sfc_main$p = {
+  const PagesFeedIngVaccineInfo = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["__scopeId", "data-v-b7c58360"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/vaccineInfo.vue"]]);
+  const _sfc_main$s = {
     __name: "addPoultry",
     setup(__props) {
       const navgo = () => {
@@ -18068,11 +18905,11 @@ This will fail in production.`);
       const value1 = vue.ref("");
       const selectAct = vue.ref(false);
       const selectAct1 = vue.ref(false);
-      const selectFoucsFn = (e) => {
+      const selectFoucsFn = (e2) => {
         selectAct.value = true;
         selectAct1.value = false;
       };
-      const selectFoucsFn1 = (e) => {
+      const selectFoucsFn1 = (e2) => {
         selectAct1.value = true;
         selectAct.value = false;
       };
@@ -18128,7 +18965,7 @@ This will fail in production.`);
       };
       const addList = vue.reactive([]);
       return (_ctx, _cache) => {
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
           addList.length ? (vue.openBlock(), vue.createElementBlock(
@@ -18376,8 +19213,73 @@ This will fail in production.`);
       };
     }
   };
-  const PagesFeedIngAddPoultry = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/addPoultry.vue"]]);
-  const _sfc_main$o = {
+  const PagesFeedIngAddPoultry = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/addPoultry.vue"]]);
+  const _sfc_main$r = {
+    __name: "allRecordTable",
+    setup(__props) {
+      const actionList = vue.reactive({});
+      actionsAPI$1({
+        type: 3
+      }).then((res) => {
+        for (let key in res.data) {
+          actionList[key] = res.data[key];
+        }
+      });
+      const navgo = (url2) => {
+        uni.navigateTo({
+          url: url2
+        });
+      };
+      return (_ctx, _cache) => {
+        return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
+          vue.createVNode(farmersCard$1),
+          (vue.openBlock(true), vue.createElementBlock(
+            vue.Fragment,
+            null,
+            vue.renderList(actionList, (item, index2) => {
+              return vue.openBlock(), vue.createElementBlock("view", {
+                class: "circumstance",
+                key: index2
+              }, [
+                vue.createElementVNode("view", { class: "card-tit" }, [
+                  vue.createElementVNode(
+                    "view",
+                    { class: "" },
+                    vue.toDisplayString(index2),
+                    1
+                    /* TEXT */
+                  ),
+                  vue.createElementVNode(
+                    "view",
+                    {
+                      class: "updata-btn",
+                      onClick: _cache[0] || (_cache[0] = ($event) => navgo("/pages/growRecord/index"))
+                    },
+                    " 更新" + vue.toDisplayString(index2.slice(0, -2)),
+                    1
+                    /* TEXT */
+                  )
+                ]),
+                vue.createVNode(myTable, {
+                  dataList: item.action_record
+                }, {
+                  default: vue.withCtx(() => [
+                    vue.createTextVNode("> ")
+                  ]),
+                  _: 2
+                  /* DYNAMIC */
+                }, 1032, ["dataList"])
+              ]);
+            }),
+            128
+            /* KEYED_FRAGMENT */
+          ))
+        ]);
+      };
+    }
+  };
+  const PagesFeedIngAllRecordTable = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__scopeId", "data-v-ccbc2811"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/allRecordTable.vue"]]);
+  const _sfc_main$q = {
     __name: "allFeed",
     setup(__props) {
       return (_ctx, _cache) => {
@@ -18428,100 +19330,23 @@ This will fail in production.`);
       };
     }
   };
-  const PagesFeedIngAllFeed = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["__scopeId", "data-v-394b45fc"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/allFeed.vue"]]);
-  const _sfc_main$n = {
+  const PagesFeedIngAllFeed = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["__scopeId", "data-v-394b45fc"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/allFeed.vue"]]);
+  const _sfc_main$p = {
     __name: "SingleDetail",
     setup(__props) {
-      const urlFn = (name) => {
-        return `/static/img/${name}.png`;
-      };
-      const navgo = (url2) => {
-        uni.navigateTo({
-          url: url2
-        });
-      };
-      const dateFn = () => {
-        var today = /* @__PURE__ */ new Date();
-        var year = today.getFullYear();
-        var month = today.getMonth() + 1;
-        var day = today.getDate();
-        var dateStr = year + "-" + month + "-" + day;
-        return dateStr;
-      };
+      const animal_id2 = vue.ref(0);
+      onLoad((option) => {
+        animal_id2.value = option.id;
+      });
       return (_ctx, _cache) => {
-        const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
-          vue.createVNode(imgCard),
-          vue.createElementVNode("view", { class: "bad-info" }, [
-            vue.createElementVNode("view", {
-              class: "",
-              style: { "display": "flex", "align-items": "center" }
-            }, [
-              vue.createVNode(_component_u__image, {
-                src: urlFn("sj"),
-                style: { "margin": "0 5rpx" },
-                width: "28.04rpx",
-                height: "28.04rpx"
-              }, null, 8, ["src"]),
-              vue.createElementVNode(
-                "text",
-                null,
-                "刷新时间:" + vue.toDisplayString(dateFn()),
-                1
-                /* TEXT */
-              )
-            ]),
-            vue.createElementVNode("view", {
-              style: { "display": "flex" },
-              onClick: _cache[0] || (_cache[0] = ($event) => navgo("/pages/allPlant/index"))
-            }, [
-              vue.createTextVNode(" 查看历史条件 "),
-              vue.createVNode(_component_u__image, {
-                src: "/static/img/CKGD.png",
-                style: { "margin-left": "5rpx" },
-                width: "31.54rpx",
-                height: "31.54rpx"
-              })
-            ])
-          ]),
-          vue.createElementVNode("view", {
-            class: "up-plant-btn",
-            onClick: _cache[1] || (_cache[1] = (...args) => _ctx.updateImgFn && _ctx.updateImgFn(...args))
-          }, " 上传新的种植情况 "),
-          vue.createElementVNode("view", { class: "card" }, [
-            vue.createElementVNode("view", { class: "tit" }, [
-              vue.createElementVNode("view", { class: "" }, " 编号: 52656 "),
-              vue.createElementVNode("view", { class: "" }, " 溯源码: 52656 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 养殖品种: 土豆 "),
-              vue.createElementVNode("view", { class: "" }, " 年龄: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 养殖类型: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 体重: 45kg ")
-            ])
-          ]),
-          vue.createElementVNode("view", { class: "card" }, [
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", {
-                class: "",
-                style: { "display": "flex", "align-items": "center" }
-              }, [
-                vue.createVNode(_component_u__image, {
-                  src: "/static/img/GG.png",
-                  style: { "margin": "0 21rpx" },
-                  width: "80rpx",
-                  height: "80rpx"
-                }),
-                vue.createTextVNode(" 当前养殖状态 ")
-              ]),
-              vue.createElementVNode("view", {
-                class: "",
-                style: { "color": "green" }
-              }, " 健康 ")
-            ])
-          ]),
+          vue.createCommentVNode(' <imgCard></imgCard>\r\n\r\n		<view class="bad-info">\r\n			<view class="" style="display: flex;align-items: center;">\r\n				<u--image :src="urlFn(\'sj\')" style="margin: 0 5rpx;" width="28.04rpx" height="28.04rpx"></u--image>\r\n				<text>刷新时间:{{dateFn()}}</text>\r\n			</view>\r\n			<view style="display: flex;" @click="navgo(`/pages/feedIng/histroyFeed?id=${animal_id}`)">\r\n				查看历史条件 <u--image src="/static/img/CKGD.png" style="margin-left: 5rpx;" width="31.54rpx"\r\n					height="31.54rpx"></u--image>\r\n			</view>\r\n		</view>\r\n		<view class="up-plant-btn" @click="updateImgFn">\r\n			上传新的种植情况\r\n		</view> '),
+          vue.createCommentVNode(' <view class="card">\r\n			<view class="tit">\r\n				<view class="">\r\n					编号: 52656\r\n				</view>\r\n				<view class="">\r\n					溯源码: 52656\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					养殖品种: 土豆\r\n				</view>\r\n				<view class="">\r\n					年龄: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					养殖类型: 20亩\r\n				</view>\r\n				<view class="">\r\n					体重: 45kg\r\n				</view>\r\n			</view>\r\n		</view> '),
+          vue.createCommentVNode(' <view class="card">\r\n			<view class="card-li">\r\n				<view class="" style="display: flex;align-items: center;">\r\n					<u--image src="/static/img/GG.png" style="margin: 0 21rpx;" width="80rpx" height="80rpx"></u--image>\r\n					当前养殖状态\r\n				</view>\r\n				<view class="" style="color: green;">\r\n					健康\r\n				</view>\r\n			</view>\r\n\r\n		</view> '),
+          vue.createVNode(detailCard$1, {
+            id: animal_id2.value,
+            showImg: true
+          }, null, 8, ["id"]),
           vue.createElementVNode("view", { class: "" }, [
             vue.createElementVNode("view", {
               class: "",
@@ -18533,33 +19358,18 @@ This will fail in production.`);
       };
     }
   };
-  const PagesFeedIngSingleDetail = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["__scopeId", "data-v-7f8847a9"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/SingleDetail.vue"]]);
-  const _sfc_main$m = {
+  const PagesFeedIngSingleDetail = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["__scopeId", "data-v-7f8847a9"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/SingleDetail.vue"]]);
+  const _sfc_main$o = {
     __name: "allRecording",
     setup(__props) {
+      const id = vue.ref(0);
+      onLoad((option) => {
+        id.value = option.id;
+      });
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
-          vue.createElementVNode("view", { class: "card" }, [
-            vue.createElementVNode("view", { class: "tit" }, [
-              vue.createElementVNode("view", { class: "" }, " 农户名称: 1号土地 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 种养殖类型: 土豆 "),
-              vue.createElementVNode("view", { class: "" }, " 养殖头数: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 土地面积: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 公猪: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 养殖种类: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 母猪: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 具体种类: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 幼崽: 的划分等级 ")
-            ])
-          ]),
+          vue.createCommentVNode(' <view class="card">\r\n			<view class="tit">\r\n				<view class="">\r\n					农户名称: 1号土地\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					种养殖类型: 土豆\r\n				</view>\r\n				<view class="">\r\n					养殖头数: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					土地面积: 20亩\r\n				</view>\r\n				<view class="">\r\n					公猪: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					养殖种类: 20亩\r\n				</view>\r\n				<view class="">\r\n					母猪: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					具体种类: 20亩\r\n				</view>\r\n				<view class="">\r\n					幼崽: 的划分等级\r\n				</view>\r\n			</view>\r\n		</view> '),
+          vue.createVNode(detailCard$1, { id: id.value }, null, 8, ["id"]),
           vue.createElementVNode("view", {
             class: "",
             style: { "margin-bottom": "20rpx" }
@@ -18569,8 +19379,8 @@ This will fail in production.`);
       };
     }
   };
-  const PagesFeedIngAllRecording = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__scopeId", "data-v-b5c84cbe"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/allRecording.vue"]]);
-  const _sfc_main$l = {
+  const PagesFeedIngAllRecording = /* @__PURE__ */ _export_sfc(_sfc_main$o, [["__scopeId", "data-v-b5c84cbe"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/feedIng/allRecording.vue"]]);
+  const _sfc_main$n = {
     __name: "feedList",
     setup(__props) {
       const navgo = (url2) => {
@@ -18590,6 +19400,7 @@ This will fail in production.`);
       });
       const query = vue.ref("");
       const queryFn = () => {
+        formatAppLog("log", "at pages/poultry/feedList.vue:114", 444454);
         animalList.splice(0, 999999999);
         animalListAPI({
           user_id: 307,
@@ -18601,43 +19412,22 @@ This will fail in production.`);
         });
       };
       return (_ctx, _cache) => {
-        const _component_u_search = resolveEasycom(vue.resolveDynamicComponent("u-search"), __easycom_1$1);
+        const _component_u_search = resolveEasycom(vue.resolveDynamicComponent("u-search"), __easycom_1);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
-          vue.createElementVNode("view", { class: "card" }, [
-            vue.createElementVNode("view", { class: "tit" }, [
-              vue.createElementVNode("view", { class: "" }, " 农户名称: 1号土地 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 种养殖类型: 土豆 "),
-              vue.createElementVNode("view", { class: "" }, " 养殖头数: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 土地面积: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 公猪: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 养殖种类: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 母猪: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 具体种类: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 幼崽: 的划分等级 ")
-            ])
-          ]),
+          vue.createCommentVNode(' <view class="card">\r\n			<view class="tit">\r\n				<view class="">\r\n					农户名称: 1号土地\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					种养殖类型: 土豆\r\n				</view>\r\n				<view class="">\r\n					养殖头数: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					土地面积: 20亩\r\n				</view>\r\n				<view class="">\r\n					公猪: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					养殖种类: 20亩\r\n				</view>\r\n				<view class="">\r\n					母猪: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					具体种类: 20亩\r\n				</view>\r\n				<view class="">\r\n					幼崽: 的划分等级\r\n				</view>\r\n			</view>\r\n		</view> '),
+          vue.createVNode(farmersCard),
           vue.createElementVNode("view", { class: "serch" }, [
             vue.createVNode(_component_u_search, {
               bgColor: "white",
               modelValue: query.value,
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => query.value = $event),
+              onChange: queryFn,
               height: "63.08rpx",
               "show-action": false,
               actionText: "搜索",
               animation: true
             }, null, 8, ["modelValue"]),
-            vue.createElementVNode("view", {
-              class: "serch-btn",
-              onClick: queryFn
-            }, " 搜索 ")
+            vue.createElementVNode("view", { class: "serch-btn" }, " 搜索 ")
           ]),
           (vue.openBlock(true), vue.createElementBlock(
             vue.Fragment,
@@ -18646,7 +19436,7 @@ This will fail in production.`);
               return vue.openBlock(), vue.createElementBlock("view", {
                 class: "card",
                 key: index2,
-                onClick: _cache[1] || (_cache[1] = ($event) => navgo("/pages/feedIng/feedDetail"))
+                onClick: ($event) => navgo(`/pages/poultry/feedDetail?id=${item.id}`)
               }, [
                 vue.createElementVNode("view", { class: "tit" }, [
                   vue.createElementVNode(
@@ -18665,7 +19455,7 @@ This will fail in production.`);
                     key: 1,
                     class: "",
                     style: { "color": "#FFD736" }
-                  }, " 怀孕中 ")) : vue.createCommentVNode("v-if", true),
+                  }, " 产蛋期 ")) : vue.createCommentVNode("v-if", true),
                   item.status == 4 ? (vue.openBlock(), vue.createElementBlock("view", {
                     key: 2,
                     class: "",
@@ -18700,53 +19490,105 @@ This will fail in production.`);
                     /* TEXT */
                   )
                 ])
-              ]);
+              ], 8, ["onClick"]);
             }),
             128
             /* KEYED_FRAGMENT */
           )),
           vue.createElementVNode("view", {
             class: "ripe-btn",
-            onClick: _cache[2] || (_cache[2] = ($event) => navgo("/pages/feedIng/addPoultry"))
+            onClick: _cache[1] || (_cache[1] = ($event) => navgo("/pages/feedIng/addPoultry"))
           }, " 添加新动物 ")
         ]);
       };
     }
   };
-  const PagesPoultryFeedList = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["__scopeId", "data-v-6276b7e4"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/feedList.vue"]]);
-  const _sfc_main$k = {
+  const PagesPoultryFeedList = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["__scopeId", "data-v-6276b7e4"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/feedList.vue"]]);
+  const _sfc_main$m = {
     __name: "feedDetail",
     setup(__props) {
       const selectList = vue.reactive([
         "健康",
-        "怀孕中",
+        "产蛋中",
         "生病隔离中",
         "可出栏"
       ]);
       const value = vue.ref("");
       const selectAct = vue.ref(false);
-      const selectFoucsFn = (e) => {
+      const selectFoucsFn = (e2) => {
         selectAct.value = true;
       };
       const indexs = vue.ref(0);
       const changSelectfn = (index2) => {
         indexs.value = index2;
         value.value = selectList[index2];
+        formData.status = index2 + 1;
       };
-      const animal_id = vue.ref("");
+      const poultry_id = vue.ref(0);
+      const baseData = vue.reactive({});
       onLoad((options) => {
-        animal_id.value = options.id;
-        formatAppLog("log", "at pages/poultry/feedDetail.vue:147", animal_id.value, 6666);
+        poultry_id.value = options.id;
+        formData.poultry_id = options.id;
+        poultryInfoAPI({
+          poultry_id: options.id
+        }).then((res) => {
+          for (let key in res.data) {
+            baseData[key] = res.data[key];
+          }
+          formData.weight = baseData.weight;
+          formData.status = baseData.status;
+          value.value = selectList[baseData.status - 1];
+          indexs.value = baseData.status - 1;
+        });
       });
       const navgo = (url2) => {
         uni.navigateTo({
           url: url2
         });
       };
+      const formData = vue.reactive({
+        status: "",
+        poultry_id: "",
+        weight: ""
+      });
+      const updataStatusFn = () => {
+        poultryStatusAPI({
+          ...formData
+        }).then((res) => {
+          uni.showToast({
+            title: res.msg,
+            icon: "none"
+          });
+        });
+      };
+      const outBar = () => {
+        poultryStatusAPI({
+          status: 4,
+          animal_id: animal_id.value
+        }).then((res) => {
+          uni.showToast({
+            title: res.msg,
+            icon: "none"
+          });
+          setTimeout(() => {
+            uni.navigateTo({
+              url: "/pages/index/index"
+            });
+          }, 2e3);
+        });
+      };
+      const actionList = vue.reactive({});
+      actionsAPI$1({
+        type: 3
+      }).then((res) => {
+        for (let key in res.data) {
+          actionList[key] = res.data[key];
+        }
+      });
       return (_ctx, _cache) => {
-        const _component_u_search = resolveEasycom(vue.resolveDynamicComponent("u-search"), __easycom_1$1);
+        var _a;
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
         return vue.openBlock(), vue.createElementBlock(
           "view",
           {
@@ -18754,42 +19596,26 @@ This will fail in production.`);
             onClickCapture: _cache[4] || (_cache[4] = ($event) => selectAct.value = false)
           },
           [
-            vue.createElementVNode("view", { class: "card" }, [
-              vue.createElementVNode("view", { class: "tit" }, [
-                vue.createElementVNode("view", { class: "" }, " 农户名称: 1号土地 ")
-              ]),
-              vue.createElementVNode("view", { class: "card-li" }, [
-                vue.createElementVNode("view", { class: "" }, " 种养殖类型: 土豆 "),
-                vue.createElementVNode("view", { class: "" }, " 养殖头数: 的划分等级 ")
-              ]),
-              vue.createElementVNode("view", { class: "card-li" }, [
-                vue.createElementVNode("view", { class: "" }, " 土地面积: 20亩 "),
-                vue.createElementVNode("view", { class: "" }, " 公猪: 的划分等级 ")
-              ]),
-              vue.createElementVNode("view", { class: "card-li" }, [
-                vue.createElementVNode("view", { class: "" }, " 养殖种类: 20亩 "),
-                vue.createElementVNode("view", { class: "" }, " 母猪: 的划分等级 ")
-              ]),
-              vue.createElementVNode("view", { class: "card-li" }, [
-                vue.createElementVNode("view", { class: "" }, " 具体种类: 20亩 "),
-                vue.createElementVNode("view", { class: "" }, " 幼崽: 的划分等级 ")
-              ])
-            ]),
-            vue.createElementVNode("view", { class: "serch" }, [
-              vue.createVNode(_component_u_search, {
-                bgColor: "white",
-                height: "63.08rpx",
-                "show-action": false,
-                actionText: "搜索",
-                animation: true
-              }),
-              vue.createElementVNode("view", { class: "serch-btn" }, " 搜索 ")
-            ]),
+            vue.createCommentVNode(' <view class="card">\r\n			<view class="tit">\r\n				<view class="">\r\n					农户名称: 1号土地\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					种养殖类型: 土豆\r\n				</view>\r\n				<view class="">\r\n					养殖头数: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					土地面积: 20亩\r\n				</view>\r\n				<view class="">\r\n					公猪: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					养殖种类: 20亩\r\n				</view>\r\n				<view class="">\r\n					母猪: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					具体种类: 20亩\r\n				</view>\r\n				<view class="">\r\n					幼崽: 的划分等级\r\n				</view>\r\n			</view>\r\n		</view> '),
+            vue.createCommentVNode(` <view class="serch">\r
+			<u-search bgColor='white' height='63.08rpx' :show-action="false" actionText="搜索"\r
+				:animation="true"></u-search>\r
+			<view class="serch-btn">\r
+				搜索\r
+			</view>\r
+		</view> `),
+            vue.createVNode(farmersCard),
             vue.createElementVNode("view", { class: "title" }, [
-              vue.createElementVNode("view", { class: "" }, " 编号: 13645 "),
+              vue.createElementVNode(
+                "view",
+                { class: "" },
+                " 编号: " + vue.toDisplayString(baseData.code),
+                1
+                /* TEXT */
+              ),
               vue.createElementVNode("view", {
                 class: "more-jt",
-                onClick: _cache[0] || (_cache[0] = ($event) => navgo(`/pages/poultry/histroyFeed?id=${animal_id.value}`))
+                onClick: _cache[0] || (_cache[0] = ($event) => navgo(`/pages/poultry/SingleDetail?id=${poultry_id.value}`))
               }, [
                 vue.createTextVNode(" 查看养殖详情 "),
                 vue.createVNode(_component_u__image, {
@@ -18802,7 +19628,16 @@ This will fail in production.`);
             ]),
             vue.createElementVNode("view", { class: "card" }, [
               vue.createElementVNode("view", { class: "card-li" }, [
-                vue.createElementVNode("view", { class: "" }, " 养殖类型: 母猪 "),
+                vue.createElementVNode(
+                  "view",
+                  {
+                    class: "",
+                    onClickCapture: selectFoucsFn
+                  },
+                  " 养殖类型: " + vue.toDisplayString(baseData.kind),
+                  33
+                  /* TEXT, HYDRATE_EVENTS */
+                ),
                 vue.createElementVNode("view", {
                   class: "",
                   style: { "display": "flex", "align-items": "center" }
@@ -18812,17 +19647,22 @@ This will fail in production.`);
                     style: { "height": "49.07rpx", "width": "215.54rpx", "margin-left": "20rpx" },
                     placeholder: "请输入内容",
                     border: "surround",
-                    modelValue: value.value,
-                    "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => value.value = $event),
-                    onChange: _ctx.change
-                  }, null, 8, ["modelValue", "onChange"])
+                    modelValue: formData.weight,
+                    "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => formData.weight = $event)
+                  }, null, 8, ["modelValue"])
                 ])
               ]),
               vue.createElementVNode("view", {
                 class: "card-li",
                 style: { "align-items": "center" }
               }, [
-                vue.createElementVNode("view", { class: "" }, " 年龄: 2年 "),
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 年龄: " + vue.toDisplayString(baseData.age) + "年 ",
+                  1
+                  /* TEXT */
+                ),
                 vue.createElementVNode("view", { class: "select" }, [
                   vue.createTextVNode(" 状态: "),
                   vue.createVNode(_component_up_input, {
@@ -18831,9 +19671,8 @@ This will fail in production.`);
                     placeholder: "请选择",
                     border: "surround",
                     onClickCapture: selectFoucsFn,
-                    onBlur: _cache[2] || (_cache[2] = ($event) => selectAct.value = false),
                     modelValue: value.value,
-                    "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => value.value = $event)
+                    "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => value.value = $event)
                   }, null, 8, ["modelValue"]),
                   vue.createElementVNode(
                     "view",
@@ -18897,18 +19736,56 @@ This will fail in production.`);
                   ])
                 ])
               ]),
-              vue.createVNode(imgCard),
-              vue.createElementVNode("view", { class: "up-plant-btn" }, " 上传新的种植情况 ")
+              vue.createCommentVNode(" <imgCard :imgUrl='baseData?.pic_detail?.pic'></imgCard> "),
+              vue.createVNode(imgCard, {
+                imgUrl: (_a = baseData == null ? void 0 : baseData.pic_detail) == null ? void 0 : _a.pic
+              }, null, 8, ["imgUrl"]),
+              vue.createElementVNode("view", {
+                class: "up-plant-btn",
+                onClick: updataStatusFn
+              }, " 确认更新 ")
             ]),
-            vue.createElementVNode("view", { class: "title" }, [
-              vue.createElementVNode("view", { class: "" }, " 饲养记录 "),
-              vue.createElementVNode("view", { class: "updata-btn" }, " 更新生长记录 ")
-            ]),
-            vue.createVNode(myTable, {
-              tit: "查看历史饲养记录",
-              route: "/pages/feedIng/allFeed"
-            }),
-            vue.createElementVNode("view", { class: "ripe-btn" }, " 标记状态为出栏 ")
+            (vue.openBlock(true), vue.createElementBlock(
+              vue.Fragment,
+              null,
+              vue.renderList(actionList, (item, index2) => {
+                return vue.openBlock(), vue.createElementBlock("view", {
+                  class: "circumstance",
+                  key: index2
+                }, [
+                  vue.createElementVNode("view", { class: "card-tit" }, [
+                    vue.createElementVNode(
+                      "view",
+                      { class: "" },
+                      vue.toDisplayString(index2),
+                      1
+                      /* TEXT */
+                    ),
+                    vue.createElementVNode(
+                      "view",
+                      {
+                        class: "updata-btn",
+                        onClick: _cache[3] || (_cache[3] = ($event) => navgo("/pages/growRecord/index"))
+                      },
+                      " 更新" + vue.toDisplayString(index2.slice(0, -2)),
+                      1
+                      /* TEXT */
+                    )
+                  ]),
+                  vue.createVNode(myTable, {
+                    tit: `查看${index2.slice(0, -2)}`,
+                    dataList: item.action_record,
+                    route: "/pages/feedIng/allRecording"
+                  }, null, 8, ["tit", "dataList"])
+                ]);
+              }),
+              128
+              /* KEYED_FRAGMENT */
+            )),
+            vue.createElementVNode("view", {
+              class: "ripe-btn",
+              onClick: outBar
+            }, " 标记状态为出栏 ")
           ],
           32
           /* HYDRATE_EVENTS */
@@ -18916,32 +19793,40 @@ This will fail in production.`);
       };
     }
   };
-  const PagesPoultryFeedDetail = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__scopeId", "data-v-678b841d"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/feedDetail.vue"]]);
-  const _sfc_main$j = {
+  const PagesPoultryFeedDetail = /* @__PURE__ */ _export_sfc(_sfc_main$m, [["__scopeId", "data-v-678b841d"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/feedDetail.vue"]]);
+  const _sfc_main$l = {
     __name: "histroyFeed",
     setup(__props) {
+      const img = vue.ref("");
       const updateImgFn = () => {
         uplodeImg().then((res) => {
+          img.value = res.data.image;
           addAnimalPicAPI({
-            poultry_id: Number(animal_id.value),
+            poultry_id: Number(animal_id2.value),
             pic: res.data.image
           }).then((res2) => {
-            formatAppLog("log", "at pages/poultry/histroyFeed.vue:82", res2);
+            imgList.unshift(img.value);
           });
         });
       };
       const imgList = vue.reactive([]);
-      const animal_id = vue.ref("");
+      const animal_id2 = vue.ref("");
       onLoad((option) => {
-        animal_id.value = option.id;
+        animal_id2.value = option.id;
         animalPicListAPI({
           poultry_id: option.id
         }).then((res) => {
           res.data.forEach((item) => {
-            imgList.push(item);
+            imgList.push(item.pic);
           });
         });
       });
+      const previewImage = (index2) => {
+        uni.previewImage({
+          urls: imgList,
+          current: index2
+        });
+      };
       return (_ctx, _cache) => {
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
@@ -18980,17 +19865,16 @@ This will fail in production.`);
             ])
           ]),
           vue.createElementVNode("view", { class: "" }, [
-            vue.createElementVNode("view", { class: "" }, " 今日养殖状态 "),
-            vue.createVNode(imgCard),
             vue.createElementVNode("view", { class: "" }, " 养殖情况 "),
             (vue.openBlock(true), vue.createElementBlock(
               vue.Fragment,
               null,
               vue.renderList(imgList, (item, index2) => {
                 return vue.openBlock(), vue.createBlock(imgCard, {
-                  imgUrl: item.pic,
-                  key: index2
-                }, null, 8, ["imgUrl"]);
+                  imgUrl: item,
+                  key: index2,
+                  onClick: ($event) => previewImage(index2)
+                }, null, 8, ["imgUrl", "onClick"]);
               }),
               128
               /* KEYED_FRAGMENT */
@@ -19004,8 +19888,8 @@ This will fail in production.`);
       };
     }
   };
-  const PagesPoultryHistroyFeed = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-9cbb8652"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/histroyFeed.vue"]]);
-  const _sfc_main$i = {
+  const PagesPoultryHistroyFeed = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["__scopeId", "data-v-9cbb8652"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/histroyFeed.vue"]]);
+  const _sfc_main$k = {
     __name: "updateFeed",
     setup(__props) {
       const showPop = vue.ref(false);
@@ -19013,8 +19897,8 @@ This will fail in production.`);
         value: ""
       });
       return (_ctx, _cache) => {
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
-        const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_2$3);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
+        const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_1$4);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
           vue.createElementVNode("view", { class: "card" }, [
             vue.createElementVNode("view", { class: "tit" }, [
@@ -19163,8 +20047,8 @@ This will fail in production.`);
       };
     }
   };
-  const PagesPoultryUpdateFeed = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-bd22b757"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/updateFeed.vue"]]);
-  const _sfc_main$h = {
+  const PagesPoultryUpdateFeed = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__scopeId", "data-v-bd22b757"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/updateFeed.vue"]]);
+  const _sfc_main$j = {
     __name: "vaccineInfo",
     setup(__props) {
       const options1 = vue.reactive([{
@@ -19219,7 +20103,7 @@ This will fail in production.`);
         });
       };
       return (_ctx, _cache) => {
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
         const _component_u_swipe_action_item = resolveEasycom(vue.resolveDynamicComponent("u-swipe-action-item"), __easycom_2);
         const _component_u_swipe_action = resolveEasycom(vue.resolveDynamicComponent("u-swipe-action"), __easycom_3);
@@ -19333,8 +20217,8 @@ This will fail in production.`);
       };
     }
   };
-  const PagesPoultryVaccineInfo = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__scopeId", "data-v-09314aba"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/vaccineInfo.vue"]]);
-  const _sfc_main$g = {
+  const PagesPoultryVaccineInfo = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-09314aba"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/vaccineInfo.vue"]]);
+  const _sfc_main$i = {
     __name: "addPoultry",
     setup(__props) {
       const navgo = () => {
@@ -19363,11 +20247,11 @@ This will fail in production.`);
       const value1 = vue.ref("");
       const selectAct = vue.ref(false);
       const selectAct1 = vue.ref(false);
-      const selectFoucsFn = (e) => {
+      const selectFoucsFn = (e2) => {
         selectAct.value = true;
         selectAct1.value = false;
       };
-      const selectFoucsFn1 = (e) => {
+      const selectFoucsFn1 = (e2) => {
         selectAct1.value = true;
         selectAct.value = false;
       };
@@ -19407,7 +20291,7 @@ This will fail in production.`);
       const formData = vue.reactive({});
       objFn(baseFormData, formData);
       const nextFn = () => {
-        addAnimalAPI$1({
+        addAnimalAPI({
           ...formData
         }).then((res) => {
           status.value = "";
@@ -19423,7 +20307,7 @@ This will fail in production.`);
       };
       const addList = vue.reactive([]);
       return (_ctx, _cache) => {
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
           addList.length ? (vue.openBlock(), vue.createElementBlock(
@@ -19671,8 +20555,8 @@ This will fail in production.`);
       };
     }
   };
-  const PagesPoultryAddPoultry = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/addPoultry.vue"]]);
-  const _sfc_main$f = {
+  const PagesPoultryAddPoultry = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/addPoultry.vue"]]);
+  const _sfc_main$h = {
     __name: "allFeed",
     setup(__props) {
       return (_ctx, _cache) => {
@@ -19723,7 +20607,222 @@ This will fail in production.`);
       };
     }
   };
-  const PagesPoultryAllFeed = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-9888630f"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/allFeed.vue"]]);
+  const PagesPoultryAllFeed = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__scopeId", "data-v-9888630f"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/allFeed.vue"]]);
+  const _sfc_main$g = {
+    __name: "detailCard",
+    props: {
+      id: String,
+      showImg: Boolean
+    },
+    setup(__props) {
+      const props2 = __props;
+      const dateFn = () => {
+        var today = /* @__PURE__ */ new Date();
+        var year = today.getFullYear();
+        var month = today.getMonth() + 1;
+        var day = today.getDate();
+        var dateStr = year + "-" + month + "-" + day;
+        return dateStr;
+      };
+      const navgo = (url2) => {
+        uni.navigateTo({
+          url: url2
+        });
+      };
+      const objFn = (res, data) => {
+        for (let key in res) {
+          data[key] = res[key];
+        }
+      };
+      const animal_detail = vue.reactive({});
+      vue.watch(props2, (newValue, oldVlaue) => {
+        formatAppLog("log", "at components/poultry/detailCard.vue:112", "dfhsdfgsdjk");
+        if (props2 == null ? void 0 : props2.id) {
+          animalInfoAPI({
+            poultry_id: Number(props2.id)
+          }).then((res) => {
+            objFn(res.data, animal_detail);
+          });
+        }
+      }, {
+        // 页面加载会先执行一次
+        immediate: true
+      });
+      const updateImgFn = () => {
+        uplodeImg().then((res) => {
+          animal_detail.pic_detail.pic = res.data.image;
+          addAnimalPicAPI({
+            poultry_id: Number(props2.id),
+            pic: res.data.image
+          });
+        });
+      };
+      return (_ctx, _cache) => {
+        var _a;
+        const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
+        return vue.openBlock(), vue.createElementBlock(
+          vue.Fragment,
+          null,
+          [
+            props2.showImg ? (vue.openBlock(), vue.createElementBlock("view", {
+              key: 0,
+              class: ""
+            }, [
+              ((_a = animal_detail == null ? void 0 : animal_detail.pic_detail) == null ? void 0 : _a.pic) ? (vue.openBlock(), vue.createElementBlock("view", {
+                key: 0,
+                class: ""
+              }, [
+                vue.createVNode(imgCard, {
+                  imgUrl: animal_detail.pic_detail.pic
+                }, null, 8, ["imgUrl"])
+              ])) : vue.createCommentVNode("v-if", true),
+              vue.createElementVNode("view", { class: "bad-info" }, [
+                vue.createElementVNode("view", {
+                  class: "",
+                  style: { "display": "flex", "align-items": "center" }
+                }, [
+                  vue.createVNode(_component_u__image, {
+                    src: "/static/img/sj.png')",
+                    style: { "margin": "0 5rpx" },
+                    width: "28.04rpx",
+                    height: "28.04rpx"
+                  }),
+                  vue.createElementVNode(
+                    "text",
+                    null,
+                    "刷新时间:" + vue.toDisplayString(dateFn()),
+                    1
+                    /* TEXT */
+                  )
+                ]),
+                vue.createElementVNode("view", {
+                  style: { "display": "flex" },
+                  onClick: _cache[0] || (_cache[0] = ($event) => navgo(`/pages/feedIng/histroyFeed?id=${props2.id}`))
+                }, [
+                  vue.createTextVNode(" 查看历史条件 "),
+                  vue.createVNode(_component_u__image, {
+                    src: "/static/img/CKGD.png",
+                    style: { "margin-left": "5rpx" },
+                    width: "31.54rpx",
+                    height: "31.54rpx"
+                  })
+                ])
+              ]),
+              vue.createElementVNode("view", {
+                class: "up-plant-btn",
+                onClick: updateImgFn
+              }, " 上传新的种植情况 ")
+            ])) : vue.createCommentVNode("v-if", true),
+            vue.createElementVNode("view", { class: "card" }, [
+              vue.createElementVNode("view", { class: "tit" }, [
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 溯源码: " + vue.toDisplayString(animal_detail.code),
+                  1
+                  /* TEXT */
+                )
+              ]),
+              vue.createElementVNode("view", { class: "card-li" }, [
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 养殖品种: " + vue.toDisplayString(animal_detail.kind),
+                  1
+                  /* TEXT */
+                ),
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 年龄: " + vue.toDisplayString(animal_detail.age),
+                  1
+                  /* TEXT */
+                )
+              ]),
+              vue.createElementVNode("view", { class: "card-li" }, [
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 养殖类型: " + vue.toDisplayString(animal_detail.breed),
+                  1
+                  /* TEXT */
+                ),
+                vue.createElementVNode(
+                  "view",
+                  { class: "" },
+                  " 体重:" + vue.toDisplayString(animal_detail.weight),
+                  1
+                  /* TEXT */
+                )
+              ])
+            ]),
+            vue.createElementVNode("view", { class: "card" }, [
+              vue.createElementVNode("view", { class: "card-li" }, [
+                vue.createElementVNode("view", {
+                  class: "",
+                  style: { "display": "flex", "align-items": "center" }
+                }, [
+                  vue.createVNode(_component_u__image, {
+                    src: "/static/img/GG.png",
+                    style: { "margin": "0 21rpx" },
+                    width: "80rpx",
+                    height: "80rpx"
+                  }),
+                  vue.createTextVNode(" 当前养殖状态 ")
+                ]),
+                animal_detail.status == 1 ? (vue.openBlock(), vue.createElementBlock("view", {
+                  key: 0,
+                  class: "",
+                  style: { "color": "#00A15E" }
+                }, " 健康 ")) : vue.createCommentVNode("v-if", true),
+                animal_detail.status == 2 ? (vue.openBlock(), vue.createElementBlock("view", {
+                  key: 1,
+                  class: "",
+                  style: { "color": "#FFD736" }
+                }, " 怀孕中 ")) : vue.createCommentVNode("v-if", true),
+                animal_detail.status == 4 ? (vue.openBlock(), vue.createElementBlock("view", {
+                  key: 2,
+                  class: "",
+                  style: { "color": "#3274F9" }
+                }, " 可出栏 ")) : vue.createCommentVNode("v-if", true),
+                animal_detail.status == 3 ? (vue.openBlock(), vue.createElementBlock("view", {
+                  key: 3,
+                  class: "",
+                  style: { "color": "#F84221" }
+                }, " 生病隔离中 ")) : vue.createCommentVNode("v-if", true)
+              ])
+            ])
+          ],
+          64
+          /* STABLE_FRAGMENT */
+        );
+      };
+    }
+  };
+  const detailCard = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["__scopeId", "data-v-dbe58a37"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/poultry/detailCard.vue"]]);
+  const _sfc_main$f = {
+    __name: "SingleDetail",
+    setup(__props) {
+      const id = vue.ref(0);
+      onLoad((option) => {
+        id.value = option.id;
+      });
+      return (_ctx, _cache) => {
+        return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
+          vue.createCommentVNode(' <imgCard></imgCard>\r\n\r\n		<view class="bad-info">\r\n			<view class="" style="display: flex;align-items: center;">\r\n				<u--image :src="urlFn(\'sj\')" style="margin: 0 5rpx;" width="28.04rpx" height="28.04rpx"></u--image>\r\n				<text>刷新时间:{{dateFn()}}</text>\r\n			</view>\r\n			<view style="display: flex;" @click="navgo(`/pages/poultry/histroyFeed?id=${id}`)">\r\n				查看史条件 <u--image src="/static/img/CKGD.png" style="margin-left: 5rpx;" width="31.54rpx"\r\n					height="31.54rpx"></u--image>\r\n			</view>\r\n		</view>\r\n		<view class="up-plant-btn" @click="updateImgFn">\r\n\r\n			上传新的种植情况\r\n		</view>\r\n		<view class="card">\r\n			<view class="tit">\r\n				<view class="">\r\n					编号: 52656\r\n				</view>\r\n				<view class="">\r\n					溯源码: 52656\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					养殖品种: 土豆\r\n				</view>\r\n				<view class="">\r\n					年龄: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					养殖类型: 20亩\r\n				</view>\r\n				<view class="">\r\n					体重: 45kg\r\n				</view>\r\n			</view>\r\n		</view>\r\n\r\n		<view class="card">\r\n			<view class="card-li">\r\n				<view class="" style="display: flex;align-items: center;">\r\n					<u--image src="/static/img/GG.png" style="margin: 0 21rpx;" width="80rpx" height="80rpx"></u--image>\r\n					当前养殖状态\r\n				</view>\r\n				<view class="" style="color: green;">\r\n					健康\r\n				</view>\r\n			</view>\r\n\r\n		</view> '),
+          vue.createVNode(detailCard, { id: id.value }, null, 8, ["id"]),
+          vue.createElementVNode("view", { class: "" }, [
+            vue.createElementVNode("view", {
+              class: "",
+              style: { "margin-bottom": "20rpx" }
+            }, " 饲养记录 "),
+            vue.createVNode(myTable)
+          ])
+        ]);
+      };
+    }
+  };
+  const PagesPoultrySingleDetail = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-15fbaaca"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/poultry/SingleDetail.vue"]]);
   const _sfc_main$e = {
     __name: "allRecording",
     setup(__props) {
@@ -19817,7 +20916,7 @@ This will fail in production.`);
         });
       };
       return (_ctx, _cache) => {
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
         return vue.openBlock(), vue.createElementBlock(
           "view",
@@ -19915,6 +21014,8 @@ This will fail in production.`);
   const addFishAPI = (data) => syhttp.post("/FishBreed/addFish", data);
   const pondInfoAPI = (data) => syhttp.get("/FishBreed/pondInfo", data);
   const addFishPicAPI = (data) => syhttp.post("/FishBreed/addFishPic", data);
+  const pondEnvDataAPI = (data) => syhttp.get("/FishBreed/pondEnvData", data);
+  const fishPicListAPI = (data) => syhttp.get("/FishBreed/fishPicList", data);
   const _sfc_main$c = {
     __name: "addPond",
     setup(__props) {
@@ -19958,7 +21059,7 @@ This will fail in production.`);
         objFn(baseData, formData);
       });
       return (_ctx, _cache) => {
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
           vue.createElementVNode("view", { class: "card" }, [
@@ -20062,7 +21163,7 @@ This will fail in production.`);
     setup(__props) {
       const value = vue.ref("");
       return (_ctx, _cache) => {
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
           vue.createElementVNode("view", { class: "card" }, [
             vue.createElementVNode("view", { class: "tit" }, [
@@ -20168,6 +21269,180 @@ This will fail in production.`);
   };
   const PagesAquaticUpdateGrow = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["__scopeId", "data-v-eb84358f"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/aquatic/updateGrow.vue"]]);
   const _sfc_main$a = {
+    __name: "pondCard",
+    props: {
+      id: String,
+      showBtn: Boolean
+    },
+    setup(__props) {
+      const props2 = __props;
+      const headData = vue.reactive({});
+      vue.watch(props2, (newValue, oldVlaue) => {
+        if (props2 == null ? void 0 : props2.id) {
+          pondInfoAPI({
+            user_id: 307,
+            pond_id: props2.id
+          }).then((res) => {
+            for (let key in res.data) {
+              headData[key] = res.data[key];
+            }
+          });
+        }
+      }, {
+        immediate: true
+      });
+      const navgo = (url2) => {
+        uni.navigateTo({
+          url: url2
+        });
+      };
+      return (_ctx, _cache) => {
+        return vue.openBlock(), vue.createElementBlock("view", { class: "card" }, [
+          vue.createElementVNode("view", { class: "tit" }, [
+            vue.createElementVNode("view", { class: "" }, " 农户名称: ??? "),
+            vue.createElementVNode("view", { class: "" }, [
+              vue.createCommentVNode(" {{headData}} "),
+              vue.createTextVNode(
+                " 溯源码: " + vue.toDisplayString(headData.source_code),
+                1
+                /* TEXT */
+              )
+            ])
+          ]),
+          vue.createElementVNode("view", { class: "card-li" }, [
+            vue.createElementVNode("view", { class: "" }, " 种养殖类型: 养殖户 "),
+            vue.createElementVNode(
+              "view",
+              { class: "" },
+              " 养殖数量: " + vue.toDisplayString(headData.total_num),
+              1
+              /* TEXT */
+            )
+          ]),
+          vue.createElementVNode("view", { class: "card-li" }, [
+            vue.createElementVNode("view", { class: "" }, " 土地面积: 20亩 "),
+            vue.createElementVNode("view", { class: "" }, " 草鱼鱼苗: 的划分等级 ")
+          ]),
+          headData.kind ? (vue.openBlock(), vue.createElementBlock("view", {
+            key: 0,
+            class: "card-li"
+          }, [
+            vue.createElementVNode(
+              "view",
+              { class: "" },
+              " 养殖种类: " + vue.toDisplayString(headData.kind[0]) + "," + vue.toDisplayString(headData.kind[1]) + "," + vue.toDisplayString(headData.kind[2]),
+              1
+              /* TEXT */
+            ),
+            vue.createElementVNode("view", { class: "" }, " 鲫鱼鱼苗: 的划分等级 ")
+          ])) : vue.createCommentVNode("v-if", true),
+          headData.breed ? (vue.openBlock(), vue.createElementBlock("view", {
+            key: 1,
+            class: "card-li"
+          }, [
+            vue.createElementVNode("view", { class: "" }, [
+              vue.createCommentVNode(" {{}} "),
+              vue.createTextVNode(
+                " 具体种类: " + vue.toDisplayString(headData.breed[0]) + "," + vue.toDisplayString(headData.breed[1]) + "," + vue.toDisplayString(headData.breed[2]),
+                1
+                /* TEXT */
+              )
+            ])
+          ])) : vue.createCommentVNode("v-if", true),
+          props2.showBtn ? (vue.openBlock(), vue.createElementBlock("view", {
+            key: 2,
+            class: "add-btn",
+            onClick: _cache[0] || (_cache[0] = ($event) => navgo(`/pages/aquatic/addPond?pond_id=${props2.id}`))
+          }, " 添加水产养殖 ")) : vue.createCommentVNode("v-if", true)
+        ]);
+      };
+    }
+  };
+  const pondCard = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-57b166d4"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/components/aquatic/pondCard.vue"]]);
+  const _sfc_main$9 = {
+    __name: "imgList",
+    setup(__props) {
+      const imgList = vue.reactive([]);
+      const pond_id = vue.ref(0);
+      onLoad((options) => {
+        pond_id.value = options.pond_id;
+        fishPicListAPI({
+          pond_id: options.pond_id
+        }).then((res) => {
+          res.data.forEach((item) => {
+            imgList.push(item.pic);
+          });
+        });
+      });
+      const updateImgFn = () => {
+        let image2 = "";
+        uplodeImg().then((res) => {
+          image2 = res.data.image;
+          addFishPicAPI({
+            pond_id: pond_id.value,
+            pic: image2
+          }).then((res2) => {
+            imgList.unshift(image2);
+          });
+        });
+      };
+      const previewImage = (index2) => {
+        uni.previewImage({
+          urls: imgList,
+          current: index2
+        });
+      };
+      return (_ctx, _cache) => {
+        return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
+          vue.createCommentVNode(' <view class="card">\r\n			<view class="tit">\r\n				<view class="">\r\n					1号土地\r\n				</view>\r\n				<view class="">\r\n					溯源码: 12302\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					当前种植: 土豆\r\n				</view>\r\n				<view class="">\r\n					种植品牌: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					土地面积: 20亩\r\n				</view>\r\n				<view class="">\r\n					种子品牌: 的划分等级\r\n				</view>\r\n			</view>\r\n			<view class="card-li">\r\n				<view class="">\r\n					预计产量: 20亩\r\n				</view>\r\n				<view class="">\r\n					已出售: 的划分等级\r\n				</view>\r\n			</view>\r\n\r\n\r\n			<view class="card-li">\r\n				<view class="">\r\n					播种时间: 2020.12.01\r\n				</view>\r\n\r\n			</view>\r\n\r\n		</view> '),
+          vue.createCommentVNode(" <landInfo :pond_id='pond_id'></landInfo> "),
+          vue.createVNode(pondCard, { id: pond_id.value }, null, 8, ["id"]),
+          vue.createCommentVNode(` <view class="status">\r
+			<view class="" style="margin-bottom: 30rpx;">\r
+				今日种植状态\r
+			</view>\r
+			<imgCard text="地址"\r
+				imgUrl='http://ceshi-suyuan.lihaink.cn/uploads/20231025/3048b734cff7d9adfb00aaf6ab7290e5.jpeg'>\r
+			</imgCard>\r
+		</view>\r
+		<view class="status">\r
+			<view class="" style="margin-bottom: 30rpx;">\r
+				播种图片\r
+			</view>\r
+			<imgCard text="地址"\r
+				imgUrl='http://ceshi-suyuan.lihaink.cn/uploads/20231025/3048b734cff7d9adfb00aaf6ab7290e5.jpeg'>\r
+			</imgCard>\r
+		</view> `),
+          vue.createElementVNode("view", { class: "status" }, [
+            vue.createElementVNode("view", {
+              class: "",
+              style: { "margin-bottom": "30rpx" }
+            }, " 生长情况 "),
+            (vue.openBlock(true), vue.createElementBlock(
+              vue.Fragment,
+              null,
+              vue.renderList(imgList, (item, index2) => {
+                return vue.openBlock(), vue.createBlock(imgCard, {
+                  text: "地址",
+                  imgUrl: item,
+                  key: index2,
+                  onClick: ($event) => previewImage(index2)
+                }, null, 8, ["imgUrl", "onClick"]);
+              }),
+              128
+              /* KEYED_FRAGMENT */
+            ))
+          ]),
+          vue.createElementVNode("view", {
+            class: "up-btn",
+            onClick: updateImgFn
+          }, " 上传新的种植情况 ")
+        ]);
+      };
+    }
+  };
+  const PagesAquaticImgList = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-8780f959"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/aquatic/imgList.vue"]]);
+  const _sfc_main$8 = {
     __name: "detail",
     setup(__props) {
       const data = vue.reactive([
@@ -20175,64 +21450,34 @@ This will fail in production.`);
           tit: "水温",
           icon: "TRWD",
           dw: "℃",
-          cont: "soil_temperature",
+          cont: "water_temp",
           flag: false
         },
         {
           tit: "PH值",
           icon: "TRSD",
-          dw: "%RH",
-          cont: "soil_moisture"
+          cont: "ph_content"
         },
         {
           tit: "溶解氧",
           icon: "FX",
-          cont: "wind_direction"
+          cont: "dissolved_oxygen",
+          dw: "%"
         },
         {
           tit: "电导率",
           icon: "FS",
-          dw: "m/s",
-          cont: "wind_speed"
+          dw: "mg/l",
+          cont: "electric_conductivity"
         },
         {
           tit: "TDS",
           icon: "JYL",
-          dw: "mm",
-          cont: "rainfall"
+          dw: "lux",
+          cont: "tds"
         }
       ]);
-      vue.reactive([{
-        cont: "气象多要素百叶箱",
-        cont2: "1天/1次"
-      }, {
-        cont: "多功能控制器",
-        cont2: "3个小时/次"
-      }]);
-      const baseData = vue.reactive({
-        "id": 27,
-        "production_base_id": 1,
-        "soil_temperature": 20,
-        "soil_moisture": 50,
-        "room_temperature": 0,
-        "air_humidity": 0,
-        "air_quality_index": 0,
-        "pond_temperature": 0,
-        "pond_ph_value": 0,
-        "wind_direction": "北",
-        "wind_speed": 3.4,
-        "illumination": 2,
-        "rainfall": 20,
-        "carbon_dioxide_content": 450,
-        "nitrogen_content": 0,
-        "methane_content": 0,
-        "ammonia_nitrogen_content": 0,
-        "nitrite_content": 0,
-        "dissolved_oxygen": 0,
-        "temperature_threshold": 0,
-        "humidity_threshold": 0,
-        "flag": 1
-      });
+      const baseData = vue.reactive({});
       const urlFn = (name) => {
         return `/static/img/${name}.png`;
       };
@@ -20263,6 +21508,13 @@ This will fail in production.`);
       const pond_id = vue.ref(0);
       const headData = vue.reactive({});
       onLoad((option) => {
+        pondEnvDataAPI({
+          user_id: 307
+        }).then((res) => {
+          for (let key in res.data) {
+            baseData[key] = res.data[key];
+          }
+        });
         pond_id.value = option.pond_id;
         pondInfoAPI({
           user_id: 307,
@@ -20273,11 +21525,20 @@ This will fail in production.`);
           }
         });
       });
+      const actionList = vue.reactive({});
+      actionsAPI$1({
+        type: 4
+      }).then((res) => {
+        for (let key in res.data) {
+          actionList[key] = res.data[key];
+        }
+      });
       return (_ctx, _cache) => {
+        var _a;
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
           vue.createVNode(imgCard, {
-            imgUrl: headData.pic_detail.pic
+            imgUrl: (_a = headData == null ? void 0 : headData.pic_detail) == null ? void 0 : _a.pic
           }, null, 8, ["imgUrl"]),
           vue.createElementVNode("view", { class: "bad-info" }, [
             vue.createElementVNode("view", {
@@ -20300,7 +21561,7 @@ This will fail in production.`);
             ]),
             vue.createElementVNode("view", {
               style: { "display": "flex" },
-              onClick: _cache[0] || (_cache[0] = ($event) => navgo("/pages/allPlant/index"))
+              onClick: _cache[0] || (_cache[0] = ($event) => navgo(`/pages/aquatic/imgList?pond_id=${pond_id.value}`))
             }, [
               vue.createTextVNode(" 查看历史条件 "),
               vue.createVNode(_component_u__image, {
@@ -20315,62 +21576,72 @@ This will fail in production.`);
             class: "up-plant-btn",
             onClick: updateImgFn
           }, " 上传新的种植情况 "),
-          vue.createElementVNode("view", { class: "card" }, [
-            vue.createElementVNode("view", { class: "tit" }, [
-              vue.createElementVNode("view", { class: "" }, " 农户名称: 1号土地 "),
-              vue.createElementVNode("view", { class: "" }, " 溯源码: 1号土地 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 农户名称: 土豆 "),
-              vue.createElementVNode("view", { class: "" }, " 溯源码: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 种养殖类别: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 养殖数量: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 土地面积: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 草鱼鱼苗: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 养殖种类: 20亩 "),
-              vue.createElementVNode("view", { class: "" }, " 鲫鱼鱼苗: 的划分等级 ")
-            ]),
-            vue.createElementVNode("view", { class: "card-li" }, [
-              vue.createElementVNode("view", { class: "" }, " 具体种类: 20亩 ")
-            ]),
-            vue.createElementVNode("view", {
-              class: "add-btn",
-              onClick: _cache[1] || (_cache[1] = ($event) => navgo(`/pages/aquatic/addPond?pond_id=${pond_id.value}`))
-            }, " 添加水产养殖 ")
-          ]),
-          vue.createElementVNode("view", { class: "circumstance" }, [
-            vue.createElementVNode("view", { class: "card-tit" }, [
-              vue.createElementVNode("view", { class: "" }, " 生长密度记录 "),
-              vue.createElementVNode("view", {
-                class: "updata-btn",
-                onClick: _cache[2] || (_cache[2] = ($event) => navgo("/pages/aquatic/updateGrow"))
-              }, " 更新生长记录 ")
-            ]),
-            vue.createVNode(myTable, {
-              tit: "查看历史清点记录",
-              route: "/pages/feedIng/allRecording"
-            })
-          ]),
-          vue.createElementVNode("view", { class: "circumstance" }, [
-            vue.createElementVNode("view", { class: "card-tit" }, [
-              vue.createElementVNode("view", { class: "" }, " 饲养记录 "),
-              vue.createElementVNode("view", {
-                class: "updata-btn",
-                style: { "width": "300rpx" },
-                onClick: _cache[3] || (_cache[3] = ($event) => navgo("/pages/growRecord/index"))
-              }, " 更新饲养记录 ")
-            ]),
-            vue.createVNode(myTable, {
-              tit: "查看历史消毒记录",
-              route: "/pages/feedIng/allRecording"
-            })
-          ]),
+          vue.createVNode(pondCard, {
+            id: pond_id.value,
+            showBtn: true
+          }, null, 8, ["id"]),
+          (vue.openBlock(true), vue.createElementBlock(
+            vue.Fragment,
+            null,
+            vue.renderList(actionList, (item, index2) => {
+              return vue.openBlock(), vue.createElementBlock("view", {
+                class: "circumstance",
+                key: index2
+              }, [
+                vue.createElementVNode("view", { class: "card-tit" }, [
+                  vue.createElementVNode(
+                    "view",
+                    { class: "" },
+                    vue.toDisplayString(index2),
+                    1
+                    /* TEXT */
+                  ),
+                  vue.createElementVNode(
+                    "view",
+                    {
+                      class: "updata-btn",
+                      onClick: _cache[1] || (_cache[1] = ($event) => navgo("/pages/growRecord/index?type=4"))
+                    },
+                    " 更新" + vue.toDisplayString(index2.slice(0, -2)),
+                    1
+                    /* TEXT */
+                  )
+                ]),
+                vue.createVNode(myTable, {
+                  tit: `查看${index2.slice(0, -2)}`,
+                  dataList: item.action_record,
+                  route: "/pages/feedIng/allRecording"
+                }, null, 8, ["tit", "dataList"])
+              ]);
+            }),
+            128
+            /* KEYED_FRAGMENT */
+          )),
+          vue.createCommentVNode(` <view class="circumstance">\r
+			<view class="card-tit">\r
+				<view class="">\r
+					生长密度记录\r
+				</view>\r
+				<view class="updata-btn" @click="navgo('/pages/aquatic/updateGrow')">\r
+					更新生长记录\r
+				</view>\r
+			</view>\r
+\r
+			<myTable tit='查看历史清点记录' route='/pages/feedIng/allRecording'></myTable>\r
+\r
+		</view>\r
+		<view class="circumstance">\r
+			<view class="card-tit">\r
+				<view class="">\r
+					饲养记录\r
+				</view>\r
+				<view class="updata-btn" style="width: 300rpx;" @click="navgo('/pages/growRecord/index')">\r
+					更新饲养记录\r
+				</view>\r
+			</view>\r
+			<myTable tit='查看历史消毒记录' route='/pages/feedIng/allRecording'></myTable>\r
+\r
+		</view> `),
           vue.createElementVNode("view", { class: "data" }, [
             vue.createElementVNode("view", { class: "tit" }, [
               vue.createElementVNode("view", {
@@ -20386,9 +21657,16 @@ This will fail in production.`);
                   width: "28.04rpx",
                   height: "28.04rpx"
                 }, null, 8, ["src"]),
-                vue.createElementVNode("text", null, "刷新时间: 2022-3-3")
+                vue.createElementVNode(
+                  "text",
+                  null,
+                  "刷新时间: " + vue.toDisplayString(dateFn()),
+                  1
+                  /* TEXT */
+                )
               ])
             ]),
+            vue.createCommentVNode(" 你这不是 "),
             vue.createElementVNode("view", { class: "data-cont" }, [
               (vue.openBlock(true), vue.createElementBlock(
                 vue.Fragment,
@@ -20462,14 +21740,14 @@ This will fail in production.`);
       };
     }
   };
-  const PagesAquaticDetail = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__scopeId", "data-v-cd3205a6"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/aquatic/detail.vue"]]);
-  const _sfc_main$9 = {
+  const PagesAquaticDetail = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__scopeId", "data-v-cd3205a6"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/aquatic/detail.vue"]]);
+  const _sfc_main$7 = {
     __name: "group",
     setup(__props) {
       const showMore = vue.ref(true);
       return (_ctx, _cache) => {
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
-        const _component_u_search = resolveEasycom(vue.resolveDynamicComponent("u-search"), __easycom_1$1);
+        const _component_u_search = resolveEasycom(vue.resolveDynamicComponent("u-search"), __easycom_1);
         return vue.openBlock(), vue.createElementBlock("view", { class: "content" }, [
           vue.createElementVNode("view", { class: "card" }, [
             vue.createElementVNode("view", { class: "card-herd" }, [
@@ -20581,414 +21859,7 @@ This will fail in production.`);
       };
     }
   };
-  const PagesSupervisionGroup = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-7b328f77"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/supervision/group.vue"]]);
-  const props$1 = {
-    props: {
-      // 是否展示工具条
-      show: {
-        type: Boolean,
-        default: props$i.toolbar.show
-      },
-      // 取消按钮的文字
-      cancelText: {
-        type: String,
-        default: props$i.toolbar.cancelText
-      },
-      // 确认按钮的文字
-      confirmText: {
-        type: String,
-        default: props$i.toolbar.confirmText
-      },
-      // 取消按钮的颜色
-      cancelColor: {
-        type: String,
-        default: props$i.toolbar.cancelColor
-      },
-      // 确认按钮的颜色
-      confirmColor: {
-        type: String,
-        default: props$i.toolbar.confirmColor
-      },
-      // 标题文字
-      title: {
-        type: String,
-        default: props$i.toolbar.title
-      }
-    }
-  };
-  const _sfc_main$8 = {
-    name: "u-toolbar",
-    mixins: [mpMixin, mixin, props$1],
-    emits: ["confirm", "cancel"],
-    methods: {
-      // 点击取消按钮
-      cancel() {
-        this.$emit("cancel");
-      },
-      // 点击确定按钮
-      confirm() {
-        this.$emit("confirm");
-      }
-    }
-  };
-  function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
-    return _ctx.show ? (vue.openBlock(), vue.createElementBlock(
-      "view",
-      {
-        key: 0,
-        class: "u-toolbar",
-        onTouchmove: _cache[2] || (_cache[2] = vue.withModifiers((...args) => _ctx.noop && _ctx.noop(...args), ["stop", "prevent"]))
-      },
-      [
-        vue.createElementVNode("view", {
-          class: "u-toolbar__cancel__wrapper",
-          "hover-class": "u-hover-class"
-        }, [
-          vue.createElementVNode(
-            "text",
-            {
-              class: "u-toolbar__wrapper__cancel",
-              onClick: _cache[0] || (_cache[0] = (...args) => $options.cancel && $options.cancel(...args)),
-              style: vue.normalizeStyle({
-                color: _ctx.cancelColor
-              })
-            },
-            vue.toDisplayString(_ctx.cancelText),
-            5
-            /* TEXT, STYLE */
-          )
-        ]),
-        _ctx.title ? (vue.openBlock(), vue.createElementBlock(
-          "text",
-          {
-            key: 0,
-            class: "u-toolbar__title u-line-1"
-          },
-          vue.toDisplayString(_ctx.title),
-          1
-          /* TEXT */
-        )) : vue.createCommentVNode("v-if", true),
-        vue.createElementVNode("view", {
-          class: "u-toolbar__confirm__wrapper",
-          "hover-class": "u-hover-class"
-        }, [
-          vue.createElementVNode(
-            "text",
-            {
-              class: "u-toolbar__wrapper__confirm",
-              onClick: _cache[1] || (_cache[1] = (...args) => $options.confirm && $options.confirm(...args)),
-              style: vue.normalizeStyle({
-                color: _ctx.confirmColor
-              })
-            },
-            vue.toDisplayString(_ctx.confirmText),
-            5
-            /* TEXT, STYLE */
-          )
-        ])
-      ],
-      32
-      /* HYDRATE_EVENTS */
-    )) : vue.createCommentVNode("v-if", true);
-  }
-  const __easycom_0 = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["render", _sfc_render$3], ["__scopeId", "data-v-3fd495d6"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-toolbar/u-toolbar.vue"]]);
-  const props = {
-    props: {
-      // 是否展示picker弹窗
-      show: {
-        type: Boolean,
-        default: props$i.picker.show
-      },
-      // 是否展示顶部的操作栏
-      showToolbar: {
-        type: Boolean,
-        default: props$i.picker.showToolbar
-      },
-      // 顶部标题
-      title: {
-        type: String,
-        default: props$i.picker.title
-      },
-      // 对象数组，设置每一列的数据
-      columns: {
-        type: Array,
-        default: props$i.picker.columns
-      },
-      // 是否显示加载中状态
-      loading: {
-        type: Boolean,
-        default: props$i.picker.loading
-      },
-      // 各列中，单个选项的高度
-      itemHeight: {
-        type: [String, Number],
-        default: props$i.picker.itemHeight
-      },
-      // 取消按钮的文字
-      cancelText: {
-        type: String,
-        default: props$i.picker.cancelText
-      },
-      // 确认按钮的文字
-      confirmText: {
-        type: String,
-        default: props$i.picker.confirmText
-      },
-      // 取消按钮的颜色
-      cancelColor: {
-        type: String,
-        default: props$i.picker.cancelColor
-      },
-      // 确认按钮的颜色
-      confirmColor: {
-        type: String,
-        default: props$i.picker.confirmColor
-      },
-      // 每列中可见选项的数量
-      visibleItemCount: {
-        type: [String, Number],
-        default: props$i.picker.visibleItemCount
-      },
-      // 选项对象中，需要展示的属性键名
-      keyName: {
-        type: String,
-        default: props$i.picker.keyName
-      },
-      // 是否允许点击遮罩关闭选择器
-      closeOnClickOverlay: {
-        type: Boolean,
-        default: props$i.picker.closeOnClickOverlay
-      },
-      // 各列的默认索引
-      defaultIndex: {
-        type: Array,
-        default: props$i.picker.defaultIndex
-      },
-      // 是否在手指松开时立即触发 change 事件。若不开启则会在滚动动画结束后触发 change 事件，只在微信2.21.1及以上有效
-      immediateChange: {
-        type: Boolean,
-        default: props$i.picker.immediateChange
-      }
-    }
-  };
-  const _sfc_main$7 = {
-    name: "u-picker",
-    mixins: [mpMixin, mixin, props],
-    data() {
-      return {
-        // 上一次选择的列索引
-        lastIndex: [],
-        // 索引值 ，对应picker-view的value
-        innerIndex: [],
-        // 各列的值
-        innerColumns: [],
-        // 上一次的变化列索引
-        columnIndex: 0
-      };
-    },
-    watch: {
-      // 监听默认索引的变化，重新设置对应的值
-      defaultIndex: {
-        immediate: true,
-        handler(n2) {
-          this.setIndexs(n2, true);
-        }
-      },
-      // 监听columns参数的变化
-      columns: {
-        immediate: true,
-        deep: true,
-        handler(n2) {
-          this.setColumns(n2);
-        }
-      }
-    },
-    emits: ["close", "cancel", "confirm", "change"],
-    methods: {
-      // 获取item需要显示的文字，判别为对象还是文本
-      getItemText(item) {
-        if (uni.$u.test.object(item)) {
-          return item[this.keyName];
-        } else {
-          return item;
-        }
-      },
-      // 关闭选择器
-      closeHandler() {
-        if (this.closeOnClickOverlay) {
-          this.$emit("close");
-        }
-      },
-      // 点击工具栏的取消按钮
-      cancel() {
-        this.$emit("cancel");
-      },
-      // 点击工具栏的确定按钮
-      confirm() {
-        this.$emit("confirm", {
-          indexs: this.innerIndex,
-          value: this.innerColumns.map((item, index2) => item[this.innerIndex[index2]]),
-          values: this.innerColumns
-        });
-      },
-      // 选择器某一列的数据发生变化时触发
-      changeHandler(e) {
-        const {
-          value
-        } = e.detail;
-        let index2 = 0, columnIndex = 0;
-        for (let i2 = 0; i2 < value.length; i2++) {
-          let item = value[i2];
-          if (item !== (this.lastIndex[i2] || 0)) {
-            columnIndex = i2;
-            index2 = item;
-            break;
-          }
-        }
-        this.columnIndex = columnIndex;
-        const values = this.innerColumns;
-        this.setLastIndex(value);
-        this.setIndexs(value);
-        this.$emit("change", {
-          // 微信小程序不能传递this，会因为循环引用而报错
-          picker: this,
-          value: this.innerColumns.map((item, index3) => item[value[index3]]),
-          index: index2,
-          indexs: value,
-          // values为当前变化列的数组内容
-          values,
-          columnIndex
-        });
-      },
-      // 设置index索引，此方法可被外部调用设置
-      setIndexs(index2, setLastIndex) {
-        this.innerIndex = uni.$u.deepClone(index2);
-        if (setLastIndex) {
-          this.setLastIndex(index2);
-        }
-      },
-      // 记录上一次的各列索引位置
-      setLastIndex(index2) {
-        this.lastIndex = uni.$u.deepClone(index2);
-      },
-      // 设置对应列选项的所有值
-      setColumnValues(columnIndex, values) {
-        this.innerColumns.splice(columnIndex, 1, values);
-        let tmpIndex = uni.$u.deepClone(this.innerIndex);
-        for (let i2 = 0; i2 < this.innerColumns.length; i2++) {
-          if (i2 > this.columnIndex) {
-            tmpIndex[i2] = 0;
-          }
-        }
-        this.setIndexs(tmpIndex);
-      },
-      // 获取对应列的所有选项
-      getColumnValues(columnIndex) {
-        (async () => {
-          await uni.$u.sleep();
-        })();
-        return this.innerColumns[columnIndex];
-      },
-      // 设置整体各列的columns的值
-      setColumns(columns) {
-        this.innerColumns = uni.$u.deepClone(columns);
-        if (this.innerIndex.length === 0) {
-          this.innerIndex = new Array(columns.length).fill(0);
-        }
-      },
-      // 获取各列选中值对应的索引
-      getIndexs() {
-        return this.innerIndex;
-      },
-      // 获取各列选中的值
-      getValues() {
-        (async () => {
-          await uni.$u.sleep();
-        })();
-        return this.innerColumns.map((item, index2) => item[this.innerIndex[index2]]);
-      }
-    }
-  };
-  function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
-    const _component_u_toolbar = resolveEasycom(vue.resolveDynamicComponent("u-toolbar"), __easycom_0);
-    const _component_u_loading_icon = resolveEasycom(vue.resolveDynamicComponent("u-loading-icon"), __easycom_1$5);
-    const _component_u_popup = resolveEasycom(vue.resolveDynamicComponent("u-popup"), __easycom_2$3);
-    return vue.openBlock(), vue.createBlock(_component_u_popup, {
-      show: _ctx.show,
-      onClose: $options.closeHandler
-    }, {
-      default: vue.withCtx(() => [
-        vue.createElementVNode("view", { class: "u-picker" }, [
-          _ctx.showToolbar ? (vue.openBlock(), vue.createBlock(_component_u_toolbar, {
-            key: 0,
-            cancelColor: _ctx.cancelColor,
-            confirmColor: _ctx.confirmColor,
-            cancelText: _ctx.cancelText,
-            confirmText: _ctx.confirmText,
-            title: _ctx.title,
-            onCancel: $options.cancel,
-            onConfirm: $options.confirm
-          }, null, 8, ["cancelColor", "confirmColor", "cancelText", "confirmText", "title", "onCancel", "onConfirm"])) : vue.createCommentVNode("v-if", true),
-          vue.createElementVNode("picker-view", {
-            class: "u-picker__view",
-            indicatorStyle: `height: ${_ctx.$u.addUnit(_ctx.itemHeight)}`,
-            value: $data.innerIndex,
-            immediateChange: _ctx.immediateChange,
-            style: vue.normalizeStyle({
-              height: `${_ctx.$u.addUnit(_ctx.visibleItemCount * _ctx.itemHeight)}`
-            }),
-            onChange: _cache[0] || (_cache[0] = (...args) => $options.changeHandler && $options.changeHandler(...args))
-          }, [
-            (vue.openBlock(true), vue.createElementBlock(
-              vue.Fragment,
-              null,
-              vue.renderList($data.innerColumns, (item, index2) => {
-                return vue.openBlock(), vue.createElementBlock("picker-view-column", {
-                  key: index2,
-                  class: "u-picker__view__column"
-                }, [
-                  _ctx.$u.test.array(item) ? (vue.openBlock(true), vue.createElementBlock(
-                    vue.Fragment,
-                    { key: 0 },
-                    vue.renderList(item, (item1, index1) => {
-                      return vue.openBlock(), vue.createElementBlock(
-                        "text",
-                        {
-                          class: "u-picker__view__column__item u-line-1",
-                          key: index1,
-                          style: vue.normalizeStyle({
-                            height: _ctx.$u.addUnit(_ctx.itemHeight),
-                            lineHeight: _ctx.$u.addUnit(_ctx.itemHeight),
-                            fontWeight: index1 === $data.innerIndex[index2] ? "bold" : "normal"
-                          })
-                        },
-                        vue.toDisplayString($options.getItemText(item1)),
-                        5
-                        /* TEXT, STYLE */
-                      );
-                    }),
-                    128
-                    /* KEYED_FRAGMENT */
-                  )) : vue.createCommentVNode("v-if", true)
-                ]);
-              }),
-              128
-              /* KEYED_FRAGMENT */
-            ))
-          ], 44, ["indicatorStyle", "value", "immediateChange"]),
-          _ctx.loading ? (vue.openBlock(), vue.createElementBlock("view", {
-            key: 1,
-            class: "u-picker--loading"
-          }, [
-            vue.createVNode(_component_u_loading_icon, { mode: "circle" })
-          ])) : vue.createCommentVNode("v-if", true)
-        ])
-      ]),
-      _: 1
-      /* STABLE */
-    }, 8, ["show", "onClose"]);
-  }
-  const __easycom_1 = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$2], ["__scopeId", "data-v-1500ce68"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/node_modules/uview-plus/components/u-picker/u-picker.vue"]]);
+  const PagesSupervisionGroup = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-7b328f77"], ["__file", "D:/zmj/uniapp/TraceabilityAPP/pages/supervision/group.vue"]]);
   const _sfc_main$6 = {
     __name: "captain",
     setup(__props) {
@@ -20997,14 +21868,14 @@ This will fail in production.`);
       const columns = vue.reactive([
         ["全部 ", "1队农户", "2队农户", "3队农户", "4队农户", "5队农户", "6队农户"]
       ]);
-      const pickerConfirmFn = (e) => {
-        query.value = e.value[0];
+      const pickerConfirmFn = (e2) => {
+        query.value = e2.value[0];
         showPicker.value = false;
       };
       const query = vue.ref("全部");
       return (_ctx, _cache) => {
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
-        const _component_u_picker = resolveEasycom(vue.resolveDynamicComponent("u-picker"), __easycom_1);
+        const _component_u_picker = resolveEasycom(vue.resolveDynamicComponent("u-picker"), __easycom_1$3);
         return vue.openBlock(), vue.createElementBlock(
           vue.Fragment,
           null,
@@ -21367,7 +22238,7 @@ This will fail in production.`);
       const value = vue.ref("");
       const selectAct = vue.ref(false);
       vue.ref(false);
-      const selectFoucsFn = (e) => {
+      const selectFoucsFn = (e2) => {
         selectAct.value = true;
       };
       const indexs = vue.ref(0);
@@ -21426,7 +22297,7 @@ This will fail in production.`);
       };
       return (_ctx, _cache) => {
         const _component_u__image = resolveEasycom(vue.resolveDynamicComponent("u--image"), __easycom_0$6);
-        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$6);
+        const _component_up_input = resolveEasycom(vue.resolveDynamicComponent("up-input"), __easycom_1$7);
         return vue.openBlock(), vue.createElementBlock("view", { class: "" }, [
           vue.createElementVNode("view", { class: "tit" }, [
             vue.createElementVNode("view", { class: "" }, " 监管详情 "),
@@ -21625,6 +22496,7 @@ This will fail in production.`);
   __definePage("pages/feedIng/updateFeed", PagesFeedIngUpdateFeed);
   __definePage("pages/feedIng/vaccineInfo", PagesFeedIngVaccineInfo);
   __definePage("pages/feedIng/addPoultry", PagesFeedIngAddPoultry);
+  __definePage("pages/feedIng/allRecordTable", PagesFeedIngAllRecordTable);
   __definePage("pages/feedIng/allFeed", PagesFeedIngAllFeed);
   __definePage("pages/feedIng/SingleDetail", PagesFeedIngSingleDetail);
   __definePage("pages/feedIng/allRecording", PagesFeedIngAllRecording);
@@ -21635,10 +22507,12 @@ This will fail in production.`);
   __definePage("pages/poultry/vaccineInfo", PagesPoultryVaccineInfo);
   __definePage("pages/poultry/addPoultry", PagesPoultryAddPoultry);
   __definePage("pages/poultry/allFeed", PagesPoultryAllFeed);
+  __definePage("pages/poultry/SingleDetail", PagesPoultrySingleDetail);
   __definePage("pages/poultry/allRecording", PagesPoultryAllRecording);
   __definePage("pages/aquatic/addAquatic", PagesAquaticAddAquatic);
   __definePage("pages/aquatic/addPond", PagesAquaticAddPond);
   __definePage("pages/aquatic/updateGrow", PagesAquaticUpdateGrow);
+  __definePage("pages/aquatic/imgList", PagesAquaticImgList);
   __definePage("pages/aquatic/detail", PagesAquaticDetail);
   __definePage("pages/supervision/group", PagesSupervisionGroup);
   __definePage("pages/supervision/captain", PagesSupervisionCaptain);
@@ -21797,7 +22671,7 @@ This will fail in production.`);
           if (typeof response.data === "string") {
             response.data = JSON.parse(response.data);
           }
-        } catch (e) {
+        } catch (e2) {
         }
         settle(resolve, reject, response);
       }
@@ -22054,10 +22928,10 @@ This will fail in production.`);
               continue;
             }
             child[i2] = _clone(parent2[i2], depth2 - 1);
-          } catch (e) {
-            if (e instanceof TypeError) {
+          } catch (e2) {
+            if (e2 instanceof TypeError) {
               continue;
-            } else if (e instanceof ReferenceError) {
+            } else if (e2 instanceof ReferenceError) {
               continue;
             }
           }
@@ -22552,7 +23426,7 @@ This will fail in production.`);
           return true;
         }
         return false;
-      } catch (e) {
+      } catch (e2) {
         return false;
       }
     }
@@ -23118,12 +23992,12 @@ This will fail in production.`);
         return;
       }
       while (keys.length > 1) {
-        const k2 = keys[0];
-        if (!_obj[k2] || typeof _obj[k2] !== "object") {
-          _obj[k2] = {};
+        const k = keys[0];
+        if (!_obj[k] || typeof _obj[k] !== "object") {
+          _obj[k] = {};
         }
         keys.shift();
-        inFn(_obj[k2], keys, v2);
+        inFn(_obj[k], keys, v2);
       }
     };
     if (typeof key !== "string" || key === "")
diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json
index f90bb64..dfd2d1a 100644
--- a/unpackage/dist/dev/app-plus/manifest.json
+++ b/unpackage/dist/dev/app-plus/manifest.json
@@ -86,7 +86,7 @@
     "uni-app": {
       "control": "uni-v3",
       "vueVersion": "3",
-      "compilerVersion": "3.8.12",
+      "compilerVersion": "3.94",
       "nvueCompiler": "uni-app",
       "renderer": "auto",
       "nvue": {
diff --git a/unpackage/dist/dev/app-plus/pages/index/index.css b/unpackage/dist/dev/app-plus/pages/index/index.css
index 264b235..d04c1e6 100644
--- a/unpackage/dist/dev/app-plus/pages/index/index.css
+++ b/unpackage/dist/dev/app-plus/pages/index/index.css
@@ -730,6 +730,42 @@ uni-view[data-v-9d58ba7c], uni-scroll-view[data-v-9d58ba7c], uni-swiper-item[dat
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.card .tit[data-v-853f8e7d] {
+  display: flex;
+  justify-content: space-between;
+  padding-bottom: 0.625rem;
+  border-bottom: 1px solid #EBF1EF;
+}
+.card .card-li[data-v-853f8e7d] {
+  margin-top: 0.625rem;
+  display: flex;
+  justify-content: space-between;
+}
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
 .circumstance[data-v-91fd8d70] {
   width: 21.68531rem;
   margin: 0 auto;
@@ -993,6 +1029,42 @@ uni-view[data-v-9d58ba7c], uni-scroll-view[data-v-9d58ba7c], uni-swiper-item[dat
 /* 垂直间距 */
 /* 透明度 */
 /* 文章场景相关 */
+.card .tit[data-v-7a12289e] {
+  display: flex;
+  justify-content: space-between;
+  padding-bottom: 0.625rem;
+  border-bottom: 1px solid #EBF1EF;
+}
+.card .card-li[data-v-7a12289e] {
+  margin-top: 0.625rem;
+  display: flex;
+  justify-content: space-between;
+}
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
 .circumstance[data-v-c4e0dba5] {
   width: 21.68531rem;
   margin: 0 auto;