From 64e71a2f25b84567b29b19136713c2da41191eb2 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 30 Nov 2023 17:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BA=AF=E6=BA=90=E8=AF=A6=E6=83=85=E7=AD=89?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |  22 +-
 api/upload.js                                 | 114 ++--
 components/own-share/own-share.vue            | 167 ++++++
 components/own-share/readme.md                |  59 ++
 components/plant/landInfo.vue                 |  25 +-
 components/return/index.vue                   | 134 +++++
 components/uni-popup/uni-popup.vue            | 264 +++++++++
 components/uni-transition/uni-transition.vue  | 278 ++++++++++
 manifest.json                                 | 211 ++++----
 pages/Login/login.vue                         |  58 +-
 pages/Login/resgier.vue                       |  29 +-
 pages/addLand/addLand.vue                     | 166 ++----
 pages/husbandryForm/irrigate.vue              |  23 +-
 pages/husbandryForm/sow.vue                   |  15 +-
 pages/index/index.vue                         |  55 +-
 pages/index/massif.vue                        | 511 ++++++++++--------
 pages/index/personal.vue                      |  72 ++-
 pages/updatePassword/updatePassword.vue       |  67 ++-
 static/img/fb1.png                            | Bin 0 -> 446 bytes
 static/img/fb2.png                            | Bin 0 -> 1119 bytes
 static/img/miniProgram.png                    | Bin 0 -> 6162 bytes
 unpackage/dist/build/app-plus/manifest.json   |  27 +-
 .../dist/build/app-plus/pages/index/index.css |   2 +-
 utils/syhttp.js                               |  11 +-
 24 files changed, 1664 insertions(+), 646 deletions(-)
 create mode 100644 components/own-share/own-share.vue
 create mode 100644 components/own-share/readme.md
 create mode 100644 components/return/index.vue
 create mode 100644 components/uni-popup/uni-popup.vue
 create mode 100644 components/uni-transition/uni-transition.vue
 create mode 100644 static/img/fb1.png
 create mode 100644 static/img/fb2.png
 create mode 100644 static/img/miniProgram.png

diff --git a/App.vue b/App.vue
index aafd85b..ab62577 100644
--- a/App.vue
+++ b/App.vue
@@ -1,14 +1,12 @@
 <script>
-
-
 	export default {
 		onLaunch: function() {
-	
-		
+
+
 		},
 		onShow: function() {
 			console.log('App Show')
-			
+
 		},
 		onHide: function() {
 			console.log('App Hide')
@@ -19,11 +17,12 @@
 
 <style lang="scss">
 	@import "uview-plus/index.scss";
+	
 
 	.card {
 		position: relative;
 		width: 693.93rpx;
-	
+
 		background-color: #fff;
 		box-sizing: border-box;
 		padding: 20rpx 20rpx;
@@ -33,7 +32,7 @@
 		font-size: 29.79rpx;
 
 		.card-li {
-			
+
 			margin-bottom: 17rpx;
 		}
 
@@ -49,10 +48,11 @@
 		display: flex;
 		align-items: center;
 	}
-	 .u-action-sheet__item-wrap {
-			overflow: auto;
-			max-height: 30vh !important;
-		}
+
+	.u-action-sheet__item-wrap {
+		overflow: auto;
+		max-height: 30vh !important;
+	}
 
 	/*每个页面公共css */
 </style>
\ No newline at end of file
diff --git a/api/upload.js b/api/upload.js
index bbea5a2..fe6ec21 100644
--- a/api/upload.js
+++ b/api/upload.js
@@ -1,69 +1,77 @@
 // import base from "@/config/baseUrl";
 // let baseUrl = 'https://ceshi.excellentkk.cn/api';
 // import store from '../store';
-import { config } from '@/config/app';
+import {
+	config
+} from '@/config/app';
 import store from "@/store/index.js"
 let header = {};
 
 
-if (store.state.userInfo){
-		 header.token = store.state.userInfo.token;
-}
-
 function uploads(src, type) {
-  return new Promise((resolve, reject) => {
-    // //console.log('上传', type === 'img' ? '图片' : '视频', '：', src)
-    let a = uni.uploadFile({
-      // url: base.baseUrl + '/upload?token=',
-      url: HTTP_REQUEST_URL_TWO + '/api' + '/upload?token=',
-      filePath: src,
-      name: 'file',
-      success: (res) => {
-        let data = JSON.parse(res.data)
-        if (data.code != 1) {
-          uni.$u.toast(data.msg)
-          return false
-        } else {
-          resolve(data.data.url) // 返回线上地址
-        }
-      },
-      fail: (err) => {
-        reject(err)
-        //console.log('upload-上传失败', err)
-      }
-    });
-  })
+	if (store.state.userInfo) {
+		
+		header.TOKEN = store.state.userInfo.token
+	}
+	
+	return new Promise((resolve, reject) => {
+		// //console.log('上传', type === 'img' ? '图片' : '视频', '：', src)
+		let a = uni.uploadFile({
+			// url: base.baseUrl + '/upload?token=',
+			url: HTTP_REQUEST_URL_TWO + '/api' + '/upload?token=',
+			filePath: src,
+			name: 'file',
+			success: (res) => {
+				let data = JSON.parse(res.data)
+				if (data.code != 1) {
+					uni.$u.toast(data.msg)
+					return false
+				} else {
+					resolve(data.data.url) // 返回线上地址
+				}
+			},
+			fail: (err) => {
+				reject(err)
+				//console.log('upload-上传失败', err)
+			}
+		});
+	})
 }
 
 function Uploads(src, type) {
-  return new Promise((resolve, reject) => {
-    // //console.log('上传', type === 'img' ? '图片' : '视频', '：', src)
+	if (store.state.userInfo) {
+		
+		header.TOKEN = store.state.userInfo.token
+	}
 	
-    let a = uni.uploadFile({
-      url:config.HTTP_REQUEST_URL + '/api/upload/image',
-      filePath: src,
-      name: 'file',
-      header:  header,
-      success: (res) => {
-	 
-        let data = JSON.parse(res.data)
-        if (data.code == 1) {
-          resolve(data) // 返回线上地址
-        } else {
-          uni.$u.toast(data.msg)
-          return false
-        }
-      },
-      fail: (err) => {
-        reject(err)
-        //console.log('upload-上传失败', err)
-      }
-    });
-  })
+	return new Promise((resolve, reject) => {
+		// //console.log('上传', type === 'img' ? '图片' : '视频', '：', src)
+
+		let a = uni.uploadFile({
+			url: config.HTTP_REQUEST_URL + 'api/upload/image',
+			filePath: src,
+			name: 'file',
+			header: header,
+			success: (res) => {
+
+				let data = JSON.parse(res.data)
+				if (data.code == 1) {
+					resolve(data) // 返回线上地址
+				} else {
+					uni.$u.toast(data.msg)
+					return false
+				}
+			},
+			fail: (err) => {
+				reject(err)
+				//console.log('upload-上传失败', err)
+			}
+		});
+	})
 }
 
 
 export {
-  uploads,
-  Uploads
-}
+	uploads,
+	Uploads
+}
\ No newline at end of file
diff --git a/components/own-share/own-share.vue b/components/own-share/own-share.vue
new file mode 100644
index 0000000..6213042
--- /dev/null
+++ b/components/own-share/own-share.vue
@@ -0,0 +1,167 @@
+<template>
+	<uni-popup ref="showshare" type="bottom" @change="change">
+		<view class="uni-share">
+			<!-- <text class="uni-share-title">分享到</text> -->
+			<view class="uni-share-content">
+				<view v-for="(item, index) in bottomData" :key="index" @tap="shareItems(item.name)"
+					class="uni-share-content-box">
+					<view class="uni-share-content-image">
+						<image :src="item.icon" class="content-image" mode="widthFix" />
+					</view>
+					<text class="uni-share-content-text">{{ item.text }}</text>
+				</view>
+			</view>
+			<text class="uni-share-btn" @click="cancel('share')">取消</text>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	import uniPopup from '@/components/uni-popup/uni-popup.vue';
+	export default {
+		props: {
+			shareurl: {
+				type: String,
+				default: ''
+			},
+		},
+		components: {
+			uniPopup
+		},
+
+		data() {
+			return {
+				bottomData: [{
+						text: '刷新',
+						icon: '/static/img/miniProgram.png',
+						name: 'miniProgram'
+					}
+
+				],
+			}
+		},
+		mounted() {
+			// console.log(this.shareurl)
+		},
+		methods: {
+			open() {
+				this.$nextTick(() => {
+					this.$refs['showshare'].open()
+				})
+			},
+			change(e) {
+				// console.log('是否打开:' + e.show)
+			},
+			shareItems(provider) {
+
+
+				switch (provider) {
+
+					case 'miniProgram':
+						
+						uni.reLaunch({
+							url: this.shareurl,
+							success: (res) => {
+								this.$nextTick(() => {
+									this.$refs['showshare'].close
+								})
+							},
+							fail: (res) => {
+								console.log(res)
+							}
+						})
+
+						break;
+
+					case 'more':
+						plus.share.sendWithSystem({
+							type: "web",
+							title: shareOPtions.shareTitle,
+							thumbs: [shareOPtions.shareImage],
+							href: shareOPtions.shareHref,
+							content: shareOPtions.summary,
+						})
+					default:
+						break;
+				}
+
+			},
+			cancel() {
+				this.$refs['showshare'].close()
+			}
+		}
+	}
+</script>
+
+<style>
+	/* 底部分享 */
+	.uni-share {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+		background-color: #fff;
+	}
+
+	.uni-share-title {
+		line-height: 60rpx;
+		font-size: 24rpx;
+		padding: 15rpx 0;
+		text-align: center;
+	}
+
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: center;
+		padding: 15px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		width: 200rpx;
+	}
+
+	.uni-share-content-image {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		width: 60rpx;
+		height: 60rpx;
+		overflow: hidden;
+		border-radius: 10rpx;
+	}
+
+	.content-image {
+		width: 60rpx;
+		height: 60rpx;
+	}
+
+	.uni-share-content-text {
+		font-size: 26rpx;
+		color: #333;
+		padding-top: 5px;
+		padding-bottom: 10px;
+	}
+
+	.uni-share-btn {
+		height: 90rpx;
+		line-height: 90rpx;
+		font-size: 14px;
+		border-top-color: #f5f5f5;
+		border-top-width: 1px;
+		border-top-style: solid;
+		text-align: center;
+		color: #666;
+	}
+</style>
\ No newline at end of file
diff --git a/components/own-share/readme.md b/components/own-share/readme.md
new file mode 100644
index 0000000..efe51da
--- /dev/null
+++ b/components/own-share/readme.md
@@ -0,0 +1,59 @@
+### 使用方法
+ 本组件依赖于 uni-popup 组件 跟 uni-transtion 组件 
+
+ 
+``` js
+	
+	<own-share ref="share" :shareSummary="shareSummary" :shareImage="image"
+	:shareTitle="title" :shareHref="href"
+	:miniProgram="miniProgram" :webUrl="webUrl"
+	@shareSuccess="shareSuccess" @shareFail="shareFail"></own-share>
+
+	//先引入组件
+	import ownShare from '@/components/own-share/own-share.vue'
+	//然后使用
+	components:{
+		ownShare
+	}
+	
+	//打开分享
+	this.$nextTick(()=>{
+		this.$refs.share.open()
+	})
+	//关闭分享
+	this.$nextTick(()=>{
+		this.$refs.share.close()
+	})
+	//当然也可以用 easycom 直接使用
+```
+参数		<sub>分享只用于app</sub>
+
+|  参数   | 类型  | 是否必填 |
+|  ----  | ----  | ---- |
+| shareSummary | String | 只分享内容时必填 |
+| shareImage  | String | 只分享图片时必填 |
+| shareTitle | String | 否 |
+| shareHref | String | 分享图文时必填 |
+| miniProgram | Object | 分享小程序必填 |
+
+miniProgram参数  [详情](https://uniapp.dcloud.io/api/plugins/share?id=share)
+
+|  参数   | 类型  | 是否必填 |
+|  ----  | ----  | ---- |
+| id | String | 微信小程序原始id |
+| path  | String | 点击链接进入的页面 |
+| type | Number | 微信小程序版本类型 |
+| webUrl | String | 兼容低版本的网页链接 |
+
+|  事件   | 说明  | 
+|  ----  | ----  |
+| shareSuccess | 成功回调 |
+| shareFail | 失败回调 | 
+
+----
+**图标链接写在组件里面请自行修改(请看示例项目)**
+
+
+[了解更多uniapp分享,请参考官网](https://uniapp.dcloud.io/api/plugins/share)
+
+
diff --git a/components/plant/landInfo.vue b/components/plant/landInfo.vue
index 658f532..a14cf34 100644
--- a/components/plant/landInfo.vue
+++ b/components/plant/landInfo.vue
@@ -19,12 +19,13 @@
 			<!-- <view class="">
 				种植品牌: {{info.kind}}
 			</view> -->
-		</view><view class="card-li">
+		</view>
+		<!-- <view class="card-li">
 		
 			<view class="">
 				种植品种: {{info.kind}}
 			</view>
-		</view>
+		</view> -->
 		<view class="card-li">
 			<view class="">
 				土地面积: {{info.total_area}}亩
@@ -33,22 +34,20 @@
 				种子品牌: {{}}
 			</view> -->
 		</view>
-		<view class="card-li">
-			<view class="">
-				<!-- 预计产量: {{}}亩 -->
-			</view>
-			<!-- <view class="">
-				已出售: ???
-			</view> -->
-		</view>
+	
 
 		<view class="card-li">
 			<view class="">
-				播种时间: {{info.create_time}}
+				土地负责人: {{info.master_name}}
 			</view>
 
 		</view>
+		<view class="card-li">
+			<view class="">
+				土地负责人: {{info.master_phone}}
+			</view>
 
+		</view>
 
 	</view>
 </template>
@@ -63,9 +62,9 @@
 		info: Object,
 
 	})
-	
+
 	const perviewFn = (url) => {
-		
+
 		uni.previewImage({
 			urls: [url]
 		})
diff --git a/components/return/index.vue b/components/return/index.vue
new file mode 100644
index 0000000..f4ea37d
--- /dev/null
+++ b/components/return/index.vue
@@ -0,0 +1,134 @@
+<template>
+	<view class="">
+		<view class="contentgb">
+			<view class="iconfont icon-xiangzuo" v-if="isshow" style="margin-top: 10rpx;color: #fff;margin-left: 30rpx;"
+				@click="close">
+			</view>
+			<view class="name" v-if="isshow">
+				{{name}}
+			</view>
+			<view class="return_top">
+				<view class="z-bootm-img1" @click="close()">
+					<image src="@/static/img/fb1.png" mode="aspectFit"></image>
+				</view>
+				<view class="z-bootm-l"></view>
+				<view class="z-bootm-img2" @click="returnbom()">
+					<image src="@/static/img/fb2.png" mode="aspectFit"></image>
+				</view>
+			</view>
+		</view>
+
+
+		<own-share ref="share"  :shareurl="url"></own-share><strong></strong>
+	</view>
+
+</template>
+
+<script>
+	import ownShare from '@/components/own-share/own-share.vue'
+	export default {
+		name: 'retuntop',
+		comments: {
+			ownShare
+		},
+		props: {
+			isshow: {
+				type: Boolean
+			},
+			name: {
+				type: String
+			},
+			url: {
+				type: String
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		mounted() {
+			
+		},
+		methods: {
+			close() {
+				
+				this.$nextTick(() => {
+					this.$refs.share.open()
+				})
+			},
+			returnbom() {
+				uni.sendHostEvent('closeApp', (ret) => {
+					//发送消息成功回调
+					//console.log('关闭应用' + JSON.stringify(ret));
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.contentgb {
+		display: flex;
+		justify-content: space-between;
+
+		.name {
+			font-size: 35rpx;
+			font-family: Source Han Sans CN-Medium, Source Han Sans CN;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin-top: 5rpx;
+		}
+
+		.return_top {
+			width: 166rpx;
+			height: 56rpx;
+			background: rgba(255, 255, 255, 0.6);
+			border-radius: 44rpx 44rpx;
+			margin-right: 30rpx;
+
+			position: relative;
+
+			.z-bootm-img1 {
+				width: 41rpx;
+				height: 13rpx;
+
+				position: absolute;
+				top: 5rpx;
+				left: 25rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.z-bootm-l {
+				width: 1px;
+				height: 32rpx;
+				background: rgba(0, 0, 0, 0.2);
+				margin: auto 0;
+
+				position: absolute;
+				top: 10rpx;
+				left: 85rpx;
+			}
+
+			.z-bootm-img2 {
+				width: 38rpx;
+				height: 34rpx;
+				margin-top: -15rpx;
+				margin-left: -15rpx;
+				position: absolute;
+				right: 25rpx;
+				top: 25rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/uni-popup/uni-popup.vue b/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..2b764a9
--- /dev/null
+++ b/components/uni-popup/uni-popup.vue
@@ -0,0 +1,264 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" @touchmove.stop.prevent="clear">
+		<uni-transition :mode-class="['fade']" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
+		<uni-transition :mode-class="ani" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
+			<view class="uni-popup__wrapper-box" @click.stop="clear">
+				<slot />
+			</view>
+		</uni-transition>
+	</view>
+</template>
+
+<script>
+	import uniTransition from '../uni-transition/uni-transition.vue'
+
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * @property {Boolean} animation = [ture|false] 是否开启动画
+	 * @property {Boolean} maskClick = [ture|false] 蒙版点击是否关闭弹窗
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 */
+
+	export default {
+		name: 'UniPopup',
+		components: {
+			uniTransition
+		},
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			maskClick: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				maskClass: {
+					'position': 'fixed',
+					'bottom': 0,
+					'top': 0,
+					'left': 0,
+					'right': 0,
+					'backgroundColor': 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					'position': 'fixed',
+					'left': 0,
+					'right': 0,
+				}
+			}
+		},
+		watch: {
+			type: {
+				handler: function(newVal) {
+					switch (this.type) {
+						case 'top':
+							this.ani = ['slide-top']
+							this.transClass = {
+								'position': 'fixed',
+								'left': 0,
+								'right': 0,
+							}
+							break
+						case 'bottom':
+							this.ani = ['slide-bottom']
+							this.transClass = {
+								'position': 'fixed',
+								'left': 0,
+								'right': 0,
+								'bottom': 0
+							}
+							break
+						case 'center':
+							this.ani = ['zoom-out', 'fade']
+							this.transClass = {
+								'position': 'fixed',
+								/* #ifndef APP-NVUE */
+								'display': 'flex',
+								'flexDirection': 'column',
+								/* #endif */
+								'bottom': 0,
+								'left': 0,
+								'right': 0,
+								'top': 0,
+								'justifyContent': 'center',
+								'alignItems': 'center'
+							}
+
+							break
+					}
+				},
+				immediate: true
+			}
+		},
+		created() {
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+		},
+		methods: {
+			clear(e) {
+				// TODO nvue 取消冒泡
+				e.stopPropagation()
+			},
+			open() {
+				this.showPopup = true
+				this.$nextTick(() => {
+					clearTimeout(this.timer)
+					this.timer = setTimeout(() => {
+						this.showTrans = true
+					}, 50);
+				})
+				this.$emit('change', {
+					show: true
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$nextTick(() => {
+					clearTimeout(this.timer)
+					this.timer = setTimeout(() => {
+						this.$emit('change', {
+							show: false
+						})
+						this.showPopup = false
+					}, 300)
+				})
+			},
+			onTap() {
+				if (!this.maskClick) return
+				this.close()
+			}
+		}
+	}
+</script>
+<style scoped>
+	.uni-popup {
+		position: fixed;
+		/* #ifdef H5 */
+		top: var(--window-top);
+		/* #endif */
+		/* #ifndef H5 */
+		top: 0;
+		/* #endif */
+		bottom: 0;
+		left: 0;
+		right: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-popup__mask {
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		opacity: 0;
+	}
+
+	.mask-ani {
+		transition-property: opacity;
+		transition-duration: 0.2s;
+	}
+
+	.uni-top-mask {
+		opacity: 1;
+	}
+
+	.uni-bottom-mask {
+		opacity: 1;
+	}
+
+	.uni-center-mask {
+		opacity: 1;
+	}
+
+	.uni-popup__wrapper {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: absolute;
+	}
+
+	.top {
+		top: 0;
+		left: 0;
+		right: 0;
+		transform: translateY(-500px);
+	}
+
+	.bottom {
+		bottom: 0;
+		left: 0;
+		right: 0;
+		transform: translateY(500px);
+	}
+
+	.center {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+		bottom: 0;
+		left: 0;
+		right: 0;
+		top: 0;
+		justify-content: center;
+		align-items: center;
+		transform: scale(1.2);
+		opacity: 0;
+	}
+
+	.uni-popup__wrapper-box {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		position: relative;
+	}
+
+	.content-ani {
+		/* transition: transform 0.3s;
+ */
+		transition-property: transform, opacity;
+		transition-duration: 0.2s;
+	}
+
+
+	.uni-top-content {
+		transform: translateY(0);
+	}
+
+	.uni-bottom-content {
+		transform: translateY(0);
+	}
+
+	.uni-center-content {
+		transform: scale(1);
+		opacity: 1;
+	}
+</style>
\ No newline at end of file
diff --git a/components/uni-transition/uni-transition.vue b/components/uni-transition/uni-transition.vue
new file mode 100644
index 0000000..0543b44
--- /dev/null
+++ b/components/uni-transition/uni-transition.vue
@@ -0,0 +1,278 @@
+<template>
+	<view v-if="isShow" ref="ani" class="uni-transition" :class="[ani.in]" :style="'transform:' +transform+';'+stylesObject" @click="change">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const animation = uni.requireNativePlugin('animation');
+	// #endif
+	/**
+	 * Transition 过渡动画
+	 * @description 简单过渡动画组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+	 * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+	 * @property {Array} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+	 *  @value fade 渐隐渐出过渡
+	 *  @value slide-top 由上至下过渡
+	 *  @value slide-right 由右至左过渡
+	 *  @value slide-bottom 由下至上过渡
+	 *  @value slide-left 由左至右过渡
+	 *  @value zoom-in 由小到大过渡
+	 *  @value zoom-out 由大到小过渡
+	 * @property {Number} duration 过渡动画持续时间
+	 * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+	 */
+	export default {
+		name: 'uniTransition',
+		props: {
+			show: {
+				type: Boolean,
+				default: false
+			},
+			modeClass: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			duration: {
+				type: Number,
+				default: 300
+			},
+			styles: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				isShow: false,
+				transform: '',
+				ani: {
+					in: '',
+					active: ''
+				}
+			};
+		},
+		watch: {
+			show: {
+				handler(newVal) {
+					if (newVal) {
+						this.open()
+					} else {
+						this.close()
+					}
+				},
+				immediate: true
+			}
+		},
+		computed: {
+			stylesObject() {
+				let styles = {
+					...this.styles,
+					'transition-duration': this.duration / 1000 + 's'
+				}
+				let transfrom = ''
+				for (let i in styles) {
+					let line = this.toLine(i)
+					transfrom += line + ':' + styles[i] + ';'
+				}
+				return transfrom
+			}
+		},
+		created() {
+			// this.timer = null
+			// this.nextTick = (time = 50) => new Promise(resolve => {
+			// 	clearTimeout(this.timer)
+			// 	this.timer = setTimeout(resolve, time)
+			// 	return this.timer
+			// });
+		},
+		methods: {
+			change() {
+				this.$emit('click', {
+					detail: this.isShow
+				})
+			},
+			open() {
+				this.isShow = true
+				this.transform = ''
+				this.ani.in = ''
+				for (let i in this.getTranfrom(false)) {
+					if (i === 'opacity') {
+						this.ani.in = 'fade-in'
+					} else {
+						this.transform += `${this.getTranfrom(false)[i]} `
+					}
+				}
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this._animation(true)
+					}, 50)
+				})
+
+			},
+			close(type) {
+				this._animation(false)
+			},
+			_animation(type) {
+				let styles = this.getTranfrom(type)
+				// #ifdef APP-NVUE
+				if (!this.$refs['ani']) return
+				animation.transition(this.$refs['ani'].ref, {
+					styles,
+					duration: this.duration, //ms
+					timingFunction: 'ease',
+					needLayout: false,
+					delay: 0 //ms
+				}, () => {
+					if (!type) {
+						this.isShow = false
+					}
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+				// #endif
+				// #ifndef APP-NVUE
+				this.transform = ''
+				for (let i in styles) {
+					if (i === 'opacity') {
+						this.ani.in = `fade-${type?'out':'in'}`
+					} else {
+						this.transform += `${styles[i]} `
+					}
+				}
+				clearTimeout(this.timer)
+				this.timer = setTimeout(() => {
+					if (!type) {
+						this.isShow = false
+					}
+					this.$emit('change', {
+						detail: this.isShow
+					})
+
+				}, this.duration)
+				// #endif
+
+			},
+			getTranfrom(type) {
+				let styles = {
+					transform: ''
+				}
+				this.modeClass.forEach((mode) => {
+					switch (mode) {
+						case 'fade':
+							styles.opacity = type ? 1 : 0
+							break;
+						case 'slide-top':
+							styles.transform += `translateY(${type?'0':'-100%'}) `
+							break;
+						case 'slide-right':
+							styles.transform += `translateX(${type?'0':'100%'}) `
+							break;
+						case 'slide-bottom':
+							styles.transform += `translateY(${type?'0':'100%'}) `
+							break;
+						case 'slide-left':
+							styles.transform += `translateX(${type?'0':'-100%'}) `
+							break;
+						case 'zoom-in':
+							styles.transform += `scale(${type?1:0.8}) `
+							break;
+						case 'zoom-out':
+							styles.transform += `scale(${type?1:1.2}) `
+							break;
+					}
+				})
+				return styles
+			},
+			_modeClassArr(type) {
+				let mode = this.modeClass
+				if (typeof(mode) !== "string") {
+					let modestr = ''
+					mode.forEach((item) => {
+						modestr += (item + '-' + type + ',')
+					})
+					return modestr.substr(0, modestr.length - 1)
+				} else {
+					return mode + '-' + type
+				}
+			},
+			// getEl(el) {
+			// 	console.log(el || el.ref || null);
+			// 	return el || el.ref || null
+			// },
+			toLine(name) {
+				return name.replace(/([A-Z])/g, "-$1").toLowerCase();
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.uni-transition {
+		transition-timing-function: ease;
+		transition-duration: 0.3s;
+		transition-property: transform, opacity;
+	}
+
+	.fade-in {
+		opacity: 0;
+	}
+
+	.fade-active {
+		opacity: 1;
+	}
+
+	.slide-top-in {
+		/* transition-property: transform, opacity; */
+		transform: translateY(-100%);
+	}
+
+	.slide-top-active {
+		transform: translateY(0);
+		/* opacity: 1; */
+	}
+
+	.slide-right-in {
+		transform: translateX(100%);
+	}
+
+	.slide-right-active {
+		transform: translateX(0);
+	}
+
+	.slide-bottom-in {
+		transform: translateY(100%);
+	}
+
+	.slide-bottom-active {
+		transform: translateY(0);
+	}
+
+	.slide-left-in {
+		transform: translateX(-100%);
+	}
+
+	.slide-left-active {
+		transform: translateX(0);
+		opacity: 1;
+	}
+
+	.zoom-in-in {
+		transform: scale(0.8);
+	}
+
+	.zoom-out-active {
+		transform: scale(1);
+	}
+
+	.zoom-out-in {
+		transform: scale(1.2);
+	}
+</style>
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 3df60bf..75f6217 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,101 +1,112 @@
 {
-    "name" : "种植溯源",
-    "appid" : "__UNI__D087881",
-    "description" : "",
-    "versionName" : "1.0.1",
-    "versionCode" : "100",
-    "transformPx" : false,
-    /* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-		"screenOrientation":["portrait-primary","portrait-secondary","landscape-primary","landscape-secondary"],
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        /* 模块配置 */
-        "modules" : {
-            "Geolocation" : {},
-            "Maps" : {},
-            "LivePusher" : {},
-            "VideoPlayer" : {},
-            "Barcode" : {},
-            "Camera" : {}
-        },
-        /* 应用发布信息 */
-        "distribute" : {
-            /* android打包配置 */
-            "android" : {
-                "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ],
-                "minSdkVersion" : 21
-            },
-            /* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
-            },
-            /* SDK配置 */
-            "sdkConfigs" : {
-                "ad" : {},
-                "geolocation" : {
-                    "amap" : {
-                        "name" : "amapC2GgorTaY",
-                        "__platform__" : [ "android" ],
-                        "appkey_ios" : "b0c21bc6b220aa882bad8ffb6bce8829",
-                        "appkey_android" : "b0c21bc6b220aa882bad8ffb6bce8829"
-                    }
-                },
-                "maps" : {
-                    "amap" : {
-                        "name" : "amapC2GgorTaY",
-                        "appkey_ios" : "b0c21bc6b220aa882bad8ffb6bce8829",
-                        "appkey_android" : "b0c21bc6b220aa882bad8ffb6bce8829"
-                    }
-                }
-            }
-        }
-    },
-    /* 快应用特有相关 */
-    "quickapp" : {},
-    /* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true
-    },
-    "mp-alipay" : {
-        "usingComponents" : true
-    },
-    "mp-baidu" : {
-        "usingComponents" : true
-    },
-    "mp-toutiao" : {
-        "usingComponents" : true
-    },
-    "uniStatistics" : {
-        "enable" : false
-    },
-    "vueVersion" : "3"
-}
+	"name": "种植溯源",
+	"appid": "__UNI__D087881",
+	"description": "",
+	"versionName": "1.0.1",
+	"versionCode": "100",
+	"transformPx": false,
+	/* 5+App特有相关 */
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"screenOrientation": [
+			"portrait-primary",
+			"portrait-secondary",
+			"landscape-primary",
+			"landscape-secondary"
+		],
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		/* 模块配置 */
+		"modules": {
+			"Geolocation": {},
+			"Maps": {},
+			"LivePusher": {},
+			"VideoPlayer": {},
+			"Barcode": {},
+			"Camera": {},
+			"UniMP": {
+				"description": "uni小程序"
+			}
+		},
+		/* 应用发布信息 */
+		"distribute": {
+			/* android打包配置 */
+			"android": {
+				"permissions": [
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				],
+				"minSdkVersion": 21
+			},
+			/* ios打包配置 */
+			"ios": {
+				"dSYMs": false
+			},
+			/* SDK配置 */
+			"sdkConfigs": {
+				"ad": {},
+				"geolocation": {
+					"amap": {
+						"name": "amap_18982406440DFVLElaO",
+						"__platform__": ["android"],
+						"appkey_ios": "4e6789b864fe1a2d76b98e38158f20f2",
+						"appkey_android": "a230d943475443eb29fc3871fbef8605"
+					},
+					"system": {
+						"__platform__": ["ios", "android"]
+					}
+				},
+				"maps": {
+					"amap": {
+						"name": "4e6789b864fe1a2d76b98e38158f20f2",
+						"appkey_ios": "a230d943475443eb29fc3871fbef8605",
+						"appkey_android": "a230d943475443eb29fc3871fbef8605"
+					}
+				}
+			}
+		}
+	},
+	/* 快应用特有相关 */
+	"quickapp": {},
+	/* 小程序特有相关 */
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
+	},
+	"mp-alipay": {
+		"usingComponents": true
+	},
+	"mp-baidu": {
+		"usingComponents": true
+	},
+	"mp-toutiao": {
+		"usingComponents": true
+	},
+	"uniStatistics": {
+		"enable": false
+	},
+	"vueVersion": "3"
+}
\ No newline at end of file
diff --git a/pages/Login/login.vue b/pages/Login/login.vue
index b608ab7..390cd35 100644
--- a/pages/Login/login.vue
+++ b/pages/Login/login.vue
@@ -1,6 +1,4 @@
 <template>
-
-
 	<view class="box">
 		<view class="content">
 			<view class="tit">
@@ -18,7 +16,7 @@
 				</view>
 
 				<view class="yanzm" v-if="num==0">
-					<u-input type="password" shape='circle'
+					<u-input type="number" shape='circle'
 						customStyle="background:#F5F5F5;height:80rpx;padding-left:40rpx;border:none;width:120rpx;"
 						placeholder="请输入验证码" border="surround" v-model="formData.code"></u-input>
 
@@ -27,9 +25,14 @@
 
 				</view>
 				<view class="" v-if="num==1">
-					<u-input type="password" shape='circle'
+					<u-input :password="!pwdShow" shape='circle'
 						customStyle="background:#F5F5F5;height:80rpx;;padding-left:40rpx;border:none"
-						placeholder="请输入密码" border="surround" v-model="formData.password"></u-input>
+						placeholder="请输入密码" border="surround" v-model="formData.password" >
+						<template #suffix>
+							<u-icon :name="pwdShow?'eye-off':'eye-fill'"
+								@click="pwdShow=!pwdShow"  size="25"></u-icon>
+						</template>
+						</u-input>
 				</view>
 				<view class="resgiter" @click="resgiter">
 					用户注册
@@ -49,7 +52,6 @@
 <script setup>
 	import {
 		login,
-
 		xinregister
 	} from '@/api/api.js';
 	import {
@@ -65,6 +67,7 @@
 
 	const num = ref(0)
 	const isshow = ref(false)
+	const pwdShow = ref(false)
 	const tips = ref('获取验证码')
 	const countDown = ref(60); // 倒计时秒数
 	const formData = reactive({
@@ -89,26 +92,37 @@
 
 	//判断安卓 ios
 	const checkUserAgent = () => {
+
 		uni.getSystemInfo({
-			success: function(res) {
+			success: (res) => {
 				const platform = res.platform.toLowerCase();
-				if (platform === 'android') {
-					formData.terminal = 6
-				} else if (platform === 'ios') {
-					formData.terminal = 5
-				} else {
-					formData.terminal = 6
-					console.log('当前设备不是 Android 也不是 iOS');
+
+				if (platform === 'ios') {
+					formData.terminal = 5;
+				} else if (platform === 'android') {
+					formData.terminal = 6;
+				} else if (platform === 'windows') {
+					formData.terminal = 4;
+				} else if (platform === 'mac') {
+					formData.terminal = 4;
 				}
+
+
 			}
-		});
+		})
+		// #ifdef H5
+		formData.terminal = 3;
+		// #endif
+		// #ifdef MP-WEIXIN
+		formData.terminal = 1;
+		// #endif
 
 	};
 	//倒计时
 	const startCountDown = () => {
 		const timer = setInterval(() => {
 			countDown.value -= 1; // 更新倒计时秒数
-			isshow.value = true
+			
 			if (countDown.value === 0) {
 				clearInterval(timer); // 倒计时结束，清除定时器
 				isshow.value = false
@@ -119,13 +133,15 @@
 	};
 
 	const getCode = () => {
+		
 		let data = {
 			phone: formData.account,
 			scene: 101
 		}
 		xinregister(data).then((res) => {
-			console.log(res)
+			
 			if (res.code == 1) {
+				isshow.value = true
 				uni.$u.toast('验证码已发送');
 				// 通知验证码组件内部开始倒计时
 				startCountDown()
@@ -152,11 +168,13 @@
 		// console.log(formData)
 		if (!formData.code && formData.scene == 2) return uni.$u.toast('验证码不能为空');
 		login(formData).then((res) => {
-
 			if (res.code == 1) {
-
+				uni.showLoading({
+					title: '登陆中'
+				})
 				store.commit('saveUserInfo', res.data)
 				setTimeout(() => {
+					uni.hideLoading()
 					uni.reLaunch({
 						url: '/pages/index/massif'
 					})
@@ -187,8 +205,6 @@
 
 	onMounted(() => {
 		checkUserAgent()
-
-
 		formData.scene = 2
 
 	})
diff --git a/pages/Login/resgier.vue b/pages/Login/resgier.vue
index f8d6e24..6260aa8 100644
--- a/pages/Login/resgier.vue
+++ b/pages/Login/resgier.vue
@@ -19,14 +19,26 @@
 
 
 				<view class="" style="margin: 30rpx 0;">
-					<u-input type="password" shape='circle'
+					<u-input :password="!pwdShow" shape='circle'
 						customStyle="background:#F5F5F5;height:80rpx;;padding-left:40rpx;border:none"
-						placeholder="请输入密码" border="surround" v-model="formData.password"></u-input>
+						placeholder="请输入密码" border="surround" v-model="formData.password">
+						<template #suffix>
+							<u-icon :name="pwdShow?'eye-off':'eye-fill'" size="25"
+								@click="pwdShow=!pwdShow"></u-icon>
+						</template>
+						</u-input>
 				</view>
 				<view class="">
-					<u-input type="password" shape='circle'
+					<u-input :password="!pwdShow1" shape='circle'
 						customStyle="background:#F5F5F5;height:80rpx;;padding-left:40rpx;border:none"
-						placeholder="请确认密码" border="surround" v-model="formData.password_confirm"></u-input>
+						placeholder="请确认密码" border="surround" v-model="formData.password_confirm">
+						<template #suffix>
+							<u-icon :name="pwdShow1?'eye-off':'eye-fill'" size="25"
+								@click="pwdShow1=!pwdShow1"></u-icon>
+						</template>
+						</u-input>
+				
+				
 				</view>
 
 				<view class="sub-btn">
@@ -49,7 +61,8 @@
 		reactive,
 		ref
 	} from 'vue';
-
+const pwdShow = ref(false)
+const pwdShow1 = ref(false)
 	const formData = reactive({
 		mobile: "",
 		password: "",
@@ -64,8 +77,6 @@
 
 	const submitFn = () => {
 
-
-
 		if (!formData.mobile) return uni.$u.toast('账号不能为空');
 		if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(formData.mobile)) return uni.$u.toast(
 			'请输入正确的手机号码'
@@ -75,14 +86,14 @@
 
 		if (formData.password !== formData.password_confirm) return uni.$u.toast('密码与确认密码不一致');
 
-
 		logregister(formData).then((res) => {
 
 			if (res.code == 1) {
-				uni.$u.toast('注册成功');
+			
 				uni.navigateBack({
 					delta: 1
 				})
+					uni.$u.toast('注册成功');
 			}
 		})
 
diff --git a/pages/addLand/addLand.vue b/pages/addLand/addLand.vue
index c4ad637..0eb9717 100644
--- a/pages/addLand/addLand.vue
+++ b/pages/addLand/addLand.vue
@@ -7,35 +7,32 @@
 			<u-form-item label="简介" prop="intro"><u-input v-model="data.formData.intro" /></u-form-item> -->
 
 				<u-form-item label="土地名称" prop="title" borderBottom ref='item1' required>
-					<up-input placeholder="请输入土地名称" border="surround" v-model="data.formData.title" ></up-input>
+					<up-input placeholder="请输入土地名称" border="surround" v-model="data.formData.title"></up-input>
 				</u-form-item>
 				<u-form-item label="土地面积" prop="area" borderBottom required>
 					<up-input placeholder="请输入土地面积" border="surround" v-model="data.formData.area"></up-input>
 				</u-form-item>
 				<u-form-item label="所在省份" prop="province_code" borderBottom required @click="isshow1">
 					<up-input placeholder="请选择所在省份" border="surround" v-model="province_name" readonly
-						  style="pointer-events: none;"></up-input>
+						style="pointer-events: none;"></up-input>
 				</u-form-item>
-				<u-form-item label="所在城市" prop="city_code" borderBottom required  @click="isshow2">
-					<up-input placeholder="请选择所在城市" border="surround" v-model="city_name"
-						readonly  style="pointer-events: none;"></up-input>
+				<u-form-item label="所在城市" prop="city_code" borderBottom required @click="isshow2">
+					<up-input placeholder="请选择所在城市" border="surround" v-model="city_name" readonly
+						style="pointer-events: none;"></up-input>
 				</u-form-item>
-				<u-form-item label="所在区县" prop="county_code" borderBottom required  @click="isshow3">
-					<up-input placeholder="请选择所在区县" border="surround" v-model="county_name"
-						readonly style="pointer-events: none;"></up-input>
+				<u-form-item label="所在区县" prop="county_code" borderBottom required @click="isshow3">
+					<up-input placeholder="请选择所在区县" border="surround" v-model="county_name" readonly
+						style="pointer-events: none;"></up-input>
 				</u-form-item>
-				<u-form-item label="所在镇街" prop="town_code" borderBottom required @click="isshow4">
-					<up-input placeholder="请选择所在镇街" border="surround" v-model="town_name" 
-						readonly style="pointer-events: none;"></up-input>
-				</u-form-item>
-				<u-form-item label="所在乡村" prop="village_code" borderBottom required @click="isshow5">
-					<up-input placeholder="请选择所在乡村" border="surround" v-model="village_name" 
-						readonly style="pointer-events: none;"></up-input>
-				</u-form-item>
-				<u-form-item label="所在小队" prop="group_code" borderBottom required  @click="isshow6">
-					<up-input placeholder="请选择所在小队" border="surround" v-model="group_name"
-						readonly  style="pointer-events: none;"></up-input>
+				<u-form-item label="土地详细地址" prop="town_code" borderBottom required>
+					<u-input placeholder="请输入土地详细地址" border="surround" v-model="data.formData.address">
+
+						<template #suffix>
+							<u-icon name="map-fill" size="28" @click="location"></u-icon>
+						</template>
+					</u-input>
 				</u-form-item>
+
 				<u-form-item label="土地负责人" prop="master_name" borderBottom required>
 					<up-input placeholder="请输入土地负责人名称" border="surround" v-model="data.formData.master_name"></up-input>
 				</u-form-item>
@@ -132,9 +129,8 @@
 			province_code: '',
 			city_code: '',
 			county_code: '',
-			town_code: '',
-			village_code: '',
-			group_code: '',
+			address: '',
+
 			master_name: '',
 			master_phone: '',
 			pic: ['https://img0.baidu.com/it/u=1717510975,3258230326&fm=253&fmt=auto?w=120&h=80',
@@ -183,23 +179,11 @@
 				message: '请选择所在区县',
 				trigger: 'change'
 			}],
-			town_code: [{
+			address: [{
 				type: 'string',
 				required: true,
-				message: '请选择所在镇街',
-				trigger: 'change'
-			}],
-			village_code: [{
-				type: 'string',
-				required: true,
-				message: '请选择所在乡村',
-				trigger: 'change'
-			}],
-			group_code: [{
-				type: 'string',
-				required: true,
-				message: '请选择小队',
-				trigger: 'change'
+				message: '请输入土地详细地址',
+				trigger: ['blur', 'change']
 			}],
 			master_name: [{
 				type: 'string',
@@ -230,21 +214,15 @@
 	const province_name = ref(null)
 	const city_name = ref(null)
 	const county_name = ref(null)
-	const town_name = ref(null)
-	const village_name = ref(null)
-	const group_name = ref(null)
+
 	const show = ref(false)
 	const show1 = ref(false)
 	const show2 = ref(false)
-	const show3 = ref(false)
-	const show4 = ref(false)
-	const show5 = ref(false)
 	const columns = reactive([])
 	const columns1 = reactive([])
 	const columns2 = reactive([])
-	const columns3 = reactive([])
-	const columns4 = reactive([])
-	const columns5 = reactive([])
+
+
 	const provincen = () => {
 		province().then((res) => {
 			columns.splice(0, columns.length, ...res.data.map((step, index) => {
@@ -258,7 +236,7 @@
 	}
 
 	const cityn = (id) => {
-		
+
 		city({
 			province_code: id
 		}).then((res) => {
@@ -292,20 +270,6 @@
 		pic.splice(i, 1);
 	}
 
-	const townsn = (id) => {
-		towns({
-			county_code: id
-		}).then((res) => {
-			columns3.splice(0, columns.length, ...res.data.map((step, index) => {
-				return {
-					name: step.town_name,
-					id: step.town_code,
-
-				};
-			}));
-
-		});
-	}
 	//图片上传
 	const updateImgFn = async () => {
 
@@ -315,7 +279,7 @@
 			sourceType: ['album', 'camera'],
 			success: (res) => {
 				Uploads(res.tempFilePaths[0], 'img').then(res => {
-					console.log(res)
+					// console.log(res)
 					if (res.code == 1) {
 						pic.push(res.data.url)
 						console.log(data.formData)
@@ -340,32 +304,9 @@
 		// let res = await Uploads()
 		// data.formData.pic = res.data.image
 	}
-	const villagesn = (id) => {
-		villages({
-			town_code: id
-		}).then((res) => {
-			columns4.splice(0, columns.length, ...res.data.map((step, index) => {
-				return {
-					name: step.village_name,
-					id: step.village_code,
 
-				};
-			}));
 
-		});
-	}
 
-	const groupsn = () => {
-		groups().then((res) => {
-			columns5.splice(0, columns.length, ...res.data.map((step, index) => {
-				return {
-					name: step.group_name,
-					id: step.group_code,
-				};
-			}));
-
-		});
-	}
 	// 地址  省 市  街道 乡村 小队
 
 	const isshow1 = () => {
@@ -390,7 +331,7 @@
 	}
 
 	const leavaType1 = (e) => {
-	
+
 		province_name.value = e.name
 		data.formData.province_code = e.id
 		cityn(e.id)
@@ -405,23 +346,36 @@
 	const leavaType3 = (e) => {
 		county_name.value = e.name
 		data.formData.county_code = e.id
-		townsn(e.id)
-	}
-	const leavaType4 = (e) => {
-		town_name.value = e.name
-		data.formData.town_code = e.id
-		villagesn(e.id)
-	}
-	const leavaType5 = (e) => {
-		village_name.value = e.name
-		data.formData.village_code = e.id
 
 	}
-	const leavaType6 = (e) => {
-	
-		group_name.value = e.name
-		data.formData.group_code = e.id.toString()
+	const location = () => {
 
+		//#ifdef APP
+		uni.showLoading({
+			title: '获取位置中'
+		})
+		uni.getLocation({
+			type: 'gcj02',
+			geocode: true,
+			isHighAccuracy: true,
+			success: async (res) => {
+				// console.log(res)
+
+				data.formData.address = res.address.city + res.address.district + res.address.street + res
+					.address.streetNum + res.address.poiName
+
+				uni.hideLoading();
+			},
+			fail: (err) => {
+				uni.hideLoading();
+				console.log(err)
+			}
+		});
+		//#endif
+
+		//#ifdef H5
+		uni.$u.toast('暂不支持')
+		//#endif
 	}
 
 
@@ -438,15 +392,15 @@
 		try {
 			const valid = await form1.value.validate();
 			if (valid) {
-				console.log('表单通过');
-
-				data.formData.pic = JSON.stringify(pic)
-				if (data.formData.pic.length == 0) {
+				console.log('表单通过', data.formData);
+				if (pic.length == 0) {
 
 					uni.$u.toast('请上传图片')
 					return
 				}
-				
+				data.formData.pic = JSON.stringify(pic)
+
+
 				// 表单验证通过，执行提交操作
 				addland(data.formData).then((res) => {
 					console.log(res)
@@ -471,7 +425,7 @@
 	onLoad((options) => {
 
 		provincen()
-		groupsn()
+
 	})
 </script>
 
diff --git a/pages/husbandryForm/irrigate.vue b/pages/husbandryForm/irrigate.vue
index 66fc79c..ca119d9 100644
--- a/pages/husbandryForm/irrigate.vue
+++ b/pages/husbandryForm/irrigate.vue
@@ -6,28 +6,28 @@
 				<u-form-item label="灌溉方式" prop="type" borderBottom required @click="showggai">
 					<!-- 	<uni-data-select v-model="formData.type" :disabled="mode=='detail'"
 						:localdata="range"></uni-data-select> -->
-					<up-input placeholder="请选择灌溉方式" readonly border="surround"
-						v-model="formDatatype"  style="pointer-events: none;"></up-input>
+					<up-input placeholder="请选择灌溉方式" readonly border="surround" v-model="formDatatype"
+						style="pointer-events: none;"></up-input>
 				</u-form-item>
 
 				<view class="" v-if="mode=='add'">
 					<u-form-item label="开始日期" @click="openDate" prop="start_date" borderBottom required>
-						<up-input placeholder="请选择日期" readonly border="surround"
-							v-model="formData.start_date"  style="pointer-events: none;"></up-input>
+						<up-input placeholder="请选择日期" readonly border="surround" v-model="formData.start_date"
+							style="pointer-events: none;"></up-input>
 					</u-form-item>
 					<u-form-item label="结束日期" prop="end_date" @click="openDate1" borderBottom required>
-						<up-input placeholder="请选择日期" readonly border="surround"
-							v-model="formData.end_date"  style="pointer-events: none;"></up-input>
+						<up-input placeholder="请选择日期" readonly border="surround" v-model="formData.end_date"
+							style="pointer-events: none;"></up-input>
 					</u-form-item>
 				</view>
 				<view class="" v-else>
 					<u-form-item label="开始日期" prop="start_date" borderBottom required>
-						<up-input placeholder="请选择日期" readonly border="surround"
-							v-model="formData.start_date"  style="pointer-events: none;"></up-input>
+						<up-input placeholder="请选择日期" readonly border="surround" v-model="formData.start_date"
+							style="pointer-events: none;"></up-input>
 					</u-form-item>
 					<u-form-item label="结束日期" prop="end_date" borderBottom required>
-						<up-input placeholder="请选择日期" readonly border="surround"
-							v-model="formData.end_date"  style="pointer-events: none;"></up-input>
+						<up-input placeholder="请选择日期" readonly border="surround" v-model="formData.end_date"
+							style="pointer-events: none;"></up-input>
 					</u-form-item>
 				</view>
 				<u-form-item label="灌溉面积" prop="area" borderBottom required>
@@ -49,7 +49,8 @@
 								<view class="">
 									<u-icon name="close" size="15" style="margin-left:120.85rpx;" @click="delimg(i)"
 										v-show="mode=='add'"></u-icon>
-									<u-image :src="item" width="150.85rpx" height="150.85rpx" @click="perviewFn(item)" ></u-image>
+									<u-image :src="item" width="150.85rpx" height="150.85rpx"
+										@click="perviewFn(item)"></u-image>
 								</view>
 							</view>
 						</view>
diff --git a/pages/husbandryForm/sow.vue b/pages/husbandryForm/sow.vue
index 8b57208..2d395bc 100644
--- a/pages/husbandryForm/sow.vue
+++ b/pages/husbandryForm/sow.vue
@@ -54,7 +54,7 @@
 
 					</view>
 				</view>
-				<u-form-item label="备注" prop="remark" borderBottom required>
+				<u-form-item label="备注"  borderBottom >
 					<u--textarea v-model="data.formData.remark" :disabled="mode=='detail'"
 						placeholder="请输入内容"></u--textarea>
 				</u-form-item>
@@ -142,13 +142,8 @@
 				required: true,
 				message: '请填写开始日期',
 				trigger: ['blur', 'change']
-			}],
-			remark: [{
-				type: 'string',
-				required: true,
-				message: '请填写备注信息',
-				trigger: ['blur', 'change']
 			}]
+			
 		}
 	})
 
@@ -198,12 +193,12 @@
 			if (valid) {
 				data.formData.land_id = task_id.value
 				console.log('表单通过');
-				data.formData.pic = JSON.stringify(pic)
-				if (data.formData.pic.length == 0) {
-				
+				if (pic.length == 0) {
 					uni.$u.toast('请上传图片')
 					return
 				}
+				data.formData.pic = JSON.stringify(pic)
+				
 				// 表单验证通过，执行提交操作
 				addplant(data.formData).then((res) => {
 			
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cd6222b..51a8a7c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,14 +1,24 @@
 <template>
 	<view class="">
+
 		<view class="content">
 
 			<view class="serch">
+				<!-- #ifdef APP-PLUS -->
+				<view class="head-img" style="top: var(--status-bar-height);">
+					<Myindex url='/pages/index/index'/>
+				</view>
+				
+				<!-- #endif -->
 				<u-search bgColor="white" :show-action="false" margin='0 30rpx' placeholder="搜索你的土地信息"
 					v-model="fomData.keyword" shape="round"></u-search>
 				<u-button class="custom-style" @click="search">搜索</u-button>
 
 			</view>
-			<view class="card" v-for="(item,index) in datalist" :key="index" @click="navgo(item)">
+
+
+			<view class="card" v-for="(item,index) in datalist" :key="index" @click="navgo(item)"
+				style="margin-top: calc(var(--status-bar-height) + 40rpx);">
 				<view class="tit card-li">
 					<view class="">
 						{{item.title}}
@@ -35,7 +45,7 @@
 				</view>
 				<view class="card-li tit">
 					<view class="" style="font-weight: normal;">
-						地址: {{item.town_name}}{{item.village_name}}{{item.group_name}}
+						地址: {{item.address}}
 					</view>
 				</view>
 
@@ -71,10 +81,20 @@
 		reactive,
 		onMounted
 	} from "vue"
-	
+	import Myindex from '@/components/return/index.vue';
+	import store from "@/store/index.js"
 	import {
 		landlist
 	} from '@/api/api.js'
+	onLoad(()=>{
+		// console.log(store.state.userInfo)
+		if (!store.state.userInfo) {
+			uni.redirectTo({
+				url:'/pages/Login/login'
+			})
+		
+		}
+	})
 	onShow(() => {
 		list()
 	})
@@ -111,17 +131,19 @@
 		});
 	}
 	const list = () => {
+		datalist.splice(0)
 		fomData.page_no = 1
 		getlist()
 	}
 	const getlist = () => {
 		landlist(fomData).then((res) => {
 			if (res.code == 1) {
-				datalist.splice(0, datalist.length, ...res.data);
-				fomData.page_no += fomData.page_no
-				
+				datalist.push(...res.data)
+				fomData.page_no = fomData.page_no + 1
+
+
 			}
-			
+
 		})
 
 	}
@@ -142,9 +164,10 @@
 	})
 </script>
 
-<style lang="scss" >
+<style lang="scss">
 	page {
 		background-color: #EAF2EF;
+
 	}
 
 	.content {
@@ -154,6 +177,17 @@
 
 		padding-top: 180rpx;
 
+		.head-img {
+			position: absolute;
+			display: flex;
+			top: 0;
+			right: 10rpx;
+			margin-top: 20rpx;
+
+
+
+		}
+
 		.land {
 			width: 100rpx;
 			height: 100rpx;
@@ -176,9 +210,10 @@
 			position: fixed;
 			display: flex;
 			top: 0;
-			padding-top: 70rpx;
+			padding-top: calc(70rpx + var(--status-bar-height) + 20rpx);
 			padding-right: 20rpx;
 
+
 			.custom-style {
 				color: #606266;
 				width: 140rpx;
@@ -214,7 +249,7 @@
 			justify-content: center;
 			align-items: center;
 			text-align: center;
-			
+
 			margin: 300rpx auto;
 
 			image {
diff --git a/pages/index/massif.vue b/pages/index/massif.vue
index d55589b..eea41f8 100644
--- a/pages/index/massif.vue
+++ b/pages/index/massif.vue
@@ -1,221 +1,240 @@
 <template>
 	<view class="" style="position: relative;">
 		<view class="top">
+
 			<view class="" style="height:var(--status-bar-height) ;">
 			</view>
-			<view class="nav">
-				<view class="">
-					<u-icon name="scan" @click="scanFn" color="white" :size="30"></u-icon>
-				</view>
-				<view class="" style="margin-left: 20rpx;">
-					<u-icon name="coupon-fill" color="white" @click="showModal=true" :size="28"></u-icon>
-				</view>
-				<view class="" style="margin-left: 20rpx;">
-					<u-icon name="plus-circle" color="white" @click="navto('/pages/addLand/addLand')"
-						:size="28"></u-icon>
-				</view>
+			<!-- #ifdef APP-PLUS -->
+			<view class="nav-con" style="justify-content: space-between;">
+			<!-- #endif -->
+				<!-- #ifdef H5 -->
+				<view class="nav-con" style="justify-content: flex-end;">
+				<!-- #endif -->
 
-			</view>
-		</view>
-		<view class="">
-			<view class="" style="height:var(--status-bar-height) ;">
-			</view>
-			<view class="nav">
-			</view>
-		</view>
 
-		<view class="content" v-if="true">
-			<!-- 土地信息 -->
-			<view class="">
-				<view class="card" v-if="Object.keys(dataobj).length>0">
-					<view class="" @click="navgo">
-						<view class="" style="margin: 10rpx 0;">
-							土地名称: {{dataobj.title}}
+					<view class="nav">
+
+
+						<view class="">
+							<u-icon name="scan" @click="scanFn" color="white" :size="30"></u-icon>
 						</view>
-						<!-- <view class="" style="margin: 10rpx 0;">
+						<view class="" style="margin-left: 20rpx;">
+							<u-icon name="coupon-fill" color="white" @click="showModal=true" :size="28"></u-icon>
+						</view>
+						<view class="" style="margin-left: 20rpx;">
+							<u-icon name="plus-circle" color="white" @click="navto('/pages/addLand/addLand')"
+								:size="28"></u-icon>
+						</view>
+					</view>
+					<!-- #ifdef APP-PLUS -->
+					<view class="" style="margin-top: -5rpx;">
+
+						<Myindex url='/pages/index/massif' />
+					</view>
+					<!-- #endif -->
+				</view>
+			</view>
+			<view class="">
+				<view class="" style="height:var(--status-bar-height) ;">
+				</view>
+				<view class="nav-con" style="margin-bottom: 80rpx;">
+				</view>
+			</view>
+
+			<view class="content" v-if="true">
+				<!-- 土地信息 -->
+				<view class="">
+					<view class="card" v-if="Object.keys(dataobj).length>0">
+						<view class="" @click="navgo">
+							<view class="" style="margin: 10rpx 0;">
+								土地名称: {{dataobj.title}}
+							</view>
+							<!-- <view class="" style="margin: 10rpx 0;">
 							农作物: 洋芋
 						</view> -->
-						<view class="" style="margin: 10rpx 0;">
-							土地面积: {{dataobj.total_area}}亩
+							<view class="" style="margin: 10rpx 0;">
+								土地面积: {{dataobj.total_area}}亩
+							</view>
+							<view class="" style="margin: 10rpx 0;">
+								种植面积: {{dataobj.total_area-dataobj.residual_area}}亩
+							</view>
 						</view>
-						<view class="" style="margin: 10rpx 0;">
-							种植面积: {{dataobj.total_area-dataobj.residual_area}}亩
+						<view class="changeLand" @click="show=true">
+							切换土地
+						</view>
+
+					</view>
+					<view class="card" v-else>
+
+						<view class="">
+							<view class="">
+								暂无信息
+							</view>
+
+						</view>
+
+
+					</view>
+				
+				</view>
+			
+				<view class="add-thing" @click="showPicker1=true" v-if="columns2[0]&&columns2[0].length>0">
+					记农事
+				</view>
+				<!-- 苗情监测 -->
+				<view class="">
+					<view class="live-video soil-monitor">
+						<view class="head">
+							<view class="tit">
+								苗情监测数据
+							</view>
+							<view class="flushed-time">
+								<u-icon name="clock"></u-icon>
+								<text>刷新时间: {{getNowTimeFn()}} </text>
+							</view>
 						</view>
 					</view>
-					<view class="changeLand" @click="show=true">
-						切换土地
+					<view class="video" @click="navto('/pages/live/live')">
+						<!-- <u--image :src="url" width="100%" height="300rpx"></u--image> -->
+						<u-swiper :list="dataobj.pic" width="100%" height="300rpx"></u-swiper>
 					</view>
 
+
 				</view>
-				<view class="card" v-else>
+				<!-- 土壤监测 -->
+
+				<view class="">
+
+					<view class="soil-monitor">
+						<view class="head">
+							<view class="tit">
+								土壤监测数据
+							</view>
+							<view class="flushed-time">
+								<u-icon name="clock"></u-icon>
+								<text>刷新时间: {{getNowTimeFn()}} </text>
+							</view>
+						</view>
+						<view class="monitor-content"
+							v-if="dataobj&&dataobj.monitor&&dataobj.soil_monitor_data&&Object.keys(dataobj.soil_monitor_data).length>0">
+							<view class="monitor-card" v-for="(item,index) in soilList" :key="index">
+								<view class="name">
+									<view class="">
+										<u--image :src="item.icon" width="38.55rpx" height="38.55rpx"></u--image>
+									</view>
+									<view class="" style="margin-left: 10rpx;">
+										{{item.name}}
+									</view>
+
+								</view>
+								<view class="num">
+									<text style="font-size: 70rpx;">{{item.num}}</text>
+									<text>{{item.unit}}</text>
+								</view>
+							</view>
+						</view>
+						<view class="coneng-detail" v-else>
+							<view class="">
+								<image src="@/static/img/zw.png" mode="aspectFit"></image>
+								<view class="">
+									暂无数据
+								</view>
+							</view>
+						</view>
+
+					</view>
+					<!-- 环境监测 -->
+					<view class="soil-monitor">
+						<view class="head">
+							<view class="tit">
+								环境监测数据
+							</view>
+							<view class="flushed-time">
+								<u-icon name="clock"></u-icon>
+								<text>刷新时间: {{getNowTimeFn()}} </text>
+							</view>
+						</view>
+						<view class="monitor-content"
+							v-if="dataobj&&dataobj.monitor&&dataobj.monitor.air_monitor_data&&Object.keys(dataobj.monitor.air_monitor_data).length>0">
+							<view class="monitor-card" v-for="(item,index) in environmentList" :key="index">
+								<view class="name">
+									<view class="">
+										<u--image :src="item.icon" width="38.55rpx" height="38.55rpx"></u--image>
+									</view>
+									<view class="" style="margin-left: 10rpx;">
+										{{item.name}}
+									</view>
+
+								</view>
+								<view class="num">
+									<text style="font-size: 70rpx;">{{item.num}}</text>
+									<text>{{item.unit}}</text>
+								</view>
+							</view>
+						</view>
+
+
+						<view class="coneng-detail" v-else>
+
+							<view class="">
+								<image src="@/static/img/zw.png" mode="aspectFit"></image>
+								<view class="">
+									暂无数据
+								</view>
+							</view>
+						</view>
+					</view>
+
+
+				</view>
+
+				<!-- 组件 -->
+
+				<u-loading-page :loading="showLoading"></u-loading-page>
+
+
+				<u-action-sheet :show="show" keyName="name" closeOnClickOverlay :actions="columns" title="请选择"
+					@close="show = false" @select="confirm">
+				</u-action-sheet>
+			</view>
+			<view class="empty" v-else>
+				<view class="addLand">
 					<view class="">
-						<view class="">
-							暂无信息
-						</view>
-
+						你还没有土地信息
 					</view>
-
-
-				</view>
-			</view>
-			<view class="add-thing" @click="showPicker1=true" v-if="columns2.length>0">
-				记农事
-			</view>
-			<!-- 苗情监测 -->
-			<view class="">
-				<view class="live-video soil-monitor">
-					<view class="head">
-						<view class="tit">
-							苗情监测数据
-						</view>
-						<view class="flushed-time">
-							<u-icon name="clock"></u-icon>
-							<text>刷新时间: {{getNowTimeFn()}} </text>
-						</view>
+					<view class="addBtn" @click="navto('/pages/addLand/addLand')">
+						去添加
 					</view>
 				</view>
-				<view class="video" @click="navto('/pages/live/live')">
-					<!-- <u--image :src="url" width="100%" height="300rpx"></u--image> -->
-					<u-swiper :list="dataobj.pic" width="100%" height="300rpx"></u-swiper>
-				</view>
-
 
 			</view>
-			<!-- 土壤监测 -->
-
-			<view class="">
-
-				<view class="soil-monitor">
-					<view class="head">
-						<view class="tit">
-							土壤监测数据
-						</view>
-						<view class="flushed-time">
-							<u-icon name="clock"></u-icon>
-							<text>刷新时间: {{getNowTimeFn()}} </text>
-						</view>
-					</view>
-					<view class="monitor-content"
-						v-if="dataobj&&dataobj.monitor&&dataobj.soil_monitor_data&&Object.keys(dataobj.soil_monitor_data).length>0">
-						<view class="monitor-card" v-for="(item,index) in soilList" :key="index">
-							<view class="name">
-								<view class="">
-									<u--image :src="item.icon" width="38.55rpx" height="38.55rpx"></u--image>
-								</view>
-								<view class="" style="margin-left: 10rpx;">
-									{{item.name}}
-								</view>
-
-							</view>
-							<view class="num">
-								<text style="font-size: 70rpx;">{{item.num}}</text>
-								<text>{{item.unit}}</text>
-							</view>
-						</view>
-					</view>
-					<view class="coneng-detail" v-else>
-
-						<view class="">
-							<image src="@/static/img/zw.png" mode="aspectFit"></image>
-							<view class="">
-								暂无数据
-							</view>
-						</view>
-					</view>
-
-				</view>
-				<!-- 环境监测 -->
-				<view class="soil-monitor">
-					<view class="head">
-						<view class="tit">
-							环境监测数据
-						</view>
-						<view class="flushed-time">
-							<u-icon name="clock"></u-icon>
-							<text>刷新时间: {{getNowTimeFn()}} </text>
-						</view>
-					</view>
-					<view class="monitor-content"
-						v-if="dataobj&&dataobj.monitor&&dataobj.monitor.air_monitor_data&&Object.keys(dataobj.monitor.air_monitor_data).length>0">
-						<view class="monitor-card" v-for="(item,index) in environmentList" :key="index">
-							<view class="name">
-								<view class="">
-									<u--image :src="item.icon" width="38.55rpx" height="38.55rpx"></u--image>
-								</view>
-								<view class="" style="margin-left: 10rpx;">
-									{{item.name}}
-								</view>
-
-							</view>
-							<view class="num">
-								<text style="font-size: 70rpx;">{{item.num}}</text>
-								<text>{{item.unit}}</text>
-							</view>
-						</view>
-					</view>
-
-
-					<view class="coneng-detail" v-else>
-
-						<view class="">
-							<image src="@/static/img/zw.png" mode="aspectFit"></image>
-							<view class="">
-								暂无数据
-							</view>
-						</view>
-					</view>
-				</view>
-
-
-			</view>
-
 			<!-- 组件 -->
 
-			<u-loading-page :loading="showLoading"></u-loading-page>
+			<view class="Modal">
+				<u-popup :show="showModal" mode="center" @close="closeModal" :round="10">
+					<view class="Modal">
+						<text> 产品编号:</text>
+						<uni-data-select v-model="equipmentId" style="width: 300rpx;margin-left: 30rpx;"
+							:localdata="range"></uni-data-select>
+					</view>
 
+					<view class="Modal-btn">
+						<view class="Modal-btna" @click="closeModal">
+							取消
+						</view>
+						<view class="Modal-btnb" @click="bindFn">
+							确定
+						</view>
+					</view>
+				</u-popup>
 
-			<u-action-sheet :show="show" keyName="name" closeOnClickOverlay :actions="columns" title="请选择"
-				@close="show = false" @select="confirm">
-			</u-action-sheet>
-		</view>
-		<view class="empty" v-else>
-			<view class="addLand">
-				<view class="">
-					你还没有土地信息
-				</view>
-				<view class="addBtn" @click="navto('/pages/addLand/addLand')">
-					去添加
-				</view>
 			</view>
+			<u-picker keyName="name" :show="showPicker1" @cancel="showPicker1=false" @confirm="confirm1"
+				:columns="columns2"></u-picker>
 
+			<u-picker keyName="label" :show="showPicker" @cancel="showPicker=false" @confirm="confirm2"
+				:columns="columns1"></u-picker>
 		</view>
-		<!-- 组件 -->
-
-		<view class="Modal">
-			<u-popup :show="showModal" mode="center" @close="closeModal" :round="10">
-				<view class="Modal">
-					<text> 产品编号:</text>
-					<uni-data-select v-model="equipmentId" style="width: 300rpx;margin-left: 30rpx;"
-						:localdata="range"></uni-data-select>
-				</view>
-
-				<view class="Modal-btn">
-					<view class="Modal-btna" @click="closeModal">
-						取消
-					</view>
-					<view class="Modal-btnb" @click="bindFn">
-						确定
-					</view>
-				</view>
-			</u-popup>
-
-		</view>
-		<u-picker keyName="name" :show="showPicker1" @cancel="showPicker1=false" @confirm="confirm1"
-			:columns="columns2"></u-picker>
-
-		<u-picker keyName="label" :show="showPicker" @cancel="showPicker=false" @confirm="confirm2"
-			:columns="columns1"></u-picker>
-	</view>
 </template>
 
 <script setup>
@@ -227,6 +246,7 @@
 		onLoad,
 		onShow
 	} from "@dcloudio/uni-app"
+	import Myindex from '@/components/return/index.vue';
 	import {
 		bindproduct,
 		lindexist,
@@ -234,7 +254,7 @@
 		plantlist,
 		landproduct
 	} from '@/api/api.js'
-
+	import store from "@/store/index.js"
 	const showPicker = ref(false)
 	const showPicker1 = ref(false)
 	const showModal = ref(false)
@@ -306,6 +326,15 @@
 		},
 
 	])
+	onLoad(() => {
+		// console.log(store.state.userInfo)
+		if (!store.state.userInfo) {
+			uni.redirectTo({
+				url: '/pages/Login/login'
+			})
+
+		}
+	})
 	const dataobj = reactive({})
 	const tdId = ref('')
 	const palntId = ref('')
@@ -397,30 +426,32 @@
 		}).then((res) => {
 
 			if (res.code == 1) {
-				getlist3(res.data.id)
-				Object.assign(dataobj, res.data);
+				if (Object.keys(res.data).length > 0) {
+					getlist3(res.data.id)
 
-				if (res.data && res.data.monitor && res.data.monitor.soil_monitor_data) {
-					soilList[0].num = res.data.monitor.soil_monitor_data.temperature
-					soilList[1].num = res.data.monitor.soil_monitor_data.moisture
-					soilList[2].num = res.data.monitor.soil_monitor_data.conductivity
-					soilList[3].num = res.data.monitor.soil_monitor_data.ph
-					soilList[4].num = res.data.monitor.soil_monitor_data.n_content
-					soilList[5].num = res.data.monitor.soil_monitor_data.p_content
-					soilList[6].num = res.data.monitor.soil_monitor_data.k_content
+					Object.assign(dataobj, res.data);
+
+					if (res.data && res.data.monitor && res.data.monitor.soil_monitor_data) {
+						soilList[0].num = res.data.monitor.soil_monitor_data.temperature
+						soilList[1].num = res.data.monitor.soil_monitor_data.moisture
+						soilList[2].num = res.data.monitor.soil_monitor_data.conductivity
+						soilList[3].num = res.data.monitor.soil_monitor_data.ph
+						soilList[4].num = res.data.monitor.soil_monitor_data.n_content
+						soilList[5].num = res.data.monitor.soil_monitor_data.p_content
+						soilList[6].num = res.data.monitor.soil_monitor_data.k_content
+					}
+					if (res.data && res.data.monitor && res.data.monitor.air_monitor_data) {
+						environmentList[0].num = res.data.monitor.air_monitor_data.wind_speed
+						environmentList[1].num = res.data.monitor.air_monitor_data.wind_direction
+						environmentList[2].num = res.data.monitor.air_monitor_data.temperature
+						environmentList[3].num = res.data.monitor.air_monitor_data.moisture
+						environmentList[4].num = res.data.monitor.air_monitor_data.co2_content
+						environmentList[5].num = res.data.monitor.air_monitor_data.pressure
+						environmentList[6].num = res.data.monitor.air_monitor_data.rainfall
+						environmentList[7].num = res.data.monitor.air_monitor_data.light_intensity
+
+					}
 				}
-				if (res.data && res.data.monitor && res.data.monitor.air_monitor_data) {
-					environmentList[0].num = res.data.monitor.air_monitor_data.wind_speed
-					environmentList[1].num = res.data.monitor.air_monitor_data.wind_direction
-					environmentList[2].num = res.data.monitor.air_monitor_data.temperature
-					environmentList[3].num = res.data.monitor.air_monitor_data.moisture
-					environmentList[4].num = res.data.monitor.air_monitor_data.co2_content
-					environmentList[5].num = res.data.monitor.air_monitor_data.pressure
-					environmentList[6].num = res.data.monitor.air_monitor_data.rainfall
-					environmentList[7].num = res.data.monitor.air_monitor_data.light_intensity
-
-				}
-
 
 			}
 		})
@@ -433,7 +464,6 @@
 			page_size: 99995,
 			keyword: ''
 		}).then((res) => {
-
 			if (res.code == 1) {
 				if (res.data.length > 0) {
 					columns.splice(0, columns.length, ...res.data.map((step, index) => {
@@ -443,8 +473,6 @@
 						};
 					}));
 				}
-
-
 			}
 		})
 
@@ -470,9 +498,9 @@
 		plantlist({
 			land_id: id
 		}).then((res) => {
-		
+
 			if (res.code == 1) {
-				 columns2.splice(0)
+				columns2.splice(0)
 				let arr1 = []
 				arr1.splice(0, arr1.length, ...res.data.map((step, index) => {
 					return {
@@ -481,6 +509,8 @@
 					};
 				}));
 				columns2.push(arr1)
+				
+				
 
 			}
 		})
@@ -498,21 +528,26 @@
 
 	//绑定产品
 	const biproduct = () => {
-		bindproduct({
-			land_id: dataobj.id,
-			product_id: equipmentId.value
-		}).then((res) => {
-			if (res.code == 1) {
-				uni.$u.toast(res.msg);
-				// this.dataobj=res.data
-				equipmentId.value = ''
-			}
-			console.log(res)
-		})
+		if (equipmentId.value) {
+			bindproduct({
+				land_id: dataobj.id,
+				product_id: equipmentId.value
+			}).then((res) => {
+				if (res.code == 1) {
+					uni.$u.toast(res.msg);
+					// this.dataobj=res.data
+					equipmentId.value = ''
+				}
+				console.log(res)
+			})
+		} else {
+			uni.$u.toast('请选择产品编号');
+		}
+
 	}
 	const confirm2 = (e) => {
 		showPicker.value = false
-	
+
 		uni.navigateTo({
 			url: e.value[0].route + '?id=' + palntId.value
 		})
@@ -568,7 +603,6 @@
 		z-index: 999999;
 		width: 750rpx;
 
-
 	}
 
 	.coneng-detail {
@@ -649,13 +683,18 @@
 		z-index: 9999 !important;
 	}
 
-	.nav {
-		height: 70rpx;
+	.nav-con {
 		display: flex;
-		justify-content: flex-end;
-		box-sizing: border-box;
-		align-items: center;
-		padding-right: 40rpx;
+
+		padding-top: 20rpx;
+		padding-bottom: 10rpx;
+	}
+
+	.nav {
+		display: flex;
+		padding-right: 20rpx;
+		padding-left: 10rpx;
+
 	}
 
 	.card {
diff --git a/pages/index/personal.vue b/pages/index/personal.vue
index 87f92e8..1373fdd 100644
--- a/pages/index/personal.vue
+++ b/pages/index/personal.vue
@@ -1,23 +1,30 @@
 <template>
 	<view class="head">
-		<view class="avater">
-			<u--image @click="previewImageFn" :src="userinfo.avatar" width="130.28rpx" height="130.28rpx"
-				shape="circle"></u--image>
+		<!-- #ifdef APP-PLUS -->
+		<view class="head-return">
+			<Myindex url='/pages/index/personal' />
 		</view>
-		<view class="" v-if="Object.keys(userinfo).length>0">
+		<!-- #endif -->
+		<view class="head-con">
+			<view class="avater">
+				<u--image @click="previewImageFn" :src="userinfo.avatar" width="130.28rpx" height="130.28rpx"
+					shape="circle"></u--image>
+			</view>
+			<view class="" v-if="Object.keys(userinfo).length>0">
 
-			<view class="head-li">
-				姓名: {{userinfo.nickname}}
+				<view class="head-li">
+					姓名: {{userinfo.nickname}}
+				</view>
+				<view class="head-li">
+					电话: {{userinfo.mobile}}
+				</view>
+				<!-- <view class="head-li">
+					公司: 里海弄农业科技有限公司
+				</view> -->
 			</view>
-			<view class="head-li">
-				电话: {{userinfo.mobile}}
+			<view class="" v-else @click="revto('/pages/Login/login')">
+				请登录
 			</view>
-			<!-- <view class="head-li">
-				公司: 里海弄农业科技有限公司
-			</view> -->
-		</view>
-		<view class="" v-else @click="revto('/pages/Login/login')">
-			请登录
 		</view>
 	</view>
 	<view class="content">
@@ -38,15 +45,16 @@
 		</view>
 		<view class="out-btn">
 			<up-button @click="loginOutFn" type="primary" customStyle="border:none;height:90rpx" color="#34D190"
-				text="退出登录"  v-if="Object.keys(userinfo).length>0"></up-button>
-				
-			
+				text="退出登录" v-if="Object.keys(userinfo).length>0"></up-button>
+
+
 		</view>
 	</view>
 
 </template>
 
 <script setup lang="ts">
+	import Myindex from '@/components/return/index.vue';
 	import {
 		reactive,
 		ref
@@ -55,8 +63,8 @@
 	import store from "@/store/index.js"
 
 	const userinfo = reactive({})
-	if (store.state.userInfo !=null) {
-		Object.assign(userinfo,store.state.userInfo)
+	if (store.state.userInfo != null) {
+		Object.assign(userinfo, store.state.userInfo)
 
 	}
 
@@ -114,16 +122,23 @@
 	}
 </script>
 
-<style lang="scss" >
-	page{
+<style lang="scss">
+	page {
 		background-color: $theme-bg-color;
 	}
+
 	.head {
 		height: 25vh;
 		background-color: $theme-main-color;
 		color: white;
-		display: flex;
-		align-items: center;
+		padding-top: 30rpx;
+		position: relative;
+
+		.head-con {
+			display: flex;
+			align-items: center;
+			margin-top: 30rpx;
+		}
 
 		.head-li {
 			margin: 10rpx 0;
@@ -132,11 +147,18 @@
 		.avater {
 			margin: 0 40rpx;
 		}
+
+		.head-return {
+			margin-top: 30rpx;
+			margin-left: calc(100% - 200rpx);
+			
+
+		}
 	}
 
 	.content {
-	
-		
+
+
 		padding-top: 30rpx;
 
 		.card {
diff --git a/pages/updatePassword/updatePassword.vue b/pages/updatePassword/updatePassword.vue
index 3e1d4ca..72e59c6 100644
--- a/pages/updatePassword/updatePassword.vue
+++ b/pages/updatePassword/updatePassword.vue
@@ -3,37 +3,52 @@
 		<view class="reset-password">
 			<u--form ref="formRef" :rules="rules" :model="formData">
 				<u-form-item label="原密码" labelWidth="140rpx" borderBottom prop="old_password">
-					<u--input v-model="formData.old_password" :password="!pwdShow.old_password" placeholder="请输入原密码"
-						maxlength="18">
-						<!-- #ifdef APP-PLUS -->
-						<template slot="suffix">
-							<uni-icons :type="pwdShow.old_password?'eye-filled':'eye-slash-filled'"
-								@click="pwdShow.old_password=!pwdShow.old_password" color="#999"></uni-icons>
+
+
+
+					<u-input placeholder="请输入原密码" border="surround" v-model="formData.old_password"
+						:password="!pwdShow.old_password">
+
+						<template #suffix>
+							<u-icon :name="pwdShow.old_password?'eye-off':'eye-fill'" size="25"
+								@click="pwdShow.old_password=!pwdShow.old_password"></u-icon>
 						</template>
-						<!-- #endif -->
-					</u--input>
+					</u-input>
+
+
+
+
+
+
+
+
+
+
 				</u-form-item>
 				<u-form-item label="新密码" labelWidth="140rpx" borderBottom prop="password">
-					<u--input v-model="formData.password" :password="!pwdShow.password" placeholder="请输入新密码"
-						maxlength="18">
-						<!-- #ifdef APP-PLUS -->
-						<template slot="suffix">
-							<u--icon :name="pwdShow.password?'eye-off':'eye-fill'"
-								@click="pwdShow.old_password=!pwdShow.old_password" color="#999"></u--icon>
+
+
+					<u-input border="surround" v-model="formData.password" :password="!pwdShow.password"
+						placeholder="请输入新密码">
+
+						<template #suffix>
+							<u-icon :name="pwdShow.password?'eye-off':'eye-fill'" size="25"
+								@click="pwdShow.password=!pwdShow.password"></u-icon>
 						</template>
-						<!-- #endif -->
-					</u--input>
+					</u-input>
+
+
 				</u-form-item>
 				<u-form-item label="确认密码" labelWidth="140rpx" borderBottom prop="password_confirm">
-					<u--input v-model="formData.password_confirm" :password="!pwdShow.password_confirm"
-						placeholder="请确认新密码" maxlength="18">
-						<!-- #ifdef APP-PLUS -->
-						<template slot="suffix">
-							<u--icon :name="pwdShow.password_confirm?'eye-off':'eye-fill'"
-								@click="pwdShow.old_password=!pwdShow.old_password" color="#999"></u--icon>
+					<u-input border="surround" v-model="formData.password_confirm" :password="!pwdShow.password_confirm"
+						placeholder="请确认新密码">
+
+						<template #suffix>
+							<u-icon :name="pwdShow.password_confirm?'eye-off':'eye-fill'" size="25"
+								@click="pwdShow.password_confirm=!pwdShow.password_confirm"></u-icon>
 						</template>
-						<!-- #endif -->
-					</u--input>
+					</u-input>
+
 				</u-form-item>
 				<u-button style="margin-top: 28rpx;background-color:#34D190;color: #fff;" @click="submit">提交</u-button>
 			</u--form>
@@ -98,11 +113,11 @@
 							'新密码不能与原密码一致');
 						if (this.formData.password !== this.formData.password_confirm) return uni.$u.toast(
 							'两次新密码不一致');
-					
+
 						changePassword(
 							this.formData
 						).then((res) => {
-					
+
 							if (res.code == 1) {
 								uni.$u.toast('修改成功');
 								uni.switchTab({
diff --git a/static/img/fb1.png b/static/img/fb1.png
new file mode 100644
index 0000000000000000000000000000000000000000..786e3f31f35939f0542352f9846ea2b19a60fce6
GIT binary patch
literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq001cf000dL1^@s6G+js500001b5ch_0Itp)
z=>Px$cu7P-R7gw3)jvyIQ4j_2--3mO5DU8~u`oo-6oO3(L5PK*Mba6PPCvpz0%-(4
zKq@O2)J{;rU;-9)QLs=DOsZG}B4}ZmLWqpqh3CV4`%l)}J>JYY=g!PMQ_}wF#T;fZ
zjQIY8eXL@uU5Zkh0I!pfz5<+Gyu*2`Tv?INFoAyj#CKd308e8bT@8>2-YZ-d#J<2J
zdT^5X|3!RN<Y#=!5r)87e7y%aTKYS+wgHW|A<_D%X#T_{zhFN1BSz*84npL6RBA9?
zV-!cZ{~xi?sJcwtK$_QV>LSWDu%b}UL*!{1_*$IzRbVHzrdgd)$-t|gXzkzB;#yec
z5c$6j(;miiF+VWYtisgNrA*#n8k-`h%41iu8yAgK@&lF&X7XivZP}1c&1AU2NWIq`
zGqnAPulsE*g{)78KZZ{|#V>rT<C9a^ctD?wZ52NK1jmRaaK|TGcmua7aj6w_Y~!>l
oG`qWplHfBOVhx+E0$1~H05~#E!`+b`&j0`b07*qoM6N<$g2)HOl>h($

literal 0
HcmV?d00001

diff --git a/static/img/fb2.png b/static/img/fb2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9534065e79c604528fc2cdb79dba242eae84170
GIT binary patch
literal 1119
zcmV-l1fctgP)<h;3K|Lk000e1NJLTq001Tc001Hg1^@s6Gpwt)00001b5ch_0Itp)
z=>Px(8A(JzR9Hv7m|Lh-RTPFlGo&IdE7G#aO3fY&GKn(s5@l9|X^7^d<%?ZJp$F5n
zjKmviA_VpzLWx8{C1QeNX{9JZT82eh5N2gw$h?=ycbHRVleO1gOSg@;bN0CWYmI;0
zRy*oTJKzrBUf?d^R-ij@6>tS`0QeR70oV>~0@ea2>x42$RWbMrz*9iiszyQY6tEJQ
z3v8}pTLoBOU<xpzio*&z0-O}yXhZcfV3z?ife96Y)m8Zim=8<`juja<0@e-q2=Hwc
z$=|^Gz#UWbJFpMfAJW_f=m87?9s~4OBwK-Dz~21FB4D=w8-eQ!JRJmP1B)6xX#)VG
z!rRw(E<XYTfuGYKa$pkt^8!$kSK`h9PSnj?qCXXQ1!$l7u!61fKjQyWV3z}1fZH=8
z%YQhq;XDAPrXzu6z@?c#v-AKUO-O;6p64^=Ux538-7NwY-3$&K_GP4EwJu13^#QhJ
zK#v0V0bjKkRCG5ESd#hv3%J>o#y7SCkf5o&4#<fMDXV}-vjDb`83MZj_$ec#Wb6g}
z+XR(5&jAksy@BJvcOgv{%i$*WwiRPvlIZ;=CV@Q*EY2K^2i`1ks-1k8SE6I}J`KFn
z1f2cy@l0oc0X_&#F8+2T4CJz*`x0QPtB6GZq(sqFn$lEW7T7KzZG4vPfD%VG-aS<i
z1s&hqHGsq}l8XTwcUqy#1!nc7J!L5{wj}V2z?>SuRP{l9;6~zlWM_!7L0}Hli;{n~
zRYi#t=Ucy;z+MBUmDsEab2X}L6WE_X#~Q#s3;nGQwr0TI1D;GAZWfqb-KG|0Au#cO
zPG#QDRtju2Ff;-3A@D>Au<HOvRaLRNuP!0Kew;e4>rv(kOinrRqxc5h<IAL#?V?lI
z<vJt*M+xkna4@7mB=?sk$XeN8^D4I(yTn=fJ<u}&VtVr#R)jN-BsbOD!mhS693Hlm
zW+TaN;P^{9?j#r%fqDJBkwiWXJQ&vJs$4o3JzL1DnW21N6M@-vU2*NuQQX5N<k_wA
zTq2j)+#N<$+T1?{25FNnif)$gW{$oA`d3IvUCb8O7r?cNq1?I?_&NvX-){lWWKo=@
zwhuwJLM%3K%QQRsoea#10rF$Sy~uOk%{3MGEZa)m8JRzb>y)cfzVF-lT~y_En-raI
zoq=`XwdRgp>O9}xZqhJQJ7ajoOZ2pfMjelwN5V33)~?aPdnK?u7!;+?bME~>UODkC
za41ofL!M&~hb7RDEk)ue8WZOAe||6fMBtv}=K((xq+PicJTqldLr%4wYq?bUsB%+q
zFuE0p0!@729cBKi0E_l^cDD}Oir>QO%EzI2T(g@UIfdkJ7SJ(bb96FzIs5VC#>~id
l+BV~5FOLM(XtgekcLr(s%Yx}q$(aBE002ovPDHLkV1kui{;B`~

literal 0
HcmV?d00001

diff --git a/static/img/miniProgram.png b/static/img/miniProgram.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd2521fde820ae92a557d638266d624b7322fafb
GIT binary patch
literal 6162
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

literal 0
HcmV?d00001

diff --git a/unpackage/dist/build/app-plus/manifest.json b/unpackage/dist/build/app-plus/manifest.json
index c122564..09451ed 100644
--- a/unpackage/dist/build/app-plus/manifest.json
+++ b/unpackage/dist/build/app-plus/manifest.json
@@ -25,6 +25,9 @@
     "VideoPlayer": {},
     "Barcode": {},
     "Camera": {},
+    "UniMP": {
+      "description": "uni小程序"
+    },
     "UniNView": {
       "description": "UniNView原生渲染"
     }
@@ -77,19 +80,25 @@
         "ad": {},
         "geolocation": {
           "amap": {
-            "name": "amapC2GgorTaY",
+            "name": "amap_18982406440DFVLElaO",
             "__platform__": [
               "android"
             ],
-            "appkey_ios": "b0c21bc6b220aa882bad8ffb6bce8829",
-            "appkey_android": "b0c21bc6b220aa882bad8ffb6bce8829"
+            "appkey_ios": "4e6789b864fe1a2d76b98e38158f20f2",
+            "appkey_android": "a230d943475443eb29fc3871fbef8605"
+          },
+          "system": {
+            "__platform__": [
+              "ios",
+              "android"
+            ]
           }
         },
         "maps": {
           "amap": {
-            "name": "amapC2GgorTaY",
-            "appkey_ios": "b0c21bc6b220aa882bad8ffb6bce8829",
-            "appkey_android": "b0c21bc6b220aa882bad8ffb6bce8829"
+            "name": "4e6789b864fe1a2d76b98e38158f20f2",
+            "appkey_ios": "a230d943475443eb29fc3871fbef8605",
+            "appkey_android": "a230d943475443eb29fc3871fbef8605"
           }
         },
         "audio": {
@@ -167,5 +176,11 @@
       "selected": 0
     }
   },
+  "screenOrientation": [
+    "portrait-primary",
+    "portrait-secondary",
+    "landscape-primary",
+    "landscape-secondary"
+  ],
   "launch_path": "__uniappview.html"
 }
\ No newline at end of file
diff --git a/unpackage/dist/build/app-plus/pages/index/index.css b/unpackage/dist/build/app-plus/pages/index/index.css
index 747ef00..0005c3c 100644
--- a/unpackage/dist/build/app-plus/pages/index/index.css
+++ b/unpackage/dist/build/app-plus/pages/index/index.css
@@ -1 +1 @@
-uni-view[data-v-7c903111],uni-scroll-view[data-v-7c903111],uni-swiper-item[data-v-7c903111]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-7c903111]{display:flex;align-items:center}.u-icon--left[data-v-7c903111]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-7c903111]{flex-direction:row;align-items:center}.u-icon--top[data-v-7c903111]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-7c903111]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-7c903111]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-7c903111]{color:#3c9cff}.u-icon__icon--success[data-v-7c903111]{color:#5ac725}.u-icon__icon--error[data-v-7c903111]{color:#f56c6c}.u-icon__icon--warning[data-v-7c903111]{color:#f9ae3d}.u-icon__icon--info[data-v-7c903111]{color:#909399}.u-icon__img[data-v-7c903111]{height:auto;will-change:transform}.u-icon__label[data-v-7c903111]{line-height:1}uni-view[data-v-c20cd503],uni-scroll-view[data-v-c20cd503],uni-swiper-item[data-v-c20cd503]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-search[data-v-c20cd503]{display:flex;flex-direction:row;align-items:center;flex:1}.u-search__content[data-v-c20cd503]{display:flex;flex-direction:row;align-items:center;padding:0 10px;flex:1;justify-content:space-between;border-width:1px;border-color:transparent;border-style:solid;overflow:hidden}.u-search__content__icon[data-v-c20cd503]{display:flex;flex-direction:row;align-items:center}.u-search__content__label[data-v-c20cd503]{color:#303133;font-size:14px;margin:0 4px}.u-search__content__close[data-v-c20cd503]{width:20px;height:20px;border-radius:100px;background-color:#c6c7cb;display:flex;flex-direction:row;align-items:center;justify-content:center;transform:scale(.82)}.u-search__content__input[data-v-c20cd503]{flex:1;font-size:14px;line-height:1;margin:0 5px;color:#303133}.u-search__content__input--placeholder[data-v-c20cd503]{color:#909193}.u-search__action[data-v-c20cd503]{font-size:14px;color:#303133;width:0;overflow:hidden;transition-property:width;transition-duration:.3s;white-space:nowrap;text-align:center}.u-search__action--active[data-v-c20cd503]{width:40px;margin-left:5px}uni-view[data-v-9bcdde6b],uni-scroll-view[data-v-9bcdde6b],uni-swiper-item[data-v-9bcdde6b]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-loading-icon[data-v-9bcdde6b]{flex-direction:row;align-items:center;justify-content:center;color:#c8c9cc}.u-loading-icon__text[data-v-9bcdde6b]{margin-left:4px;color:#606266;font-size:14px;line-height:20px}.u-loading-icon__spinner[data-v-9bcdde6b]{width:30px;height:30px;position:relative;box-sizing:border-box;max-width:100%;max-height:100%;animation:u-rotate-9bcdde6b 1s linear infinite}.u-loading-icon__spinner--semicircle[data-v-9bcdde6b]{border-width:2px;border-color:transparent;border-radius:100px;border-style:solid}.u-loading-icon__spinner--circle[data-v-9bcdde6b]{border-radius:100px;border-width:2px;border-top-color:#e5e5e5;border-right-color:#e5e5e5;border-bottom-color:#e5e5e5;border-left-color:#e5e5e5;border-style:solid}.u-loading-icon--vertical[data-v-9bcdde6b]{flex-direction:column}[data-v-9bcdde6b]:host{font-size:0px;line-height:1}.u-loading-icon__spinner--spinner[data-v-9bcdde6b]{animation-timing-function:steps(12)}.u-loading-icon__text[data-v-9bcdde6b]:empty{display:none}.u-loading-icon--vertical .u-loading-icon__text[data-v-9bcdde6b]{margin:6px 0 0;color:#606266}.u-loading-icon__dot[data-v-9bcdde6b]{position:absolute;top:0;left:0;width:100%;height:100%}.u-loading-icon__dot[data-v-9bcdde6b]:before{display:block;width:2px;height:25%;margin:0 auto;background-color:currentColor;border-radius:40%;content:" "}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(1){transform:rotate(30deg);opacity:1}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(2){transform:rotate(60deg);opacity:.9375}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(3){transform:rotate(90deg);opacity:.875}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(4){transform:rotate(120deg);opacity:.8125}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(5){transform:rotate(150deg);opacity:.75}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(6){transform:rotate(180deg);opacity:.6875}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(7){transform:rotate(210deg);opacity:.625}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(8){transform:rotate(240deg);opacity:.5625}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(9){transform:rotate(270deg);opacity:.5}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(10){transform:rotate(300deg);opacity:.4375}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(11){transform:rotate(330deg);opacity:.375}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(12){transform:rotate(360deg);opacity:.3125}@keyframes u-rotate-9bcdde6b{0%{transform:rotate(0)}to{transform:rotate(1turn)}}uni-view[data-v-e1d8b758],uni-scroll-view[data-v-e1d8b758],uni-swiper-item[data-v-e1d8b758]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-button[data-v-e1d8b758]{width:100%}.u-button__text[data-v-e1d8b758]{white-space:nowrap;line-height:1}.u-button[data-v-e1d8b758]:before{position:absolute;top:50%;left:50%;width:100%;height:100%;border:inherit;border-radius:inherit;transform:translate(-50%,-50%);opacity:0;content:" ";background-color:#000;border-color:#000}.u-button--active[data-v-e1d8b758]:before{opacity:.15}.u-button__icon+.u-button__text[data-v-e1d8b758]:not(:empty),.u-button__loading-text[data-v-e1d8b758]{margin-left:4px}.u-button--plain.u-button--primary[data-v-e1d8b758]{color:#3c9cff}.u-button--plain.u-button--info[data-v-e1d8b758]{color:#909399}.u-button--plain.u-button--success[data-v-e1d8b758]{color:#5ac725}.u-button--plain.u-button--error[data-v-e1d8b758],.u-button--plain.u-button--warning[data-v-e1d8b758]{color:#f56c6c}.u-button[data-v-e1d8b758]{height:40px;position:relative;align-items:center;justify-content:center;display:flex;box-sizing:border-box;flex-direction:row}.u-button__text[data-v-e1d8b758]{font-size:15px}.u-button__loading-text[data-v-e1d8b758]{font-size:15px;margin-left:4px}.u-button--large[data-v-e1d8b758]{width:100%;height:50px;padding:0 15px}.u-button--normal[data-v-e1d8b758]{padding:0 12px;font-size:14px}.u-button--small[data-v-e1d8b758]{min-width:60px;height:30px;padding:0 8px;font-size:12px}.u-button--mini[data-v-e1d8b758]{height:22px;font-size:10px;min-width:50px;padding:0 8px}.u-button--disabled[data-v-e1d8b758]{opacity:.5}.u-button--info[data-v-e1d8b758]{color:#323233;background-color:#fff;border-color:#ebedf0;border-width:1px;border-style:solid}.u-button--success[data-v-e1d8b758]{color:#fff;background-color:#5ac725;border-color:#5ac725;border-width:1px;border-style:solid}.u-button--primary[data-v-e1d8b758]{color:#fff;background-color:#3c9cff;border-color:#3c9cff;border-width:1px;border-style:solid}.u-button--error[data-v-e1d8b758]{color:#fff;background-color:#f56c6c;border-color:#f56c6c;border-width:1px;border-style:solid}.u-button--warning[data-v-e1d8b758]{color:#fff;background-color:#f9ae3d;border-color:#f9ae3d;border-width:1px;border-style:solid}.u-button--block[data-v-e1d8b758]{display:flex;flex-direction:row;width:100%}.u-button--circle[data-v-e1d8b758]{border-radius:100px}.u-button--square[data-v-e1d8b758]{border-radius:3px}.u-button__icon[data-v-e1d8b758]{min-width:1em;line-height:inherit!important;vertical-align:top}.u-button--plain[data-v-e1d8b758]{background-color:#fff}.u-button--hairline[data-v-e1d8b758]{border-width:.5px!important}body{background-color:#eaf2ef}.content{position:relative;padding-top:5.625rem}.content .land{width:3.125rem;height:3.125rem;line-height:3.125rem;text-align:center;background-color:#fff;border-radius:50%;position:absolute;right:1.875rem;bottom:4.0625rem;position:fixed}.content .serch{width:100%;height:3.125rem;background-color:#eaf2ef;position:absolute;position:fixed;display:flex;top:0;padding-top:2.1875rem;padding-right:.625rem;z-index:8888!important}.content .serch .custom-style{color:#606266;width:3.75rem;border-radius:.9375rem;margin-top:.3125rem;margin-right:.625rem}.content .border-bgc{height:6.25rem;background-color:#34d190;border-radius:0 0 1.25rem 1.25rem;position:absolute;width:23.4375rem}.content .coneng-detail{width:14.9375rem;height:10.65625rem;background:#FFFFFF;border-radius:6px;opacity:1;font-size:.78125rem;font-family:PingFang SC,PingFang SC;font-weight:400;color:#737373;display:flex;justify-content:center;align-items:center;text-align:center;margin:2.1875rem auto}.content .coneng-detail uni-image{width:8.75rem;height:4.4375rem;margin-bottom:.625rem}.content .card{position:relative;width:21.68531rem;margin:auto;background-color:#fff;box-sizing:border-box;border-radius:.65719rem;margin-bottom:1.25rem}.content .card .tit{display:flex;font-size:1.04031rem;font-weight:700;justify-content:space-between}
+uni-view[data-v-7c903111],uni-scroll-view[data-v-7c903111],uni-swiper-item[data-v-7c903111]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}@font-face{font-family:uicon-iconfont;src:url(https://at.alicdn.com/t/font_2225171_8kdcwk4po24.ttf) format("truetype")}.u-icon[data-v-7c903111]{display:flex;align-items:center}.u-icon--left[data-v-7c903111]{flex-direction:row-reverse;align-items:center}.u-icon--right[data-v-7c903111]{flex-direction:row;align-items:center}.u-icon--top[data-v-7c903111]{flex-direction:column-reverse;justify-content:center}.u-icon--bottom[data-v-7c903111]{flex-direction:column;justify-content:center}.u-icon__icon[data-v-7c903111]{font-family:uicon-iconfont;position:relative;display:flex;flex-direction:row;align-items:center}.u-icon__icon--primary[data-v-7c903111]{color:#3c9cff}.u-icon__icon--success[data-v-7c903111]{color:#5ac725}.u-icon__icon--error[data-v-7c903111]{color:#f56c6c}.u-icon__icon--warning[data-v-7c903111]{color:#f9ae3d}.u-icon__icon--info[data-v-7c903111]{color:#909399}.u-icon__img[data-v-7c903111]{height:auto;will-change:transform}.u-icon__label[data-v-7c903111]{line-height:1}uni-view[data-v-c20cd503],uni-scroll-view[data-v-c20cd503],uni-swiper-item[data-v-c20cd503]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-search[data-v-c20cd503]{display:flex;flex-direction:row;align-items:center;flex:1}.u-search__content[data-v-c20cd503]{display:flex;flex-direction:row;align-items:center;padding:0 10px;flex:1;justify-content:space-between;border-width:1px;border-color:transparent;border-style:solid;overflow:hidden}.u-search__content__icon[data-v-c20cd503]{display:flex;flex-direction:row;align-items:center}.u-search__content__label[data-v-c20cd503]{color:#303133;font-size:14px;margin:0 4px}.u-search__content__close[data-v-c20cd503]{width:20px;height:20px;border-radius:100px;background-color:#c6c7cb;display:flex;flex-direction:row;align-items:center;justify-content:center;transform:scale(.82)}.u-search__content__input[data-v-c20cd503]{flex:1;font-size:14px;line-height:1;margin:0 5px;color:#303133}.u-search__content__input--placeholder[data-v-c20cd503]{color:#909193}.u-search__action[data-v-c20cd503]{font-size:14px;color:#303133;width:0;overflow:hidden;transition-property:width;transition-duration:.3s;white-space:nowrap;text-align:center}.u-search__action--active[data-v-c20cd503]{width:40px;margin-left:5px}uni-view[data-v-9bcdde6b],uni-scroll-view[data-v-9bcdde6b],uni-swiper-item[data-v-9bcdde6b]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-loading-icon[data-v-9bcdde6b]{flex-direction:row;align-items:center;justify-content:center;color:#c8c9cc}.u-loading-icon__text[data-v-9bcdde6b]{margin-left:4px;color:#606266;font-size:14px;line-height:20px}.u-loading-icon__spinner[data-v-9bcdde6b]{width:30px;height:30px;position:relative;box-sizing:border-box;max-width:100%;max-height:100%;animation:u-rotate-9bcdde6b 1s linear infinite}.u-loading-icon__spinner--semicircle[data-v-9bcdde6b]{border-width:2px;border-color:transparent;border-radius:100px;border-style:solid}.u-loading-icon__spinner--circle[data-v-9bcdde6b]{border-radius:100px;border-width:2px;border-top-color:#e5e5e5;border-right-color:#e5e5e5;border-bottom-color:#e5e5e5;border-left-color:#e5e5e5;border-style:solid}.u-loading-icon--vertical[data-v-9bcdde6b]{flex-direction:column}[data-v-9bcdde6b]:host{font-size:0px;line-height:1}.u-loading-icon__spinner--spinner[data-v-9bcdde6b]{animation-timing-function:steps(12)}.u-loading-icon__text[data-v-9bcdde6b]:empty{display:none}.u-loading-icon--vertical .u-loading-icon__text[data-v-9bcdde6b]{margin:6px 0 0;color:#606266}.u-loading-icon__dot[data-v-9bcdde6b]{position:absolute;top:0;left:0;width:100%;height:100%}.u-loading-icon__dot[data-v-9bcdde6b]:before{display:block;width:2px;height:25%;margin:0 auto;background-color:currentColor;border-radius:40%;content:" "}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(1){transform:rotate(30deg);opacity:1}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(2){transform:rotate(60deg);opacity:.9375}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(3){transform:rotate(90deg);opacity:.875}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(4){transform:rotate(120deg);opacity:.8125}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(5){transform:rotate(150deg);opacity:.75}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(6){transform:rotate(180deg);opacity:.6875}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(7){transform:rotate(210deg);opacity:.625}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(8){transform:rotate(240deg);opacity:.5625}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(9){transform:rotate(270deg);opacity:.5}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(10){transform:rotate(300deg);opacity:.4375}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(11){transform:rotate(330deg);opacity:.375}.u-loading-icon__dot[data-v-9bcdde6b]:nth-of-type(12){transform:rotate(360deg);opacity:.3125}@keyframes u-rotate-9bcdde6b{0%{transform:rotate(0)}to{transform:rotate(1turn)}}uni-view[data-v-e1d8b758],uni-scroll-view[data-v-e1d8b758],uni-swiper-item[data-v-e1d8b758]{display:flex;flex-direction:column;flex-shrink:0;flex-grow:0;flex-basis:auto;align-items:stretch;align-content:flex-start}.u-button[data-v-e1d8b758]{width:100%}.u-button__text[data-v-e1d8b758]{white-space:nowrap;line-height:1}.u-button[data-v-e1d8b758]:before{position:absolute;top:50%;left:50%;width:100%;height:100%;border:inherit;border-radius:inherit;transform:translate(-50%,-50%);opacity:0;content:" ";background-color:#000;border-color:#000}.u-button--active[data-v-e1d8b758]:before{opacity:.15}.u-button__icon+.u-button__text[data-v-e1d8b758]:not(:empty),.u-button__loading-text[data-v-e1d8b758]{margin-left:4px}.u-button--plain.u-button--primary[data-v-e1d8b758]{color:#3c9cff}.u-button--plain.u-button--info[data-v-e1d8b758]{color:#909399}.u-button--plain.u-button--success[data-v-e1d8b758]{color:#5ac725}.u-button--plain.u-button--error[data-v-e1d8b758],.u-button--plain.u-button--warning[data-v-e1d8b758]{color:#f56c6c}.u-button[data-v-e1d8b758]{height:40px;position:relative;align-items:center;justify-content:center;display:flex;box-sizing:border-box;flex-direction:row}.u-button__text[data-v-e1d8b758]{font-size:15px}.u-button__loading-text[data-v-e1d8b758]{font-size:15px;margin-left:4px}.u-button--large[data-v-e1d8b758]{width:100%;height:50px;padding:0 15px}.u-button--normal[data-v-e1d8b758]{padding:0 12px;font-size:14px}.u-button--small[data-v-e1d8b758]{min-width:60px;height:30px;padding:0 8px;font-size:12px}.u-button--mini[data-v-e1d8b758]{height:22px;font-size:10px;min-width:50px;padding:0 8px}.u-button--disabled[data-v-e1d8b758]{opacity:.5}.u-button--info[data-v-e1d8b758]{color:#323233;background-color:#fff;border-color:#ebedf0;border-width:1px;border-style:solid}.u-button--success[data-v-e1d8b758]{color:#fff;background-color:#5ac725;border-color:#5ac725;border-width:1px;border-style:solid}.u-button--primary[data-v-e1d8b758]{color:#fff;background-color:#3c9cff;border-color:#3c9cff;border-width:1px;border-style:solid}.u-button--error[data-v-e1d8b758]{color:#fff;background-color:#f56c6c;border-color:#f56c6c;border-width:1px;border-style:solid}.u-button--warning[data-v-e1d8b758]{color:#fff;background-color:#f9ae3d;border-color:#f9ae3d;border-width:1px;border-style:solid}.u-button--block[data-v-e1d8b758]{display:flex;flex-direction:row;width:100%}.u-button--circle[data-v-e1d8b758]{border-radius:100px}.u-button--square[data-v-e1d8b758]{border-radius:3px}.u-button__icon[data-v-e1d8b758]{min-width:1em;line-height:inherit!important;vertical-align:top}.u-button--plain[data-v-e1d8b758]{background-color:#fff}.u-button--hairline[data-v-e1d8b758]{border-width:.5px!important}.uni-transition[data-v-f427c8e9]{transition-timing-function:ease;transition-duration:.3s;transition-property:transform,opacity}.fade-in[data-v-f427c8e9]{opacity:0}.fade-active[data-v-f427c8e9]{opacity:1}.slide-top-in[data-v-f427c8e9]{transform:translateY(-100%)}.slide-top-active[data-v-f427c8e9]{transform:translateY(0)}.slide-right-in[data-v-f427c8e9]{transform:translate(100%)}.slide-right-active[data-v-f427c8e9]{transform:translate(0)}.slide-bottom-in[data-v-f427c8e9]{transform:translateY(100%)}.slide-bottom-active[data-v-f427c8e9]{transform:translateY(0)}.slide-left-in[data-v-f427c8e9]{transform:translate(-100%)}.slide-left-active[data-v-f427c8e9]{transform:translate(0);opacity:1}.zoom-in-in[data-v-f427c8e9]{transform:scale(.8)}.zoom-out-active[data-v-f427c8e9]{transform:scale(1)}.zoom-out-in[data-v-f427c8e9]{transform:scale(1.2)}.uni-popup[data-v-a8219944]{position:fixed;top:0;bottom:0;left:0;right:0;z-index:99}.uni-popup__mask[data-v-a8219944]{position:absolute;top:0;bottom:0;left:0;right:0;background-color:rgba(0,0,0,.4);opacity:0}.mask-ani[data-v-a8219944]{transition-property:opacity;transition-duration:.2s}.uni-top-mask[data-v-a8219944],.uni-bottom-mask[data-v-a8219944],.uni-center-mask[data-v-a8219944]{opacity:1}.uni-popup__wrapper[data-v-a8219944]{display:block;position:absolute}.top[data-v-a8219944]{top:0;left:0;right:0;transform:translateY(-500px)}.bottom[data-v-a8219944]{bottom:0;left:0;right:0;transform:translateY(500px)}.center[data-v-a8219944]{display:flex;flex-direction:column;bottom:0;left:0;right:0;top:0;justify-content:center;align-items:center;transform:scale(1.2);opacity:0}.uni-popup__wrapper-box[data-v-a8219944]{display:block;position:relative}.content-ani[data-v-a8219944]{transition-property:transform,opacity;transition-duration:.2s}.uni-top-content[data-v-a8219944],.uni-bottom-content[data-v-a8219944]{transform:translateY(0)}.uni-center-content[data-v-a8219944]{transform:scale(1);opacity:1}.uni-share[data-v-ed2d7766]{display:flex;flex-direction:column;background-color:#fff}.uni-share-title[data-v-ed2d7766]{line-height:1.875rem;font-size:.75rem;padding:.46875rem 0;text-align:center}.uni-share-content[data-v-ed2d7766]{display:flex;flex-direction:row;flex-wrap:wrap;justify-content:center;padding:15px}.uni-share-content-box[data-v-ed2d7766]{display:flex;flex-direction:column;align-items:center;width:6.25rem}.uni-share-content-image[data-v-ed2d7766]{display:flex;flex-direction:row;justify-content:center;align-items:center;width:1.875rem;height:1.875rem;overflow:hidden;border-radius:.3125rem}.content-image[data-v-ed2d7766]{width:1.875rem;height:1.875rem}.uni-share-content-text[data-v-ed2d7766]{font-size:.8125rem;color:#333;padding-top:5px;padding-bottom:10px}.uni-share-btn[data-v-ed2d7766]{height:2.8125rem;line-height:2.8125rem;font-size:14px;border-top-color:#f5f5f5;border-top-width:1px;border-top-style:solid;text-align:center;color:#666}.contentgb[data-v-c790fda6]{display:flex;justify-content:space-between}.contentgb .name[data-v-c790fda6]{font-size:1.09375rem;font-family:Source Han Sans CN-Medium,Source Han Sans CN;font-weight:500;color:#fff;margin-top:.15625rem}.contentgb .return_top[data-v-c790fda6]{width:5.1875rem;height:1.75rem;background:rgba(255,255,255,.6);border-radius:1.375rem;margin-right:.9375rem;position:relative}.contentgb .return_top .z-bootm-img1[data-v-c790fda6]{width:1.28125rem;height:.40625rem;position:absolute;top:.15625rem;left:.78125rem}.contentgb .return_top .z-bootm-img1 uni-image[data-v-c790fda6]{width:100%;height:100%}.contentgb .return_top .z-bootm-l[data-v-c790fda6]{width:1px;height:1rem;background:rgba(0,0,0,.2);margin:auto 0;position:absolute;top:.3125rem;left:2.65625rem}.contentgb .return_top .z-bootm-img2[data-v-c790fda6]{width:1.1875rem;height:1.0625rem;margin-top:-.46875rem;margin-left:-.46875rem;position:absolute;right:.78125rem;top:.78125rem}.contentgb .return_top .z-bootm-img2 uni-image[data-v-c790fda6]{width:100%;height:100%}body{background-color:#eaf2ef}.content{position:relative;padding-top:5.625rem}.content .head-img{position:absolute;display:flex;top:0;right:.3125rem;margin-top:.625rem}.content .land{width:3.125rem;height:3.125rem;line-height:3.125rem;text-align:center;background-color:#fff;border-radius:50%;position:absolute;right:1.875rem;bottom:4.0625rem;position:fixed}.content .serch{width:100%;height:3.125rem;background-color:#eaf2ef;position:absolute;position:fixed;display:flex;top:0;padding-top:calc(2.1875rem + var(--status-bar-height) + .625rem);padding-right:.625rem;z-index:8888!important}.content .serch .custom-style{color:#606266;width:4.375rem;border-radius:.9375rem;margin-top:.3125rem;margin-right:.625rem}.content .border-bgc{height:6.25rem;background-color:#34d190;border-radius:0 0 1.25rem 1.25rem;position:absolute;width:23.4375rem}.content .coneng-detail{width:14.9375rem;height:10.65625rem;background:#FFFFFF;border-radius:6px;opacity:1;font-size:.78125rem;font-family:PingFang SC,PingFang SC;font-weight:400;color:#737373;display:flex;justify-content:center;align-items:center;text-align:center;margin:9.375rem auto}.content .coneng-detail uni-image{width:8.75rem;height:4.4375rem;margin-bottom:.625rem}.content .card{position:relative;width:21.68531rem;margin:auto;background-color:#fff;box-sizing:border-box;border-radius:.65719rem;margin-bottom:1.25rem}.content .card .tit{display:flex;font-size:1.04031rem;font-weight:700;justify-content:space-between}
diff --git a/utils/syhttp.js b/utils/syhttp.js
index 401e279..3d7ef6f 100644
--- a/utils/syhttp.js
+++ b/utils/syhttp.js
@@ -10,14 +10,9 @@ function baseRequest(url, method, data, {
 	onReLogin = false
 }) {
 	let Url = config.HTTP_REQUEST_URL,
-	
 		header = config.HEADER;
-		if(store.state.userInfo){
-			header.TOKEN = store.state.userInfo.token
-		}else{
-		uni.redirectTo({
-			url:'/pages/Login/login'
-		})
+	if (store.state.userInfo) {
+		header.TOKEN = store.state.userInfo.token
 	}
 
 	return new Promise((reslove, reject) => {
@@ -53,7 +48,7 @@ function baseRequest(url, method, data, {
 							icon: 'none',
 						})
 					}
-				  reslove(res.data);
+					reslove(res.data);
 				} else if (res.data.code == 1) {
 					// store.commit("SET_REQUEST");
 					reslove(res.data);