From b30ab32f44186d51ec296b38dde1b306ecb57c97 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 27 Nov 2023 18:23:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/file.js                            |  17 +-
 api/upload.js                          |   7 +-
 components/plant/landInfo.vue          |  25 +-
 config/app.js                          |   5 +-
 main.js                                |  17 +-
 node_modules/.vite/deps/_metadata.json |   6 +-
 pages.json                             |  39 +--
 pages/Login/login.vue                  |  31 ++-
 pages/addLand/addLand.vue              |  19 +-
 pages/husbandryForm/Pest.vue           |  12 +-
 pages/husbandryForm/fertilize.vue      |  45 +++-
 pages/husbandryForm/harvest.vue        |  31 ++-
 pages/husbandryForm/irrigate.vue       |  80 +++---
 pages/husbandryForm/sow.vue            |  18 +-
 pages/husbandryForm/weeding.vue        |  29 ++-
 pages/index/index.vue                  |  50 +++-
 pages/index/massif.vue                 | 347 ++++++++++++++++++-------
 pages/index/personal.vue               |  67 +++--
 pages/landDetail/index.vue             | 160 ++++++++----
 pages/landDetail/tudi.vue              | 151 ++++++++---
 static/img/ADL.png                     | Bin 0 -> 3888 bytes
 static/img/AHL.png                     | Bin 0 -> 3888 bytes
 static/img/AQHL.png                    | Bin 0 -> 2364 bytes
 static/img/CKGD.png                    | Bin 0 -> 1294 bytes
 static/img/CO2.png                     | Bin 0 -> 2534 bytes
 static/img/CTPH.png                    | Bin 0 -> 1990 bytes
 static/img/CTWD.png                    | Bin 0 -> 1873 bytes
 static/img/DJSC.png                    | Bin 0 -> 1792 bytes
 static/img/zw.png                      | Bin 0 -> 5720 bytes
 static/tabber/a.png                    | Bin 957 -> 1016 bytes
 static/tabber/b-b.png                  | Bin 1712 -> 695 bytes
 static/tabber/b.png                    | Bin 1696 -> 1095 bytes
 static/tabber/c-a.png                  | Bin 1712 -> 999 bytes
 static/tabber/c.png                    | Bin 1696 -> 1482 bytes
 store/index.js                         |  25 ++
 store/userInfo.js                      |  15 --
 utils/http.js                          |  17 +-
 utils/syhttp.js                        |   7 +-
 38 files changed, 847 insertions(+), 373 deletions(-)
 create mode 100644 static/img/ADL.png
 create mode 100644 static/img/AHL.png
 create mode 100644 static/img/AQHL.png
 create mode 100644 static/img/CKGD.png
 create mode 100644 static/img/CO2.png
 create mode 100644 static/img/CTPH.png
 create mode 100644 static/img/CTWD.png
 create mode 100644 static/img/DJSC.png
 create mode 100644 static/img/zw.png
 create mode 100644 store/index.js
 delete mode 100644 store/userInfo.js

diff --git a/api/file.js b/api/file.js
index e527b01..01e33ea 100644
--- a/api/file.js
+++ b/api/file.js
@@ -24,22 +24,25 @@ export const addland = (data) => syhttp.post('/land/add', data)
 export const plantlist = (data) => syhttp.get('/plant/list', data)
 //新增种植
 export const addplant = (data) => syhttp.post('/plant/add', data)
+
+//种植详情
+export const plantdetail = (data) => syhttp.get('/plant/detail', data)
+
 //操作列表
 export const actionlist = (data) => syhttp.get('/action/list', data)
 //添加操作
 export const addaction = (data) => syhttp.post('/action/add', data)
+
 //添加操作
-export const binddevice = (data) => syhttp.post('/device/bind', data)
+export const binddevice = (data) => syhttp.post('/land/bind', data)
 
 //首页
 export const lindexist = (data) => syhttp.get('/index/index', data)
+//产品列表
+export const landproduct = (data) => syhttp.get('/land/product', data)
 
-
-
-
-
-
-
+//绑定产品
+export const bindproduct = (data) => syhttp.post('/land/bind', data)
 
 
 
diff --git a/api/upload.js b/api/upload.js
index 41e9505..bbea5a2 100644
--- a/api/upload.js
+++ b/api/upload.js
@@ -2,11 +2,12 @@
 // let baseUrl = 'https://ceshi.excellentkk.cn/api';
 // import store from '../store';
 import { config } from '@/config/app';
+import store from "@/store/index.js"
 let header = {};
-console.log(config)
 
-if (uni.getStorageSync('SY_TOKEN')){
-		 header.token = uni.getStorageSync('SY_TOKEN');
+
+if (store.state.userInfo){
+		 header.token = store.state.userInfo.token;
 }
 
 function uploads(src, type) {
diff --git a/components/plant/landInfo.vue b/components/plant/landInfo.vue
index 937c46d..6ca7c33 100644
--- a/components/plant/landInfo.vue
+++ b/components/plant/landInfo.vue
@@ -5,17 +5,25 @@
 				{{info.title}}
 				号土地
 			</view>
-			<view class="">
-				溯源码: {{}}
-			</view>
+			<!-- <view class="" style="display:flex;">
+				<view class="" style="margin-right: 10rpx;">溯源码: </view>
+				
+				<u--image @click="perviewFn('http://ceshi-suyuan.lihaink.cn/uploads/images/20231127/2023112716443447deb3539.png')" radius='10' src="http://ceshi-suyuan.lihaink.cn/uploads/images/20231127/2023112716443447deb3539.png" width="30rpx"
+					height="30rpx" style="margin-top: 10rpx;"></u--image>
+			</view> -->
 		</view>
 		<view class="card-li">
 			<view class="">
-				当前种植: {{info.residual_area}}亩
+				当前种植: {{info.total_area-info.residual_area}}亩
 			</view>
 			<!-- <view class="">
-				种植品牌: {{}}
+				种植品牌: {{info.kind}}
 			</view> -->
+		</view><view class="card-li">
+		
+			<view class="">
+				种植品种: {{info.kind}}
+			</view>
 		</view>
 		<view class="card-li">
 			<view class="">
@@ -55,6 +63,13 @@
 		info: Object,
 
 	})
+	
+	const perviewFn = (url) => {
+		console.log(url)
+		uni.previewImage({
+			urls: [url]
+		})
+	}
 </script>
 
 <style lang="scss" scoped>
diff --git a/config/app.js b/config/app.js
index 895607a..8ed6018 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,9 +1,10 @@
 let BASE_URL
-
+import store from "@/store/index.js"
 // 环境
 let env = "dev"
 // let env = "prod"
 
+
 let HTTP_REQUEST_URL
 let HEADER
 if (env == 'dev') {
@@ -21,7 +22,7 @@ let config = {
 		//#ifdef APP-PLUS
 		'Form-type': 'app',
 		//#endif
-		'TOKEN': uni.getStorageSync("SY_TOKEN") || ''
+		'TOKEN': ''
 
 	}
 }
diff --git a/main.js b/main.js
index d6356c5..20ebbcd 100644
--- a/main.js
+++ b/main.js
@@ -1,15 +1,14 @@
 import App from './App'
 import uviewPlus from 'uview-plus'
-import {
-	createPinia
-} from 'pinia'
+import store from './store'
 // #ifndef VUE3
 import Vue from 'vue'
 import './uni.promisify.adaptor'
 Vue.config.productionTip = false
 App.mpType = 'app'
 const app = new Vue({
-	...App
+	...App,
+	 store
 })
 app.$mount()
 // #endif
@@ -18,14 +17,16 @@ app.$mount()
 import {
 	createSSRApp
 } from 'vue'
+
+
 export function createApp() {
 	const app = createSSRApp(App)
-	const pinia = createPinia()
-	app.use(pinia)
+	
 	app.use(uviewPlus)
+	app.use(store)
 	return {
-		app,
-		pinia
+		app
+		
 	}
 }
 // #endif
\ No newline at end of file
diff --git a/node_modules/.vite/deps/_metadata.json b/node_modules/.vite/deps/_metadata.json
index 0c6685c..d6e321d 100644
--- a/node_modules/.vite/deps/_metadata.json
+++ b/node_modules/.vite/deps/_metadata.json
@@ -1,11 +1,11 @@
 {
-  "hash": "ecd04c7b",
-  "browserHash": "62a01527",
+  "hash": "ff711c6a",
+  "browserHash": "fa669d50",
   "optimized": {
     "uview-plus": {
       "src": "../../uview-plus/index.js",
       "file": "uview-plus.js",
-      "fileHash": "87057957",
+      "fileHash": "31730495",
       "needsInterop": false
     }
   },
diff --git a/pages.json b/pages.json
index 964e453..6fbc502 100644
--- a/pages.json
+++ b/pages.json
@@ -9,6 +9,16 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/index/massif",
+			
+			"style": {
+				"navigationBarTitleText": "地块",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#F4F4F4",
+				"navigationBarTextStyle": "black"
+			}
+		},{
 			"path": "pages/index/index",
 			"style": {
 				"navigationStyle": "custom",
@@ -115,16 +125,7 @@
 				"navigationBarTextStyle": "black"
 			}
 		},
-		{
-			"path": "pages/index/massif",
-			"style": {
-				"navigationBarTitleText": "地块",
-				"navigationStyle": "custom",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#F4F4F4",
-				"navigationBarTextStyle": "black"
-			}
-		},
+		
 		{
 			"path": "pages/index/personal",
 			"style": {
@@ -154,28 +155,28 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"color": "#B3B3B3",
-		"selectedColor": "#272822",
+		"color": "#272822",
+		"selectedColor": "#34D190",
 		"borderStyle": "white",
 		"backgroundColor": "#EBF1EF",
 		"list": [{
 				"pagePath": "pages/index/massif",
 				"text": "首页",
-				"iconPath": "static/tabber/a.png",
-				"selectedIconPath": "static/tabber/a-a.png"
+				"iconPath": "static/tabber/a-a.png",
+				"selectedIconPath": "static/tabber/a.png"
 			},
 			{
 				"pagePath": "pages/index/index",
 				"text": "地块",
-				"iconPath": "static/tabber/b.png",
-
-				"selectedIconPath": "static/tabber/b-b.png"
+				"iconPath": "static/tabber/b-b.png",
+				"selectedIconPath": "static/tabber/b.png"
 			},
+			
 			{
 				"pagePath": "pages/index/personal",
 				"text": "我的",
-				"iconPath": "static/tabber/c.png",
-				"selectedIconPath": "static/tabber/c-c.png"
+				"iconPath": "static/tabber/c-a.png",
+				"selectedIconPath": "static/tabber/c.png"
 			}
 
 		]
diff --git a/pages/Login/login.vue b/pages/Login/login.vue
index ffebd62..baaf438 100644
--- a/pages/Login/login.vue
+++ b/pages/Login/login.vue
@@ -52,15 +52,16 @@
 
 		xinregister
 	} from '@/api/file.js';
+	import {
+		useStore
+	} from 'vuex'
 	import {
 		onMounted,
 		reactive,
 		ref
 	} from 'vue';
 
-	import {
-		userInfoStore
-	} from '@/store/userInfo'
+	const store = useStore()
 
 	const num = ref(0)
 	const isshow = ref(false)
@@ -85,6 +86,7 @@
 			},
 		]
 	})
+
 	//判断安卓 ios
 	const checkUserAgent = () => {
 		uni.getSystemInfo({
@@ -134,6 +136,7 @@
 
 	const submitFn = () => {
 
+
 		if (!formData.account) return uni.$u.toast('账号不能为空');
 		if (!formData.password && formData.scene == 1) return uni.$u.toast('密码不能为空');
 		if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(formData.account)) return uni.$u.toast(
@@ -144,15 +147,15 @@
 		login(formData).then((res) => {
 
 			if (res.code == 1) {
-				uni.setStorageSync("SY_TOKEN", res.data.token)
-				uni.setStorageSync("SY_USER", res.data)
-				const userInfo = userInfoStore()
-				userInfo.saveUserInfo(res.data)
-				uni.$u.toast(res.msg);
 
-				uni.reLaunch({
-					url: '/pages/index/massif'
-				})
+				store.commit('saveUserInfo', res.data)
+				setTimeout(() => {
+					uni.reLaunch({
+						url: '/pages/index/massif'
+					})
+					uni.$u.toast('登录成功');
+				}, 500)
+
 			}
 
 		})
@@ -166,8 +169,6 @@
 	}
 	const aclick = (i) => {
 		num.value = i
-
-		console.log(i)
 		if (i == 1) {
 			formData.scene = 1
 			formData.password = ''
@@ -179,7 +180,10 @@
 
 	onMounted(() => {
 		checkUserAgent()
+
+
 		formData.scene = 2
+
 	})
 </script>
 
@@ -249,6 +253,7 @@
 				font-size: 20rpx;
 				padding: 0rpx 20rpx;
 				color: #fff;
+				margin-top: 10rpx;
 
 			}
 
diff --git a/pages/addLand/addLand.vue b/pages/addLand/addLand.vue
index 89dd2b2..ffbf1b9 100644
--- a/pages/addLand/addLand.vue
+++ b/pages/addLand/addLand.vue
@@ -51,7 +51,11 @@
 						<view class="" v-if="pic.length>0"
 							style="display: flex;flex-direction: row;flex-wrap: wrap;margin-bottom: 30rpx;">
 							<view class="" v-for="(item,i) in pic" style="margin-right: 30rpx;">
-								<u-image :src="item" width="150.85rpx" height="150.85rpx"></u-image>
+								<view class="">
+									<u-icon name="close" size="15" style="margin-left:120.85rpx;"
+										@click="delimg(i)"></u-icon>
+									<u-image :src="item" width="150.85rpx" height="150.85rpx"></u-image>
+								</view>
 							</view>
 						</view>
 
@@ -254,7 +258,7 @@
 	}
 
 	const cityn = (id) => {
-		console.log(id)
+		
 		city({
 			province_code: id
 		}).then((res) => {
@@ -283,7 +287,10 @@
 		});
 	}
 
-
+	//图片删除
+	const delimg = (i) => {
+		pic.splice(i, 1);
+	}
 
 	const townsn = (id) => {
 		towns({
@@ -383,7 +390,7 @@
 	}
 
 	const leavaType1 = (e) => {
-		console.log('Received value:', e)
+	
 		province_name.value = e.name
 		data.formData.province_code = e.id
 		cityn(e.id)
@@ -411,7 +418,7 @@
 
 	}
 	const leavaType6 = (e) => {
-		console.log(e)
+	
 		group_name.value = e.name
 		data.formData.group_code = e.id.toString()
 
@@ -439,7 +446,7 @@
 					uni.$u.toast('请上传图片')
 					return
 				}
-
+				
 				// 表单验证通过，执行提交操作
 				addland(data.formData).then((res) => {
 					console.log(res)
diff --git a/pages/husbandryForm/Pest.vue b/pages/husbandryForm/Pest.vue
index 069b501..1e396ab 100644
--- a/pages/husbandryForm/Pest.vue
+++ b/pages/husbandryForm/Pest.vue
@@ -52,7 +52,11 @@
 						<view class="" v-if="pic.length>0"
 							style="display: flex;flex-direction: row;flex-wrap: wrap;margin-bottom: 30rpx;">
 							<view class="" v-for="(item,i) in pic" style="margin-right: 30rpx;">
-								<u-image :src="item" width="150.85rpx" height="150.85rpx"></u-image>
+								<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"></u-image>
+								</view>
 							</view>
 						</view>
 
@@ -145,7 +149,7 @@
 		'kind': {
 			type: 'string',
 			required: true,
-			message: '请填写杀虫剂种类',
+			message: '请填写杀虫剂品牌',
 			trigger: ['blur', 'change']
 		},
 		'breed': {
@@ -195,6 +199,10 @@
 		form.value.setRules(rules);
 
 	});
+	//图片删除
+	const delimg = (i) => {
+		pic.splice(i, 1);
+	}
 	//图片上传
 	const updateImgFn = async () => {
 
diff --git a/pages/husbandryForm/fertilize.vue b/pages/husbandryForm/fertilize.vue
index 227a1b5..5c9ac6b 100644
--- a/pages/husbandryForm/fertilize.vue
+++ b/pages/husbandryForm/fertilize.vue
@@ -3,8 +3,8 @@
 	<view class="content">
 		<view class="card">
 			<u--form labelPosition="top" labelWidth='100' :model="formData" :rules="rules" ref="form">
-				<u-form-item label="肥料种类" prop="kind" borderBottom ref='item1' required>
-					<up-input placeholder="请输入肥料种类" :disabled="mode=='detail'" border="surround"
+				<u-form-item label="肥料品牌" prop="kind" borderBottom ref='item1' required>
+					<up-input placeholder="请输入肥料品牌" :disabled="mode=='detail'" border="surround"
 						v-model="formData.kind"></up-input>
 				</u-form-item>
 				<u-form-item label="肥料品牌" prop="breed" borderBottom required>
@@ -51,9 +51,14 @@
 					<view class="code-img1">
 						<view class="" v-if="pic.length>0"
 							style="display: flex;flex-direction: row;flex-wrap: wrap;margin-bottom: 30rpx;">
-						
+
 							<view class="" v-for="(item,i) in pic" style="margin-right: 30rpx;">
-								<u-image :src="item" width="150.85rpx" height="150.85rpx"></u-image>
+
+								<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"></u-image>
+								</view>
 							</view>
 						</view>
 
@@ -86,7 +91,7 @@
 		<view class="confirm" v-if="mode=='add'">
 			<view class="confirm-btn" style="color: white;background-color: #0AA565;" @click="addFn">
 				完成添加
-			</view>dateConfirmfn1
+			</view>
 
 		</view>
 
@@ -135,11 +140,11 @@
 
 
 	const dateConfirmfn = (e) => {
-	
+
 		formData.start_date = e.fulldate
 	}
 	const dateConfirmfn1 = (e) => {
-	
+
 		formData.end_date = e.fulldate
 	}
 	const rules = ref({
@@ -207,9 +212,9 @@
 				Uploads(res.tempFilePaths[0], 'img').then(res => {
 					console.log(res)
 					if (res.code == 1) {
-						
+
 						pic.push(res.data.url)
-						
+
 						console.log(pic)
 						uni.$u.toast('上传成功')
 
@@ -248,7 +253,7 @@
 
 
 				formData.pic = pic
-				
+
 				let data1 = {
 					plant_id: task_id.value,
 					type: 1,
@@ -259,6 +264,17 @@
 					uni.$u.toast('请上传图片')
 					return
 				}
+				let endTime = new Date(formData.end_date)
+				let startTime = new Date(formData.start_date)
+				if (endTime < startTime) {
+					uni.$u.toast("结束时间不能小于开始时间");
+					return
+				} else if (startTime > endTime) {
+					uni.$u.toast("开始时间不能大于结束时间");
+					return
+				} else {
+					console.log("开始时间和结束时间合法");
+				}
 
 				console.log('表单通过');
 
@@ -280,12 +296,15 @@
 
 
 	}
-
+	//图片删除
+	const delimg = (i) => {
+		pic.splice(i, 1);
+	}
 
 	const mode = ref('add')
-	
+
 	onLoad((options) => {
-		
+
 		if (options.task) {
 			let data = options.task ? JSON.parse(decodeURIComponent(options.task)) : null;
 			console.log(data, data.detail)
diff --git a/pages/husbandryForm/harvest.vue b/pages/husbandryForm/harvest.vue
index 8114552..74f99bd 100644
--- a/pages/husbandryForm/harvest.vue
+++ b/pages/husbandryForm/harvest.vue
@@ -13,7 +13,7 @@
 						v-model="formData.breed"></up-input>
 				</u-form-item> -->
 				<u-form-item label="参与人" prop="user" borderBottom required>
-					<up-input placeholder="请输入参与人" :disabled="mode=='detail'" type="txt"  border="surround"
+					<up-input placeholder="请输入参与人" :disabled="mode=='detail'" type="txt" border="surround"
 						v-model="formData.user"></up-input>
 				</u-form-item>
 				<view class="card-li">
@@ -24,7 +24,11 @@
 						<view class="" v-if="pic.length>0"
 							style="display: flex;flex-direction: row;flex-wrap: wrap;margin-bottom: 30rpx;">
 							<view class="" v-for="(item,i) in pic" style="margin-right: 30rpx;">
-								<u-image :src="item" width="150.85rpx" height="150.85rpx"></u-image>
+								<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"></u-image>
+								</view>
 							</view>
 						</view>
 
@@ -81,6 +85,7 @@
 	} from '@/api/file.js'
 
 	const form = ref(null)
+	const task_id = ref('');
 	const pic = reactive([]);
 	const formData = reactive({
 		user: "",
@@ -152,6 +157,10 @@
 		})
 
 
+	}
+	//图片删除
+	const delimg = (i) => {
+		pic.splice(i, 1);
 	}
 	//图片上传
 	const updateImgFn = async () => {
@@ -189,9 +198,23 @@
 	}
 	const mode = ref('add')
 	onLoad((options) => {
-		if (options.task_id) {
-			mode.value = "detail"
+		if (options.task) {
+			let data = options.task ? JSON.parse(decodeURIComponent(options.task)) : null;
+			console.log(data, data.detail)
+			Object.assign(formData, data.detail);
+			pic.splice(0, pic.length, data.detail.pic);
+		
+			mode.value = 'detail'
+			uni.setNavigationBarTitle({
+				title: '除草详情'
+			})
+			// formData=data.detail
+		
+		
+		} else {
+			task_id.value = options.id
 		}
+		
 
 	})
 </script>
diff --git a/pages/husbandryForm/irrigate.vue b/pages/husbandryForm/irrigate.vue
index 1a39498..09c7649 100644
--- a/pages/husbandryForm/irrigate.vue
+++ b/pages/husbandryForm/irrigate.vue
@@ -3,11 +3,11 @@
 	<view class="content">
 		<view class="card">
 			<u--form labelPosition="top" labelWidth='100' :model="formData" :rules="rules" ref="form">
-				<u-form-item label="灌溉方式" prop="type" borderBottom required 	@click="showggai">
-				<!-- 	<uni-data-select v-model="formData.type" :disabled="mode=='detail'"
+				<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="请选择灌溉方式" :disabled="true" border="surround"
-							v-model="formDatatype"></up-input>
+					<up-input placeholder="请选择灌溉方式" :disabled="true" border="surround"
+						v-model="formDatatype"></up-input>
 				</u-form-item>
 
 				<view class="" v-if="mode=='add'">
@@ -46,7 +46,11 @@
 						<view class="" v-if="pic.length>0"
 							style="display: flex;flex-direction: row;flex-wrap: wrap;margin-bottom: 30rpx;">
 							<view class="" v-for="(item,i) in pic" style="margin-right: 30rpx;">
-								<u-image :src="item" width="150.85rpx" height="150.85rpx"></u-image>
+								<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"></u-image>
+								</view>
 							</view>
 						</view>
 
@@ -67,21 +71,15 @@
 				<u-form-item label="备注" prop="remark" borderBottom required>
 					<u--textarea v-model="formData.remark" :disabled="mode=='detail'" placeholder="请输入内容"></u--textarea>
 				</u-form-item>
-			
+
 			</u--form>
 			<view>
 				<uni-calendar ref="calendar" :showMonth="true" :lunar="true" :insert="false" @confirm="dateConfirmfn" />
 				<uni-calendar ref="calendar1" :showMonth="true" :lunar="true" :insert="false"
 					@confirm="dateConfirmfn1" />
-					<u-action-sheet
-									:show="showgg"
-									:actions="range"
-									title="请选择灌溉方式"
-								
-									@close="showgg = false"
-									@select="ggSelect"
-							>
-							</u-action-sheet>
+				<u-action-sheet :show="showgg" :actions="range" title="请选择灌溉方式" @close="showgg = false"
+					@select="ggSelect">
+				</u-action-sheet>
 			</view>
 		</view>
 
@@ -109,8 +107,13 @@
 	} from "vue";
 	import {
 		onLoad,
-		onReady
+		onReady,
+
 	} from "@dcloudio/uni-app"
+
+	import {
+		addaction
+	} from '@/api/file.js'
 	const range = reactive([{
 			value: 0,
 			name: "喷灌"
@@ -124,11 +127,12 @@
 			name: "沟灌"
 		},
 	])
+	const task_id = ref('');
 	const pic = reactive([]);
 	const calendar = ref(null)
 	const calendar1 = ref(null)
 	const formDatatype = ref('')
-	const showgg= ref(false)
+	const showgg = ref(false)
 	const form = ref(null)
 	const openDate = () => {
 		calendar.value.open()
@@ -139,22 +143,22 @@
 	// console.log()
 	const formData = reactive({
 		type: "",
-		
+
 
 	})
-	
+
 	//获取灌溉参数
-	
+
 	const ggSelect = (e) => {
-		formDatatype.value=e.name
+		formDatatype.value = e.name
 		formData.type = e.value
 	}
-	
+
 	//打开灌溉弹窗
 	const showggai = () => {
-		showgg.value=true
+		showgg.value = true
 	}
-	
+
 	//获取时间
 	const dateConfirmfn = (e) => {
 		formData.start_date = e.fulldate
@@ -165,7 +169,7 @@
 	}
 	const rules = {
 		'type': {
-			type: 'string',
+			type: 'number',
 			required: true,
 			message: '请选择灌溉方式',
 			trigger: ['change']
@@ -211,10 +215,10 @@
 		})
 	}
 	const addFn = () => {
+		console.log(formData)
 		form.value.validate().then(res => {
-			console.log(res)
-			if (res) {
 
+			if (res) {
 				formData.pic = pic
 				let data1 = {
 					plant_id: task_id.value,
@@ -225,8 +229,19 @@
 					uni.$u.toast('请上传图片')
 					return
 				}
+				let endTime = new Date(formData.end_date)
+				let startTime = new Date(formData.start_date)
+				if (endTime < startTime) {
+					uni.$u.toast("结束时间不能小于开始时间");
+					return
+				} else if (startTime > endTime) {
+					uni.$u.toast("开始时间不能大于结束时间");
+					return
+				} else {
+					console.log("开始时间和结束时间合法");
+				}
+
 
-				console.log('表单通过');
 				// 表单验证通过，执行提交操作
 
 				addaction(data1).then((res) => {
@@ -244,6 +259,10 @@
 		})
 
 
+	}
+	//图片删除
+	const delimg = (i) => {
+		pic.splice(i, 1);
 	}
 	//图片上传
 	const updateImgFn = async () => {
@@ -287,15 +306,14 @@
 			console.log(data, data.detail)
 			Object.assign(formData, data.detail);
 			pic.splice(0, pic.length, data.detail.pic);
-
+			formDatatype.value = range.find(item => item.value === formData.type).name;
 			mode.value = 'detail'
 			uni.setNavigationBarTitle({
-				title: '施肥详情'
+				title: '灌溉详情'
 			})
 
 			// formData=data.detail
 
-
 		} else {
 			task_id.value = options.id
 		}
diff --git a/pages/husbandryForm/sow.vue b/pages/husbandryForm/sow.vue
index a4f86c1..359b7df 100644
--- a/pages/husbandryForm/sow.vue
+++ b/pages/husbandryForm/sow.vue
@@ -26,13 +26,17 @@
 				</u-form-item>
 				<view class="card-li">
 					<view class="card-li-tit">
-						土地图片
+						种植图片
 					</view>
 					<view class="code-img1">
 						<view class="" v-if="pic.length>0"
 							style="display: flex;flex-direction: row;flex-wrap: wrap;margin-bottom: 30rpx;">
 							<view class="" v-for="(item,i) in pic" style="margin-right: 30rpx;">
-								<u-image :src="item" width="150.85rpx" height="150.85rpx"></u-image>
+								<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"></u-image>
+								</view>
 							</view>
 						</view>
 
@@ -167,7 +171,10 @@
 
 	}
 
-
+	//图片删除
+	const delimg = (i) => {
+		pic.splice(i, 1);
+	}
 
 	const navgo = (url) => {
 		uni.navigateTo({
@@ -192,12 +199,13 @@
 				}
 				// 表单验证通过，执行提交操作
 				addplant(data.formData).then((res) => {
-					console.log(res)
+			
 					if (res.code == 1) {
-						uni.$u.toast(res.msg)
+						
 						uni.navigateBack({
 							delta:1
 						})
+						uni.$u.toast(res.msg)
 					}
 				})
 			} else {
diff --git a/pages/husbandryForm/weeding.vue b/pages/husbandryForm/weeding.vue
index 2e33244..93cccf3 100644
--- a/pages/husbandryForm/weeding.vue
+++ b/pages/husbandryForm/weeding.vue
@@ -41,7 +41,7 @@
 						v-model="formData.area"></up-input>
 				</u-form-item>
 				<u-form-item label="参与人" prop="user" borderBottom required>
-					<up-input placeholder="请输入参与人" :disabled="mode=='detail'" type="txt"  border="surround"
+					<up-input placeholder="请输入参与人" :disabled="mode=='detail'" type="txt" border="surround"
 						v-model="formData.user"></up-input>
 				</u-form-item>
 				<view class="card-li">
@@ -52,7 +52,11 @@
 						<view class="" v-if="pic.length>0"
 							style="display: flex;flex-direction: row;flex-wrap: wrap;margin-bottom: 30rpx;">
 							<view class="" v-for="(item,i) in pic" style="margin-right: 30rpx;">
-								<u-image :src="item" width="150.85rpx" height="150.85rpx"></u-image>
+								<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"></u-image>
+								</view>
 							</view>
 						</view>
 
@@ -230,11 +234,9 @@
 		// data.formData.pic = res.data.image
 	}
 
-
-	const navgo = (url) => {
-		uni.navigateTo({
-			url
-		})
+	//图片删除
+	const delimg = (i) => {
+		pic.splice(i, 1);
 	}
 
 	const addFn = () => {
@@ -256,6 +258,17 @@
 					uni.$u.toast('请上传图片')
 					return
 				}
+				let endTime = new Date(formData.end_date)
+				let startTime = new Date(formData.start_date)
+				if (endTime < startTime) {
+					uni.$u.toast("结束时间不能小于开始时间");
+					return
+				} else if (startTime > endTime) {
+					uni.$u.toast("开始时间不能大于结束时间");
+					return
+				} else {
+					console.log("开始时间和结束时间合法");
+				}
 
 				console.log('表单通过');
 
@@ -291,10 +304,8 @@
 			uni.setNavigationBarTitle({
 				title: '除草详情'
 			})
-
 			// formData=data.detail
 
-
 		} else {
 			task_id.value = options.id
 		}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index cf74793..e91bd0f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -24,6 +24,9 @@
 					<view class="">
 						种植面积:{{item.total_area-item.residual_area}}亩
 					</view>
+					<view class="">
+						土地面积:{{item.total_area}}亩
+					</view>
 				</view>
 				<view class="card-li" v-if="item.residual_area==item.total_area">
 					<view class="">
@@ -40,6 +43,16 @@
 			<!-- <view class="land" @click="navgo('/pages/addLand/addLand')">
 				土地
 			</view> -->
+			
+			<view class="coneng-detail" v-if="datalist.length==0">
+				<view class="">
+					<image src="@/static/img/zw.png" mode="aspectFit"></image>
+					<view class="">
+						暂无数据
+					</view>
+				</view>
+				
+			</view>
 		</view>
 
 
@@ -103,10 +116,10 @@
 	}
 	const getlist = () => {
 		landlist(fomData).then((res) => {
-	
+
 			if (res.code == 1) {
 				datalist.splice(0, datalist.length, ...res.data);
-				
+
 				fomData.page_no += fomData.page_no
 
 			}
@@ -116,6 +129,9 @@
 
 	const search = () => {
 		console.log('111111')
+	
+		
+		getlist()
 
 	}
 
@@ -132,12 +148,15 @@
 </script>
 
 <style lang="scss">
+	page {
+		background-color: #EAF2EF;
+	}
+
 	.content {
 
-		min-height: 100vh;
 		position: relative;
 
-		background-color: #EAF2EF;
+
 		padding-top: 180rpx;
 
 		.land {
@@ -185,7 +204,30 @@
 			width: 750rpx;
 
 		}
+.coneng-detail {
+		width: 478rpx;
+		height: 341rpx;
+		background: #FFFFFF;
+		border-radius: 6px 6px 6px 6px;
+		opacity: 1;
+		font-size: 25rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		color: #737373;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		text-align: center;
+		margin: 70rpx auto;
 
+		image {
+			width: 280rpx;
+			height: 142rpx;
+			margin-bottom: 20rpx;
+
+
+		}
+	}
 		.card {
 			position: relative;
 			width: 693.93rpx;
diff --git a/pages/index/massif.vue b/pages/index/massif.vue
index 1ed4d59..a9ceeba 100644
--- a/pages/index/massif.vue
+++ b/pages/index/massif.vue
@@ -26,7 +26,7 @@
 		<view class="content" v-if="true">
 			<!-- 土地信息 -->
 			<view class="">
-				<view class="card">
+				<view class="card" v-if="Object.keys(dataobj).length>0">
 					<view class="" @click="navgo">
 						<view class="">
 							土地名称: {{dataobj.title}}
@@ -35,16 +35,26 @@
 							农作物: 洋芋
 						</view> -->
 						<view class="">
-							面积: {{dataobj.total_area}}亩
+							土地面积: {{dataobj.total_area}}亩
 						</view>
 						<view class="">
-							面积: {{dataobj.total_area}}亩
+							种植面积: {{dataobj.total_area-dataobj.residual_area}}亩
 						</view>
 					</view>
 					<view class="changeLand" @click="show=true">
 						切换土地
 					</view>
 
+				</view>
+				<view class="card" v-else>
+					<view class="" @click="navgo">
+						<view class="">
+							暂无信息
+						</view>
+
+					</view>
+
+
 				</view>
 			</view>
 			<!-- 苗情监测 -->
@@ -61,68 +71,79 @@
 					</view>
 				</view>
 				<view class="video" @click="navto('/pages/live/live')">
-					<u--image :src="url" width="100%" height="300rpx"></u--image>
+					<!-- <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="soil-monitor">
-				<view class="head">
-					<view class="tit">
-						土壤监测数据
+			<view class="" v-if="dataobj&&dataobj.monitor&&dataobj.monitor.length>0">
+
+				<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="flushed-time">
-						<u-icon name="clock"></u-icon>
-						<text>刷新时间: {{getNowTimeFn()}} </text>
+					<view class="monitor-content">
+						<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>
-				<view class="monitor-content">
-					<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 class="soil-monitor">
+					<view class="head">
+						<view class="tit">
+							环境监测数据
 						</view>
-						<view class="num">
-							<text style="font-size: 70rpx;">{{item.num}}</text>
-							<text>{{item.unit}}</text>
+						<view class="flushed-time">
+							<u-icon name="clock"></u-icon>
+							<text>刷新时间: {{getNowTimeFn()}} </text>
+						</view>
+					</view>
+					<view class="monitor-content">
+						<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>
 			</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">
-					<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 class="coneng-detail" v-else>
+				<view class="">
+					<image src="@/static/img/zw.png" mode="aspectFit"></image>
+					<view class="">
+						暂无数据
 					</view>
 				</view>
 			</view>
-
 			<!-- 组件 -->
 
 			<u-loading-page :loading="showLoading"></u-loading-page>
@@ -145,17 +166,27 @@
 		</view>
 		<!-- 组件 -->
 
-		<view class="">
-			<u-modal title="绑定设备" :show="showModal" @confirm='bindFn' @cancel="showModal=false" :showCancelButton='true'
-				:closeOnClickOverlay="true" @close="showModal=false" :title="title">
-				<view class="slot-content">
-					<view class="" style="display: flex;align-items: center;">
-						设备编号: <up-input style="margin-left: 20rpx;" placeholder="请输入设备编号" border="surround"
-							v-model="equipmentId"></up-input>
+		<view class="Modal">
+
+			<u-popup :show="showModal" mode="center" @close="showModal=false" :round="10">
+				<view class="Modal">
+					<text> 产品编号:</text>
+					<uni-data-select v-model="equipmentId" :disabled="mode=='detail'"
+						style="width: 300rpx;margin-left: 30rpx;" :localdata="range"></uni-data-select>
+				</view>
+
+				<view class="Modal-btn">
+					<view class="Modal-btna" @click="showModal=false">
+						取消
+					</view>
+					<view class="Modal-btnb" @click="bindFn">
+						确定
 					</view>
 				</view>
-			</u-modal>
+			</u-popup>
+
 		</view>
+
 	</view>
 </template>
 
@@ -168,67 +199,82 @@
 		onLoad
 	} from "@dcloudio/uni-app"
 	import {
-		binddevice,
+		bindproduct,
 		lindexist,
-		landlist
+		landlist,
+		landproduct
 	} from '@/api/file.js'
 
+
 	const showModal = ref(false)
 
-
+	const range = reactive([{
+			value: 0,
+			text: "喷灌"
+		},
+		{
+			value: 1,
+			text: "滴灌"
+		},
+		{
+			value: 2,
+			text: "沟灌"
+		},
+	])
 	// 土壤监测数据
 	const url = ref('https://ceshi-worker-task.lihaink.cn//uploads//images//20231121//202311211336582b7920656.jpg')
 	const soilList = reactive([{
 			icon: "/static/img/sj.png",
 			name: "土壤温度",
 			num: 20,
-			unit: "%",
+			unit: "℃",
 
 		}, {
 			icon: "/static/img/sj.png",
 			name: "土壤湿度",
 			num: 20,
-			unit: "%",
+			unit: "%RH",
 
 		}, {
 			icon: "/static/img/sj.png",
 			name: "土壤导电率",
 			num: 20,
-			unit: "%",
+			unit: "μS/cm",
 
 		}, {
 			icon: "/static/img/sj.png",
 			name: "土壤PH值",
 			num: 20,
-			unit: "",
+			unit: "PH",
 
 		}, {
 			icon: "/static/img/sj.png",
 			name: "土壤含氮量",
 			num: 20,
-			unit: "",
+			unit: "mg/kg",
 
 		}, {
 			icon: "/static/img/sj.png",
 			name: "土壤含磷量",
 			num: 20,
-			unit: "",
+			unit: "mg/kg",
 
 		}, {
 			icon: "/static/img/sj.png",
 			name: "土壤含钾量",
 			num: 20,
-			unit: "",
+			unit: "mg/kg",
 
 		},
 
 	])
 	const dataobj = reactive({})
-	const tdId = ref()
+	const tdId = ref('')
+
 	// 绑定设备
 	const equipmentId = ref("")
 	const bindFn = () => {
-		bindevice()
+		biproduct()
 		showModal.value = false
 	}
 	// 扫码
@@ -261,37 +307,37 @@
 			icon: "/static/img/sj.png",
 			name: "温度",
 			num: 20,
-			unit: "%",
+			unit: "℃",
 
 		}, {
 			icon: "/static/img/sj.png",
 			name: "湿度",
 			num: 20,
-			unit: "",
+			unit: "%RH",
 
 		}, {
 			icon: "/static/img/sj.png",
 			name: "二氧化碳",
 			num: 20,
-			unit: "",
+			unit: "ppm",
 
 		}, {
 			icon: "/static/img/sj.png",
 			name: "气压",
 			num: 20,
-			unit: "",
+			unit: "KPa",
 
 		}, {
 			icon: "/static/img/sj.png",
 			name: "雨量",
 			num: 20,
-			unit: "",
+			unit: "mm",
 
 		}, {
 			icon: "/static/img/sj.png",
 			name: "光照量",
 			num: 20,
-			unit: "",
+			unit: "Lux",
 
 		},
 
@@ -300,17 +346,44 @@
 
 
 		getlist()
-		
+
 		getlist1()
+		getlist2()
 	})
+
+
+	//列表获取
 	const getlist = () => {
 		lindexist({
-			land_id: ''
+			land_id: tdId.value
 		}).then((res) => {
-			console.log(res)
+
 			if (res.code == 1) {
+
 				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
+
+				}
+
+
 			}
 		})
 
@@ -324,24 +397,35 @@
 		}).then((res) => {
 
 			if (res.code == 1) {
+				if (res.data.length > 0) {
+					columns.splice(0, columns.length, ...res.data.map((step, index) => {
+						return {
+							name: step.title,
+							id: step.id,
+						};
+					}));
+				}
 
-				columns.splice(0, columns.length, ...res.data.map((step, index) => {
-					return {
-						name: step.title,
-						id: step.id,
-					};
-				}));
 
 			}
 		})
 
 	}
 
+	const getlist2 = () => {
+		landproduct().then((res) => {
+			if (res.code == 1) {
 
-	const bindevice = () => {
-		binddevice({
+				console.log(res)
+			}
+		})
+
+	}
+
+	const biproduct = () => {
+		bindproduct({
 			land_id: '2222',
-			device_code: equipmentId.value
+			product_id: equipmentId.value
 		}).then((res) => {
 			if (res.code == 1) {
 				uni.$u.toast(res.msg);
@@ -351,10 +435,11 @@
 		})
 	}
 	const confirm = (e) => {
-		console.log(e)
-		
-		
-		
+		// console.log(e)
+		tdId.value = e.id
+
+		getlist()
+
 		show.value = false
 		showLoading.value = true
 		setTimeout(() => {
@@ -371,7 +456,7 @@
 		return currentTime
 	}
 	const navgo = () => {
-		
+
 		uni.navigateTo({
 			url: '/pages/landDetail/index?id=' + dataobj.id
 		})
@@ -384,6 +469,10 @@
 	getNowTimeFn()
 </script>
 <style lang="scss" scoped>
+	page {
+		background-color: $theme-bg-color;
+	}
+
 	.top {
 		background-color: #34D190;
 		position: fixed;
@@ -393,6 +482,73 @@
 
 	}
 
+	.coneng-detail {
+		width: 478rpx;
+		height: 341rpx;
+		background: #FFFFFF;
+		border-radius: 6px 6px 6px 6px;
+		opacity: 1;
+		font-size: 25rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		color: #737373;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		text-align: center;
+		margin: 70rpx auto;
+
+		image {
+			width: 280rpx;
+			height: 142rpx;
+			margin-bottom: 20rpx;
+
+
+		}
+	}
+
+	.Modal {
+		padding: 60rpx 40rpx;
+		display: flex;
+
+		text {
+			margin-top: 5rpx;
+		}
+
+		.Modal-btn {
+			display: flex;
+			justify-content: space-around;
+			padding-bottom: 20rpx;
+
+			.Modal-btna {
+				width: 120rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				font-size: 25rpx;
+				background-color: #e5e0d8;
+				text-align: center;
+				border-radius: 30rpx;
+				color: #fff;
+			}
+
+			.Modal-btnb {
+				width: 120rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				font-size: 25rpx;
+				background-color: #34D190;
+				text-align: center;
+				border-radius: 30rpx;
+				color: #fff;
+
+			}
+		}
+	}
+
+	.uni-select__selector {
+		z-index: 9999 !important;
+	}
+
 	.nav {
 		height: 70rpx;
 		display: flex;
@@ -418,8 +574,7 @@
 	}
 
 	.content {
-		min-height: 92vh;
-		background-color: $theme-bg-color;
+		// min-height: 92vh;	
 		padding: 0 30rpx;
 		padding-top: 20rpx;
 		box-sizing: border-box;
diff --git a/pages/index/personal.vue b/pages/index/personal.vue
index 324f416..770c312 100644
--- a/pages/index/personal.vue
+++ b/pages/index/personal.vue
@@ -4,8 +4,8 @@
 			<u--image @click="previewImageFn" :src="userinfo.avatar" width="130.28rpx" height="130.28rpx"
 				shape="circle"></u--image>
 		</view>
-		<view class="" v-if="userinfo">
-			
+		<view class="" v-if="Object.keys(userinfo).length>0">
+
 			<view class="head-li">
 				姓名: {{userinfo.nickname}}
 			</view>
@@ -16,7 +16,7 @@
 				公司: 里海弄农业科技有限公司
 			</view> -->
 		</view>
-		<view class="" v-else   @click="revto('/pages/Login/login')">
+		<view class="" v-else @click="revto('/pages/Login/login')">
 			请登录
 		</view>
 	</view>
@@ -38,7 +38,9 @@
 		</view>
 		<view class="out-btn">
 			<up-button @click="loginOutFn" type="primary" customStyle="border:none;height:90rpx" color="#34D190"
-				text="退出登录"></up-button>
+				text="退出登录"  v-if="Object.keys(userinfo).length>0"></up-button>
+				
+			
 		</view>
 	</view>
 
@@ -50,11 +52,13 @@
 		ref
 	} from 'vue';
 	import { logout } from '@/api/file.js'
+	import store from "@/store/index.js"
 
-	const userinfo = uni.getStorageSync("SY_USER")
-
-
+	const userinfo = reactive({})
+	if (store.state.userInfo !=null) {
+		Object.assign(userinfo,store.state.userInfo)
 
+	}
 
 	const previewImageFn = () => {
 		uni.previewImage({
@@ -65,29 +69,37 @@
 	}
 
 
-	const cardLiList = reactive([{
-		text: "片区经理"
-	},
-	{
-		text: "安全设置",
-		nav: "/pages/updatePassword/updatePassword"
-	},
+
+
+
+
+	const cardLiList = reactive([
+		{
+			text: "安全设置",
+			nav: "/pages/updatePassword/updatePassword"
+		},
 
 	])
 
 	const loginOutFn = () => {
-			
-		logout().then((res)=>{
-	
-			if(res.code==1){
-				uni.$u.toast('退出登录');
-				uni.navigateTo({
-					url: "/pages/Login/login"
-				})
-				uni.clearStorageSync()
-			}
-		})
-		
+
+		if (store.state.userInfo) {
+			logout().then((res) => {
+				if (res.code == 1) {
+					uni.$u.toast('退出登录');
+					uni.navigateTo({
+						url: "/pages/Login/login"
+					})
+					uni.clearStorageSync()
+				}
+			})
+		} else {
+			uni.navigateTo({
+				url: "/pages/Login/login"
+			})
+		}
+
+
 	}
 	const navto = (url) => {
 		uni.navigateTo({
@@ -95,12 +107,11 @@
 		})
 	}
 	const revto = (url) => {
-		
+
 		uni.redirectTo({
 			url
 		})
 	}
-	
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/landDetail/index.vue b/pages/landDetail/index.vue
index 240eabd..44c4a67 100644
--- a/pages/landDetail/index.vue
+++ b/pages/landDetail/index.vue
@@ -1,11 +1,11 @@
 <template>
 	<view class="box">
 		<view class="content">
-			
-			<view class="video" @click="navto('/pages/live/live')"  >
-				
+
+			<view class="video" @click="navto('/pages/live/live')">
+
 				<!-- <u--image :src="url" width="100%" height="300rpx"></u--image> -->
-				<u-swiper :list="dataobj.pic"></u-swiper>
+				<u-swiper :list="dataobj.pic" width="100%" height="300rpx"></u-swiper>
 
 			</view>
 			<view class="time">
@@ -18,56 +18,74 @@
 			<landInfo :info='dataobj'></landInfo>
 
 
-			<view class="" >
+			<view class="">
 				<view class="tit" style="font-size: 33.29rpx;margin: 20rpx 0;">
 					种植信息
 				</view>
 				<view class="" v-if="dataList.length>0">
-				<view class="thing-card" v-for="(item,index) in dataList" :key="index">
-					<view class="head">
-						<view class="">
-							种植
+					<view class="thing-card" v-for="(item,index) in dataList" :key="index">
+						<view class="head">
+							<view class="">
+								种植
+							</view>
+							<view class="" @click="navtoForm(item,i)">
+								农事查看
+							</view>
 						</view>
-						<view class="" @click="navtoForm(item,i)">
-							农事查看
+						<view class="card_body">
+							<view class="left">
+								<u--image @click="perviewFn(item.pic[0])" radius='10' :src="item.pic[0]" width="200rpx"
+									height="200rpx"></u--image>
+							</view>
+							<view class="right">
+								<view class="">
+									种植种类:{{item.kind}}
+								</view>
+								<view class="">
+									种植品种: {{item.breed}}
+								</view>
+								<view class="">
+									种植面积: {{item.area}}
+								</view>
+								<view class="">
+									参与人员: {{item.user}}
+								</view>
+								<view class="">
+									开始日期: {{item.create_time}}
+								</view>
+								
+								<view class="" style="display:flex;" v-if="item.status==2">
+									<view class="" style="margin-right: 10rpx;">溯源码: </view>
+									
+									<u--image @click="perviewFn(item.qr_code)" radius='10' :src="item.qr_code" width="200rpx"
+										height="200rpx" style="margin-top: 10rpx;"></u--image>
+								</view>
+							</view>
 						</view>
 					</view>
-					<view class="card_body">
-						<view class="left">
-							<u--image @click="perviewFn(url)" radius='10' :src="item.pic[0]" width="200rpx"
-								height="200rpx"></u--image>
-						</view>
-						<view class="right">
-							<view class="">
-								种植种类:{{item.kind}}
-							</view>
-							<view class="">
-								种植品种: {{item.breed}}
-							</view>
-							<view class="">
-								种植面积: {{item.area}}
-							</view>
-							<view class="">
-								参与人员: {{item.user}}
-							</view>
-							<view class="">
-								开始日期: {{item.create_time}}
-							</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>
 
-			
-		
+
+
 
 		</view>
-		
+
 
 	</view>
 </template>
@@ -81,12 +99,13 @@
 
 	import {
 		plantlist,
-	
+
 		landdetail
 	} from '@/api/file.js'
 
 	import {
-		onLoad
+		onLoad,
+		onShow
 	} from "@dcloudio/uni-app"
 	const list = reactive([{
 
@@ -148,8 +167,14 @@
 		typeID.value = option.id;
 		getlist();
 		getlist1();
-		
+
 	});
+	onShow(() => {
+		
+		getlist();
+		getlist1();
+
+	})
 
 	const getlist1 = () => {
 		landdetail({
@@ -158,13 +183,13 @@
 			console.log(res);
 			if (res.code == 1) {
 				Object.assign(dataobj, res.data);
-			
-		
+
+
 			}
 		});
 	};
 
-	
+
 	const getlist = () => {
 		plantlist({
 			land_id: typeID.value
@@ -175,14 +200,14 @@
 			}
 		});
 	};
-	
+
 	//新增种植
-	const  addshowPicke  = ()=> {
+	const addshowPicke = () => {
 		uni.navigateTo({
-			url:'/pages/husbandryForm/sow?id='+typeID.value
+			url: '/pages/husbandryForm/sow?id=' + typeID.value
 		})
 	}
-	
+
 	//跳转
 
 	const navto = (url) => {
@@ -192,14 +217,14 @@
 	}
 	const navtoForm = (item, type) => {
 		console.log(item)
-	uni.navigateTo({
-		url:'/pages/landDetail/tudi?data='+ encodeURIComponent(JSON.stringify(item))
-	})
+		uni.navigateTo({
+			url: '/pages/landDetail/tudi?data=' +item.id
+		})
+
 
-		
 		// }
 	}
-	
+
 
 	const getNowTimeFn = () => {
 		const now = new Date();
@@ -255,6 +280,31 @@
 		}
 	}
 
+	.coneng-detail {
+		width: 478rpx;
+		height: 341rpx;
+		background: #FFFFFF;
+		border-radius: 6px 6px 6px 6px;
+		opacity: 1;
+		font-size: 25rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		color: #737373;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		text-align: center;
+		margin: 70rpx auto;
+
+		image {
+			width: 280rpx;
+			height: 142rpx;
+			margin-bottom: 20rpx;
+
+
+		}
+	}
+
 	.thing-card {
 		width: 693.93rpx;
 		box-sizing: border-box;
diff --git a/pages/landDetail/tudi.vue b/pages/landDetail/tudi.vue
index 5479c69..5f2a6f5 100644
--- a/pages/landDetail/tudi.vue
+++ b/pages/landDetail/tudi.vue
@@ -3,8 +3,7 @@
 		<view class="content">
 			<view class="video" @click="navto('/pages/live/live')">
 				<!-- <u--image :src="url" width="100%" height="300rpx"></u--image> -->
-				<u-swiper :list="dataobj.pic"></u-swiper>
-
+				<u-swiper :list="dataobj.datapic" width="100%" height="300rpx"></u-swiper>
 			</view>
 			<view class="time">
 				<u-icon name="clock"></u-icon>
@@ -20,40 +19,62 @@
 				<view class="tit" style="font-size: 33.29rpx;margin: 20rpx 0;">
 					操作信息
 				</view>
-				<view class="thing-card" v-for="(item,index) in dataList1" :key="index">
-					<view class="head">
-						<view class="">
-							{{item.type_text}}
+				<view class="" v-if="dataList1.length>0">
+					<view class="thing-card" v-for="(item,index) in dataList1" :key="index">
+						<view class="head">
+							<view class="">
+								{{item.type_text}}
+							</view>
+							<view class="" @click="navtoForm(item,item.type)">
+								农事查看
+							</view>
 						</view>
-						<view class="" @click="navtoForm(item,item.type)">
-							农事查看
+
+						<view class="card_body">
+							<view class="left">
+								<u--image @click="perviewFn(url)" radius='10' :src="item.detail.pic[0]" width="200rpx"
+									height="200rpx"></u--image>
+							</view>
+							<view class="right">
+								<view class="" v-if="item.type==5">
+									<view class="">
+										参与人员: {{item.detail.user}}
+									</view>
+								</view>
+								<view class="" v-else>
+									<view class="">
+										{{item.type_text.slice(0, -2)}}种类:{{item.detail.kind}}
+									</view>
+									<view class="">
+										{{item.type_text.slice(0, -2)}}品种: {{item.detail.breed}}
+									</view>
+									<view class="">
+										{{item.type_text.slice(0, -2)}}面积: {{item.detail.area}}
+									</view>
+									<view class="">
+										参与人员: {{item.detail.user}}
+									</view>
+									<view class="">
+										开始日期: {{item.create_time}}
+									</view>
+								</view>
+
+							</view>
 						</view>
 					</view>
 
-					<view class="card_body">
-						<view class="left">
-							<u--image @click="perviewFn(url)" radius='10' :src="item.detail.pic[0]" width="200rpx"
-								height="200rpx"></u--image>
-						</view>
-						<view class="right">
-							<view class="">
-								种植种类:{{item.kind}}
-							</view>
-							<view class="">
-								种植品种: {{item.breed}}
-							</view>
-							<view class="">
-								种植面积: {{item.area}}
-							</view>
-							<view class="">
-								参与人员: {{item.user}}
-							</view>
-							<view class="">
-								开始日期: {{item.create_time}}
-							</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>
 
 
@@ -76,12 +97,14 @@
 
 	import {
 		plantlist,
+		plantdetail,
 		actionlist,
 		landdetail
 	} from '@/api/file.js'
 
 	import {
-		onLoad
+		onLoad,
+		onShow
 	} from "@dcloudio/uni-app"
 	const list = reactive([{
 
@@ -116,6 +139,7 @@
 	const dataList1 = reactive([])
 	const dataobj = reactive({})
 	const typeID = ref('')
+
 	const showPicker = ref(false)
 	const columns = reactive([
 		[{
@@ -137,24 +161,43 @@
 	]);
 
 	onLoad((query) => {
-		let data = query.data ? JSON.parse(decodeURIComponent(query.data)) : null;
-		console.log(data); // 输出：{ name: 'John', age: 25 }
-		Object.assign(dataobj, data);
-		typeID.value = data.id;
-		getlist2();
-	});
+		let data = query.data 
+		// console.log(data); // 输出：{ name: 'John', age: 25 }
+		// Object.assign(dataobj, data);
+		typeID.value = query.data;
 
-	const getlist1 = () => {
+		// getlist1()
+		// getlist2();
+	});
+	onShow(() => {
+
+		getlist3();
+		getlist2();
+
+	})
+	const getlist1 = (id,a,b) => {
 		landdetail({
-			land_id: typeID.value
+			land_id: id
 		}).then((res) => {
 			console.log(res);
 			if (res.code == 1) {
+				res.data.kind = a
+				res.data.datapic=b
 				Object.assign(dataobj, res.data);
+				console.log(dataobj)
 
 			}
 		});
 	};
+	const getlist3 = () => {
+		plantdetail({
+			plant_id: typeID.value
+		}).then((res) => {
+			if (res.code == 1) {
+				getlist1(res.data.id, res.data.kind,res.data.pic)
+			}
+		});
+	};
 
 	const getlist2 = () => {
 		actionlist({
@@ -174,10 +217,10 @@
 	const navtoForm = (item, type) => {
 		console.log(item, type)
 		switch (type) {
-		
+
 			// 施肥
 			case 1:
-	
+
 				uni.navigateTo({
 					url: '/pages/husbandryForm/fertilize?task=' + encodeURIComponent(JSON.stringify(item))
 				})
@@ -187,6 +230,7 @@
 				uni.navigateTo({
 					url: '/pages/husbandryForm/weeding?task=' + encodeURIComponent(JSON.stringify(item))
 				})
+				break;
 
 				// 灌溉
 			case 3:
@@ -213,7 +257,7 @@
 	}
 	const confirm = (e) => {
 		showPicker.value = false
-		console.log(typeID.value)
+
 		uni.navigateTo({
 			url: e.value[0].route + '?id=' + typeID.value
 		})
@@ -273,6 +317,31 @@
 		}
 	}
 
+	.coneng-detail {
+		width: 478rpx;
+		height: 341rpx;
+		background: #FFFFFF;
+		border-radius: 6px 6px 6px 6px;
+		opacity: 1;
+		font-size: 25rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 400;
+		color: #737373;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		text-align: center;
+		margin: 70rpx auto;
+
+		image {
+			width: 280rpx;
+			height: 142rpx;
+			margin-bottom: 20rpx;
+
+
+		}
+	}
+
 	.thing-card {
 		width: 693.93rpx;
 		box-sizing: border-box;
diff --git a/static/img/ADL.png b/static/img/ADL.png
new file mode 100644
index 0000000000000000000000000000000000000000..1acfad2df0830cd900b88f7e460369e10c732cf0
GIT binary patch
literal 3888
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

literal 0
HcmV?d00001

diff --git a/static/img/AHL.png b/static/img/AHL.png
new file mode 100644
index 0000000000000000000000000000000000000000..1acfad2df0830cd900b88f7e460369e10c732cf0
GIT binary patch
literal 3888
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

literal 0
HcmV?d00001

diff --git a/static/img/AQHL.png b/static/img/AQHL.png
new file mode 100644
index 0000000000000000000000000000000000000000..237eac848c91fbddfdfff4bedf9d4c058bb901ee
GIT binary patch
literal 2364
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

literal 0
HcmV?d00001

diff --git a/static/img/CKGD.png b/static/img/CKGD.png
new file mode 100644
index 0000000000000000000000000000000000000000..97b1e40ae9c7f24b3028ec863556c066025ab3a4
GIT binary patch
literal 1294
zcmV+p1@ZccP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px($Vo&&RCr$P+h2$qMH~n4-*0zwcv`fGf>J@LVCCp#vpd)ad$vtmN)cPIf)Caw
zQSeCx5g#mqR9}jq;FDk<^+oVc6|L5`sE4)UZ<0&NNhPA<AqGL%15K9P?a06e%9`Dz
zxy<gw-F;57GoSs=>}K{i2*r^ofQ3)8Kmjx)Aq7wYw6RG<d4g=)zDo$vYcv`^Z>*`=
zd|MgN+}zxz+1c5T0ANqpwey`$=aJ>*<v+6N>Ud{W2E-UU4gkj@&AJ=}!F{z_?a%R=
zoBp?y0lBVw1`+p1yCj78K?t#XT98x%oj}CrVy=0!+wJaZHk*H?pNXqGqcWgMrLx&H
z&F=x=&OuEQLNt8euj-DZ3`nBbw!OtP%|%4KBj&nY@;q;$)oQI?-E~dx(@KH*NS0-N
z3jnvpbc=hQSJf3sIgmtg9Orh!Fcy=LdcEGRMx*g}df6E5OsN1}fh3c3OH9))_Ika2
zx*??oBvBY+a>ABLibZO-+trnomCk6_SN*3_1?nRSAub@|%`x3uY`5D7bU{iTNTQU>
z<!zQ_eVv5ldEWk3tL3ZDNb(sn0qP@_N~LcA;KrEeq;spQtM_M(lo?Qnw7pa+eW^22
zra)I9$%*@hxFjLsK_cp9G2Ai-3LhpN%d*ZVAe~0U!&x9{0n|q_P4g>6+!T|f)131M
z0AM}MBxwT_BJD6u^K1grDbD$kG?BCd>LZ22?b?_mNu&n>AV?!g+5v?RlM4XwIRMPY
zAid2we>As1vg4IXWv6MHUjV>0F-XTa=dY+n(lSB)PP?wV7ZK0KAqXK3a?U?fiKI19
zINYj22zi^I8355FqV2f`lAU*5_YfkUiWzE$IOiX$Lef4#{f;xnUIc)b20)x4q5}mG
zV<iCi6##CHV8{o@>xt+e6-ZN)pm08V764w2LI@#_aL(V)J<$C8{MMP7nV$wg948_<
z1Sft>Rf574{T5yP7ec(rIe&8EIsh<rK(6b4hluw?Fg_q6`S)Yu$NvII2=N~0{Go~K
zOk;u=WB(aq0PqG8J(YVP`6}D8td#+GvFADGCvp$uIL>2+VVsOY1VM0btya5`cOZ)~
zb{PP+Mj$*Q+N=Uc{^rz7(yr^ijEFA`fOw0Dp2#(j<2Z*6!}xFz!rI!}wxy+|A9D-D
z7^?!nCov0W?-0>ZRXExYF~@Os8;0>|%+hOTeSLkdUa$X>OQ3McRjx}9T)YQ>hl%K2
zl{nfah%vSht|DF+18|av9#@T{C6H~~J4SfzliIs6t#0!Yr+9G~GcIh~c8XWe2{=XZ
z!uUAna$EjVE|+BiRbp*W)>USiP0}Hb*41U1-R6hk$Wr0l7IDf7*QDZ2iIdwh;8Dtd
zb;3z?h{-DZAqC_Yb*r*Z4QP}t2s-Z5NCjvF9Ioq5ALT&dHmIZ>K3eY;QwqcwyGaO9
zN5n0I9-@U1goyiy$V+3{V%&2mdr)*;_jN>kI;LTDxu0Hl9MuVue<5~8frJoCzVGkV
zeKT*r-6|9G8X`Uu0lL)fcK1vRj_L%-%_*{WP}V$yTtfAI|L8Q~C<W>#hcR|{5Cp5W
zTJ867C(10pr)-F2*{MmMy8s%ZSpXG48yj#%f`<703!2p%XXE{WmjD0&07*qoM6N<$
Ef-wJExc~qF

literal 0
HcmV?d00001

diff --git a/static/img/CO2.png b/static/img/CO2.png
new file mode 100644
index 0000000000000000000000000000000000000000..95288fd79960eaa46c26c8518af8f657b14cfd38
GIT binary patch
literal 2534
zcmV<C2^sc@P)<h;3K|Lk000e1NJLTq003A3003AB1^@s6ag{JM00001b5ch_0Itp)
z=>Px;ph-kQRCr$PT<vw#IuNz&0)Pq#6+B}X08{`}08~Iy0Z_q9Dj=zVPytB+c1#6?
z3P=jD^v*RSAFWnjYf0JU9p@JZOC#xOG`jPlWySiJ6#<r2`YOCw0nV%hE5IwjnGwh=
ze%0U=;LHeQ7Qbrn3UFowGK*g|cm+5!0-43H8oUDh7lEc}J~PHX;om}t4}IUCX2vFo
z_y?iEbzL7+RrO0<@i>l8hGDo#f<i_idj%L;Sro;`q9{)LzCW_9a|L*z2DEJ}WY=*V
zpAExsZ4=cr%`syPn*kH?rSE%ej`0s0!Wescb#-;QaB9iA?OTHf#@IhXh~ItRANW=U
z;Lygk5olAE<rQP>aZwa!UDv($$<6tFuK?F|4G`+Tn5D6&bzQ%#s_F-UcH4Cw#@O56
zUIEUv>b7mcFy06u4)@JA{+9sf+PEchSAdtGwnLu>1u*O@V@%{^2dT%11{fDrS(cv|
zW4Nr&yRJKN(I;vPHgMW?-C2k-)OB5#W%-RUHn9jH#5L#qEpEn;{%8Z>e3vQN?sqf>
zxcP@r`L=e^0IU3z26@|c-MKy>ZNx94Pt#`~pOrG2rnv^M)npD`*FE<EK%4VJjw^&X
z>ihoKFh7&G=;Y?UvGF|xz!!|M7jiHgXid|+XN-MSCk0LH`~I10q8jbmXzFuL(Acy&
z<2XJyX}{|Dpl=FyJO#jW5QZjYoV*2KuY&;%tg7nDv<V>q>!8sbUk$@>q06K>PTHM{
z;za{YS^{tBfOCFfnmE}&*lKug^HH}QSHr?5k5AM7%f9bnSDk-N(`@w(*%+VP(C<kA
z4jqi_@F87RxDdB&wMiD)(NhVs5aN<^{wBoxqrT^IWA8fDd8Yt}ZiKBJ#UgG(fHhoV
z^)9R<cCNDjg913!qVH19y#QE-7a3z4HkES@o_p!iSPB@uD9aK&eEwsM-HhY--4%Je
z3!wK3aND*Z^|&B?m(|5Mj>p3=e3ziqb^W@ks>6W3*d#bLRtG32(8&NMzWQ_=$Dcl1
zN7M_Pcth&~77A*GNLk3HY={HrW{e%#E>`K0A__+x&pGE`me~7^lN7KhZ<D5JbZ5ir
zW;RU&x7wPG@D3K)KnQVcN>8<I3r6!=6Az~IHfG3Z4Q`qSwCi7e5+*uiYa6qGC4Geu
z8wvpJt*YveNmeXpP66<S_9~P7-gTWkZg5$*TxHXOgb+XR|GHxl0^}}zRVT;ejvKwc
zkoipO2yJL<XE|DMHBb7!$0dYF)>a@zlXo_b<Eiciwrx9QCDd4l;iOzL#*TH{N_HOO
zPth@-cD8Mc5`afqyXcftG{CmqR|6_-+agD1VhXq8IKm^_iVLU<C7_X2R^9C1MNxeA
zrG#jHu&+9J7~-Pqx>xuI#wd#7n>ua^uP+*4Oh^fmJVJ(;F?J|5%Avgg_oa_<s0$`f
z4l&{DUHC0&Gd6JxWK|I;BMqP*bIx(1tYrkDCqD_muE7lP;;DIPpeJ-8zIL`dKs9AP
z8B4xr2e@rpgc>*aZfG6Ek_CA-dvV}?>0Ist;JJE7PBORF*uYQ=2-P-S*JZ;Yn_%*c
zKAN106qm;mjWS(ikTZ^B6cuyLB{{%!QNUZXmMq1R_a)$>kBctC`5@Og`eIY(mlWW(
zZ9fVjkV3MSEA7kv%0*lFuDp0}aN<%1hLQo?G|g9+*2)Fy$B`mxphmOThxB?;6mTAl
zX?^0h*i6((Oq+>d4tT9k3qw3g-IZQ?V$d%Mz@gx(wwL^WMATGZH`ZcWXvkPT8?V+s
z*uYD55k~`TyEqia0FMjy4e{K$B3%RO7GT1GK=M@90h4CVwZJ;3rr3kb>%Gz97smPw
zIWK53JV8Ufg^IaTMu=ud0c<KJQ3eHQ#_C4Zy@pNZoFiX0gRgzR>HGeP;ey&)yc(?w
zsky*hsSm=ZTV9?J;)ZjM;*-Ts6`}yP@k(eGWqpk|vR0yGe9%JA3$Q?V(-+z!m^qN7
zYmpk8_L&OV*X2rwRv+24ITqkQ2FBoxF*Hqs5~``rER^J{z}YHuNF(R4=q`5D1~Rl5
zCn&@mnA$7`*k*e}Vhn1v%@TlJeKhkDRGgyN<&7#O1+c}ocrm~h^AHq2T>`MmUvmL$
z%WUj&5_Bz&0oatu2zqp~1YpfXSl`HLCu`2C$kG5I#H}kts^=Gp$?S9zl6Z2Ki8!BE
zDMxYM99tZKF1e?i^K+!@LoP<h*V;{`s)ms1K;v$)1Ix(_DwR!YgChY}ZQYjEYfrJJ
zGSadv!E>kbR~rR0^qWd!@k&(E!K$jjw_n@tiqsLe7!$D-TMeZ&Wa~iTChmz;I_LZZ
z83aSk#JmAor6jcQNT!?Mazl>dI&V=q8W-s+#HWoHmkD4L8-`SJX4l}NC^j<5E^6b+
zmC3H4d<T-~lZL{)=+*AJiwz!*bd>76An}Tv8^E>R75B*oZ&8|EJs&D9h1Sg#@(NPO
zG=J9fVx)yAk~U?F;XR_TWTUV}eMaD-k@t#4ICyZ-MW?D9X(qDHh(qA$<Dz%QW#uc;
zvMi@;wX67BIyO{3HOUo1oaq^9oBee;Ha-Vru?;4#$z+G&-XcQ~`~t`~$(Zl*lo({7
zx@Z2)3CB}~Aa0+_RW^D)WGe0r$i5B2eL&B|wh{#)o~cWIlm^?hSPqEn2C;+1(I_7{
zG2dNzLoy@YM>@XoqXBl+bt!|N3n4a424n1+3Z%1wPZt*`+=h12!%1tfA9Ihfy>ji*
z0FxF6753@74O4>DP~Z1oe44Q2drYZpXsFXSuOtA+fJ{fx8sGIT!1g^PwPfp?3S7uf
z1~7z~iu6JOO1Y>AaD$2wL)VlXU<g#+!l883RMF^~ABqN}-cl?CcXCklyx}fDW}#`W
z2@uc-(7dGdy3@T?WZ}Wf2cM&%k4-!lmG-^|HB(o_7jV(y7Xrp{#0%9dmu*rL5xV29
z92hMgi$x}S3IKUF5<hkD4kfdWcHT5r=-hX0w-<nSyc7o^1ZsPy1ZY)NkA)D(=Ye+N
zg!q1~YH#3XvBA6SFvT<AuI_59Lx<TbxO)efE=3&i`Js0xa=v!-VEnz$#Q5aIe&3sk
zP$wSAJai1e2=I1e>sL);!CKP)UH~j7PGL*DDneP)PG$osA$W!Kwjv87c<=zL3m~Tj
zl&iKq<ANEWic0Gbfh++fWuJSc!6_GZUu3NSXWoew;1%G^2xJz&YVZnhW&|>eUp06I
wI5Ps7#jhH?0-PCv%;HxKUIEUGKxXm(0W#1#vqE~ARsaA107*qoM6N<$f_N;ckpKVy

literal 0
HcmV?d00001

diff --git a/static/img/CTPH.png b/static/img/CTPH.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1a430b03928e102eb336dd5c7a7aa24e223f1f3
GIT binary patch
literal 1990
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
YKT~Q*s7^ti*Z=?k07*qoM6N<$g4ub%ZU6uP

literal 0
HcmV?d00001

diff --git a/static/img/CTWD.png b/static/img/CTWD.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fa401a5907d7f811bb1ad93c7153e9647bcd564
GIT binary patch
literal 1873
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
LNkvXXu0mjfpWb<M

literal 0
HcmV?d00001

diff --git a/static/img/DJSC.png b/static/img/DJSC.png
new file mode 100644
index 0000000000000000000000000000000000000000..27714040010087911b9ce936961c2d275f5ca3cb
GIT binary patch
literal 1792
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

literal 0
HcmV?d00001

diff --git a/static/img/zw.png b/static/img/zw.png
new file mode 100644
index 0000000000000000000000000000000000000000..a739c0dd9cd795c04b4d01fd0ff19c29ff8c8531
GIT binary patch
literal 5720
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
KMNUMnLSTYCh6vUG

literal 0
HcmV?d00001

diff --git a/static/tabber/a.png b/static/tabber/a.png
index c2fd45ce6c53b9ab39d087da57bee55dd998df19..06d0260eff4011bffb8695b959459fa97c7e590b 100644
GIT binary patch
literal 1016
zcmV<U0|)$xP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px&vPnciR9Hvtms>~_Q5eVnXJ)-^rDjGMm_|1PA*Cp6yD0S#X0$%&Td_esRIF%k
zT_B?eUxF<cvxmT?$0FQll^!xRG9S|1g&-{>&CnpV&D=G0XHJ}%UDCbH?8WfG1IseZ
zne+YT|NYPTz9Cp<gDf*1tN<xxBxZ$<cbjr~A>jxMB=GZ{&x>k?l!Au49}`enm$??e
z4Zi@jHl6Wiv`|q2NvepNW&#vQfhio)Kf!MK5_W;}lt-gh#6YE8^#+c@1VYj&@QWib
zJUd{tGLVyR%zBZ+LVz?->J$lTT6I;HNYqjdr0+AO&%1dO0Wrt{Xs3r04E`!G^)!OU
z`cExtNze*4*1{U68ZcErrCkjL1VS?b$@MOJ)21^r|AZV1{Y62CDERVL-6gvclp@gL
zg)vMx7;Htx4yA?J{jzRzF%_j0=6F3;Z98DR8`UmjDe|~9%^)b2jY^*;Xa$2>>3u=H
zskRW1Q{D~Gp;_fA54BEEg;<I>Dzy8IOF^q6HK)G{CtlZAgOJ*PhUZIyr7$Q^*=w_1
zG9`sWB%DD_?$xAFeo@iF)@DaTi_Tc+|6Bl&^bo{8Hc_MXtc^59N??)|+?t<ko(Qhc
z|78P!m=PhOoo#EIu1fMxyhmAAeFs2}fJ2G@28ju1jLsC>zV&S#b2~RM=)AR?J|9}Y
z^Lw}#NJg^b^c%A^u0W&Ir5~CefB0nR?V5q9u|@HBre>jH%YJNLl@XHb+Pg=?KmJVT
z#7&`g=U{tde_OFzn3IC;NZp7T&m2bFlhU=8PsHW?(vVQS6JK2S`(IvfIaqZ^(bQ@@
zbf%|?PR>pvTbqFkyN)6=X^ph*`0Q^qerS`x)+Mb*-JZ&jDiLrcStKRkfQ{HgtbkIA
z<`g~=b$ctI<&zc#bqlk&((@QI!W=H<9YsNgd`Jf>5hoyDDJfdN4QIC>4jQcK(<^lU
z7{tl!Lh1KkfWifPHqr<73pIzS*fBP6{#<s^gP1+!Qz#aohW;0DOn!~e!59yq+wWWP
zaq2tbvh9~05UbjR5L37vWS<<yz5X^-=I+C>P5A+yj!L0W)tIe5N?kOT`gY51l@C!h
zwQONE_Hdpp!M+?usf#uBa>EtjV29_`-pA5Y!Mcgy{gAI3Q|bgrKp&izn3B0MB|R_~
zD&R(36JRBWb)YS}D!t;iXA@+Vc)21k$)KGYt)LIqYlUs{y>%^aJrSkUNqAxp_mQCZ
m)v+W3g;{h3NJ;T!r_f(tvI|4eahr+&0000<MNUMnLSTY}@zg;8

literal 957
zcmV;u148_XP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px&cS%G+R7gv`R!e9TQ4~FICjBJ-YHhI!)r!9g1sfD4#!rhbq()2^x>F+PLM5ef
z=Lf8~=thV(Xk7>fmx?4}T3lG0im?l;NkOpwu(i?(wl&r!wQXjeyf=yF+f1<fU<fmL
z_nvp|z3<#hkmK6hZLbieyj{#p5@)&|8f^W!xFES~Hu)S)04^liG<l5Hi)#I-0_3b@
zjf())+%ZKj|0UR{ydoe8k$N?3vjW!nS}X#E9fTB7;JZLzd9cmuW<dL&Im|MJlK_iA
zX;3DxwHq6pv$4$xX!hHSX2PPKfLIg<v@0S=mSh%;y++cw|FEUbJe_27>utewz-a;N
zeAlW8Bo_gxh#Fn=7_BUS8CQIMDQG{1Sl@0u6-YKn0ZcT+01;sE7_443MPcf8)KHm+
zcx5!ljh=1RtMRtK0a*wmA&m<JHA*4S`*}Lak|{Kq4iHU+lYktE7MNEvFH#@#!vR?c
z1uAvM3WI_+W=noH#`~VOG=h+(KLsV$vJi7X(^E%)C!L~KCW0kh?6U!+`(Gg<JDG2G
zb=r(pJ>efA`<a187g?NZ2(ul8rz))Z#`eh&^n@iEGCEn=dyEY{e{;P|z7{V)c0oXG
zPJqL7vc~h-zj`<vT*?krxp?`99i{8P%yz&+6!so|=5Xf(I7CC{{)v&>_xhhNcr!kn
z;D7zXWjMHMD^|=a&WL;N<(+}AKPOhIX4n~g-`U#NQ4^M?xzlwE%P<+4#$b4izw5+&
zoUW?N2>N35W9UZT<MVCX8?LAd>5-mWbZlw@<+@^=*svQV1q(RP$kY$CzV6__OA6+r
zdDEecED40#Wkl=E3djVSQn<8YKAJZlgib6-a2l4TaHi)jCZ%bdtlW+2Vnt+<mukS6
z)EP?G;ON?&X`S7A_XOQv-(!Edo<DN}IGeKvgMP3l(;gND@9>-B$I1;ivxYRr@NWRG
z^*uuG*e7)te=YzoziP+Z@h?zyE&e+oQ++~+eYOe=j1Ay=Uk46VY{8!8RVg)-mSIfI
z(^c3I4bi{R*GmDnA`(nX<JCMOL{_DnyoP9q4NXcz&2cetIQ!x*w_@E$>4z~jr!)wV
zlsRNkzP6-HTa+3r72t!RQ7}nl6GWS_!OQ^_mZGBQ|76iFjZQMNUYjsPMSJ6%^+ZZ(
fkccD@KZN}Po}2aD`DgC;00000NkvXXu0mjf6biNz

diff --git a/static/tabber/b-b.png b/static/tabber/b-b.png
index 5b89b80a2796e7ef8117d42c1d4299cd7cbfa815..37fe8386d1db5797a0ec18c2c520950f80dcb996 100644
GIT binary patch
literal 695
zcmV;o0!aOdP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%aY;l$R9HvtSJ813F%Z>C1tcBBRDdEC5T^n{1%wJP72s4r(m`ASP6apxNQeqJ
zIxq!jm)XoIBWy_*Gv^t@`2K9IZlB)n+ouC@U=JJ^9&rRTRFQv&A+5ERQogC32msbG
z#zhEWoyQnsu7wb1jeVVSZc$w?EoiN$N~y0y^a>$@bM8FF8Dr)E@M&lt5#4$3XQjAe
z$*i?YAq2DYKt!RE;2HqVVvLs|gcZkFYniPRBD!fX^aR*BSIk}f(-^Y?fQvlYW`a_T
zwU%1RdeF_7BcLG`j|}}E3}v!k4#<8|k^Q_O`=_;?WdG8^NJQVg_j>PxkrVXRan+c*
zYec-SSjVKXuk+sD?_?cAqko_4O}E!tPuLzx0JvP6?4&rY^{G<ooe<)gVIo=~;$3Y|
z+FJzFzmU!Kxj!nPZoKzf4O}x>B4V%mxO2&jF}DElfrx$zA-bX~16=U`F~;){!XF0A
z2a-~<n|FxVDWy({XvY4?dx+?L4b-TU+88rK#MLIiOoi#7EQnX7@{I<_TFd?Ng@_)#
z_tRSAr&|IMap`V1<3<CN`iAd9rM}8o;?jNQyOwiqYpje3D3zlLXo$%%0j2Bf!a2wH
z>f)0ruoyQQAfD_>sc$T8L}cY{sk2w#4*+1*6_wTm)RLz$CIG<e++0(`^5s9q_%;WX
z&$dku%&DvaN{u(<62D@MIwkItGBYRrykXDc-|THy%#09%_e^V}p=upG9Q&8ltm6?8
z=jn?hw+$)fG7Z7}L_87@aaIGvv3vV+WgnDMvaFdEfr!f%kfxUn)oGvWdt>NtK_3AP
dF?Vnb{RZ^<OhbzWZtnm9002ovPDHLkV1hY3K#~9e

literal 1712
zcmb_cZA_b06n+Y*;GDL~2#`&>g_&ietOZLyBC#7Ckfke)WRxs#29!2XXiG;~23edj
z(Xfq8bYw(+xNM7PVlWF%!s3X|M1SlD`!EJ%%i=N<e>gM355JN{ea>y63`z8d_su!?
z+;h)8=Q-!x`+5NAax=(*D~h9f2-z@Fp8v!DQMBlmu3^rS7vqd4%p+SlPbSTwOWH4S
zOGYk=e0S?^7=Lnx_2<9K#x}G0y#j2na%xLPX`vSuwdn92EihnjBGjEg5IM-g{O1Yp
zSaF~KSa~Te4nHnt>0nNEs;u|{_9B50y2$|-c{^7Te&r}bDSe4t0uxsj*h%HI%Y`o$
zH|n=m=+P34hGTds6}Q7Tk-r$%)Gjg8aaCB@&R;|eeMb>SO!<2w<*&~_Y&XDN=l6Q*
zjxe>zBR+@il8beP&z;I?!@AROqYH=VF~V8=|CgL>a4;_*AI-2TPl7>@>Atn$Ce-7I
zLgr54kUb&6p*xUCUZu{Ync>^FQfCvy5k@QPDLB@nfi;x2_xgt}84)lAO5?FM);!s*
zq~|H+`TLP9p2$u+U6KOqM1XyXGs`w=^GHpk^(3jX%*h)8?5DhrBq*K!`=ff!*C(bg
zf>%l16ixL_b9WtzMY>vo32kO(=98vGB-|QGXp8u;i77gvExRb%vgT>46kS`T022H$
z;Ot)<eMBli*Kqyzy*;*<pAGGLC+PU<)c)$jve(Q#f<D{GSw=9F=<Ml=n|d7fHb-X^
zCC9#;9of|Betouh;O6Y^pL1U9zkTZX1H%PR*4!_@PmTTC{zEn)hyG8}x24`!fA4r>
z^_0h6b@}0QLod7=y>@_lX#k2y+e!7Tx`kv-y#rZQ@N;l3<BJek_AUIZ)K*Yyr{2uZ
zq+XKTF)M7;o4H@6Y-M+`SHL;O5isV3&6D#rh5FHjjOG((?vHJx{z;MoBUfVO6_6G`
zBL*&E*M3yL8&N(bYY`UzHJd3f<;4Q<6?;(wBmQit>Fy8x>ZM8@cv=LPu+-m5M1d**
z&uzGrYt>oy49`WrxY|}YA`xDxA#;(IAK1aA92m@U2M0Vi4FmCPRE!s93XHX4E9I5c
zwi=~`M)Z<IDlt;Y@g_+ee9+OlrSkMQhKU(mshi8c5vKlmF%SpaNdLzL)&5afiI7hF
z)1KSE_3zBwapALt@yh9g*Cp+s7`TKjt5XY?g4)w~_lKjC`*vS8zP8VOb?nYA>eXLZ
zP#2JrsJ9%n1s;7+YrL-xuJ(j@L=6YI1Q^eYx<5V{ul=yrRr-Eq?}-i6w~IwB$@BH#
LsK{VVSB}2{+Ll%U

diff --git a/static/tabber/b.png b/static/tabber/b.png
index 7653b43009996fddd77e5e0746406513c5d5552b..1edff9bbb76ed507c41f2bc1733adb247e3f115e 100644
GIT binary patch
literal 1095
zcmV-N1i1T&P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px(0ZBwbR9HvtS5atNWfcC-y&bh{=t>yVR_p466?D)9pVk!Cf)CoJEWU{^%Y5)f
z(>2UT$2RamLFjDQ9`+!O_~Mfho1$RZin}e_OT(C=PFb>!OuMaSl2p3g<jDUwf4w)m
zH@Vp+Y|;bal6%j&=lj3^`_DO-@Q4{bVtB9xsL_r*J`9Z*Cj%NP`(0N=D73Vh$y6|2
zu=<P`Q&A1H+bxcnvgyHhlWxx)8452ZhETzoM)Wd}Nrz%V<rg**#{e8{6bImwnNV!P
z$<Gncs4<ly(0&GgMWBpRAOleXc0<GP%-+~p;WKI^3Iyx`aJ&vE33w(HbIk3`kTG=@
zpncY4wF$xwK4Bxl^^%EajeH(oK-ak#Wssn|SFH5oOSAapuitTa&ue(0qe~L__QI#~
zdV1h3d1Y_`pw!dUe$b+`x-5ETD9@!Vgl4Md1(5P>0S9-HPipa@ZCRd6a%J}eh@cI3
zQJWP0{{xUZ_5e}<B-LX*K~ZBiZDHjyZmkz>8aj0TbNpStBYbU#^5W|9bgpz$Y`HM`
zp5~6d$HLgN-H#)I$Y%1dmzN-Z9;~^-C|+1?9h=$4dV;nJ+@^2Cz?08oyWVQcZ>(I#
z>Uz=6(4Wi6TycY;3OG9(8lQFp?YX(uirNDUn=V#SH;StZ=+(u^-fgVQqkj0M5qV0K
zJ=5;LhaL57t-OxKm0yv$byeQFwzirnnd>Q2Gn3!!jVmoVVsiu(S(@y;yVi1sfIz(!
z3GvnnSophYiMdcA#GBr-u#q?c;1B~j0?QTkb#(2sf)iC**!%qvJlpQK;T8<d<$r{~
z)rXx=`0)K7KOebp<F{92f85Z~K{rs%RO*I>@w@yb^zG=r2cXiBS}2$cE$!v!YG)|{
z_MrjFtmbg)r#bX>Jcal6jMx~nSL%&Pf|=v#!Evz@HNFlaaT+c1TojE`%sSF)dzsRW
zldi0QM$b)65YeQVwbG&Se~Vc4z0EKrYR3ULKwn%rkGbnVNRiux&bPbC*Qw&h77`I=
zd<pRUOlW-Qz8MmMD_jheq05&~T=?un$-L7)-2Gzw&EA2`2NzS(T=C`sf2;4?k6wP`
zLzPH1RrOzuxy(qW2V>C(0%Q%Y-PUSlUlM{f^>Wau-iUHymh>wi>U2A4b+@eE@eH3!
zWI*V*j=2h?82-ze`MMR9wYG_Jk`Be>py!DpB|N79>pcc;mo+n>5?7OEtAoCn7^ex8
zWpFPsB7zwa!_bCiL+?0#Jh-+FQ8O5b$S(^=<9TRwOnq@E7r8BKdP)^RdnnIWpij7g
z5x$<AYa_O5pNl@Im-Pq{$wN?qmZ}Ft#s6o3nq9yaAg_#VZCN9x{sGrnIz!?J@_YaQ
N002ovPDHLkV1h#n8m|BV

literal 1696
zcmb_cZD^BM6n@fnTb*-DT$Hxx8l(<qKTOi4`Cw(y#->P2!-}RzHv5sRO`D{#Z^af_
zhcKvGU7f{Ze>j}16Gn%0t|(JB1^wZV`Y}ekP6py&Kju&h`-HLWIX7w2N@4r4`*O}b
z_uO-z^Ks98eE@XE9CF}_;;0=)K1`I44Fo@q7k{h!<4w!z1ZO;D9^J^<o0l@wrKSuo
z%`u`laIgNh=|@*of99Kfl$y<_3bCoi70MW8g<e?Hq9bsy(10CUq+3H6%aDghUugdE
zlD^=f$_iTSe^Sh{&Rpu0wd5goKtlxG<ba#JovRqXN?1`rERoAl&XolYQYGz-2&DbS
zgSIL?n#1vE0<Wa~b_6C1=KYqpi_ffI<relc=g~~;IHE`>ym!)geZdij0iODx-&fzy
z)MAS;M;wxi?J>+P3UueH6Y!u5`-m9hEcpK=Cp(<X3n)MnYzj$Y&||7^MRYeB(61u%
zq~nl1A&En`CzrfNoyju8*YBp!YK$X_R@PJESi_oGA=lm;9KL8mOGPr#mZ@0^_pHL5
z>X+VFm4(bmExeH=^J}BVNP3;Lh9vcsIn@h*bc&pp_*}sUV|vcFCa2DWO{97xq;4$a
z>Drfwbv1{z(Dd~5r@OUSv^AoIQjuXDQ*#k2+aRF@mlj&0*r6p77uQb!r~l^YW1JG^
za;}fv-)?_(Wn}AnVdu5uZ`AIWy(aE4<kO9uWrQPIXHQqMyvONib9Tm2cIfKN=(<kN
zftixQJ2TsUDt&q2?(xG94d;A$v%ma)dHmn@f94ZiM*O41wloA9?jLTfz3g+;T>A6*
z;TKQFZ|<R9J<DPWn@A1pdke{y?tfWT@pE#v@+F8Y`xbsSYOAPqP;cf}u3nJzmJN35
z&D^&tTiKnzDd1E(81vlv3y-`-`mwp3rX%k^7+*{M(<DeR@_H9uzFh8eB)(XVn?I;u
zj3}RxwFvY7m-Uo0IWc*5p&wqD@Yhan_dw)VKUM0$vm&^KrT<VON|;iq57u5Z+H{uf
zBeStDZ?qMSiig*{WNy;J1Dm;&14DV9@SyLGVKAAGs)?dp31fxWN;Z<#Mw67!gkF+J
zWhN>)4v+-kqmI@M)hE6(OitrU{cOSQ2=y<BfdITj`aha8w5X_po=y3)p1Z#dY{}hx
z?(?~c>Z!fAB;~LexP>jKQ8Skkv9Iyo_XjWR+IGqG_Abwj@$a@$ul~9caUm%c@rJ$j
zmc<Wgx&N)9rJfFtsNp0R2NSE~o==V@>(17>D?Y65Jt7^_E*5np-}Rv}k->UCKK=n7
Ctx+fd

diff --git a/static/tabber/c-a.png b/static/tabber/c-a.png
index b2e9ea1902f30d740ca5cc18bebe11bd99cb2d30..001143780f92cd97c1911bb1724eee0d67b75cbd 100644
GIT binary patch
literal 999
zcmV<D0~q{?P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px&p-DtRR9HvtSnY8WF%aE76+lt}Nd>v+3LsQKsDQYFgbI>WfKx$21%wKK0;Grv
za0i3}q-EZX&Lf{C-P!zM7<R_viBBKz_T%l_F#To5e;FS7HvqM5d!&?lLqumpbbybD
z95C~Wh@Oe)tM~q!bI$D=ft@_0wZ0&tYi2&0bCHOwnEA#S^Ks64teFL<ZQE8Ubx%a?
zaIlDchbM?=6+&=IDR>Fb;jwdOewl!9-uw5?IjpbRBp`T&nE|FZ5xEN?ES+-*Ptoua
zP19iSWwPkX7;{(KR|V8{-2)N5i$K1G5H6;Gj4zA89+>$gp7UU>U6eo-0gXKK(HMjL
z+1o}h_ug8&%pH~m6m#Y&Zuny`!^J5m@BQmsPGtdUtsPv9#I@G06FC!(1C+mr^i_wl
z_uhYY&Y|?TtZmzarfI&$vlrG{q{N180ZK#Vy+1DHOxJbiB682nsH(Mz$TKr9j4_WT
zP(*Z8;;0-Ta0g1Z7%G4vqEGR{U$Ol0Cy4Sz{QYeS)a)vY4EzHdYTnUW_n<`tm3Kab
zXcUr_wf1<|D%kLl*7}N>Kh$!kZQC=Y)RzeQaGWmyrIh*^pJx+ywuic|L)?+1ch=gg
z+(xbS4KrWEJJwo+Xv?(LNZeN<a%-)<DFHw=gXz<k8hdE+puvko<cu+=1wcbci+qz%
z%V%Q@a<aEEpuXHo9DxlfN9ERyLV8-NrePhb(pr1CHy~_GLh>9!csmdrE@_(P6R4mT
zQk*eV>NsC_4q5aP^boYpP~zjr{qo+owZ2!%#SK7nk~&fYx_>sI;TdLLipWU_0j!-B
zX<F-LR07o;8p=M)AsHzGO@zvXCW0J6#jKLIM+-q>Z?%Yo%Qg~!!$UP<Ou-=Tkr1<*
z2<J3S^O#7EjlNa8XIATo7d*wjHLLqaf`r8A^;F9IL)Xs{@T}&VR8_V6k25=MCFpm?
znAfRyh-j<dRpm#V9u`Wep}!S*rNYK(t2rJ*S)zqWffgr+qbY4v>raWkf;8#niuXSI
za&sjt#C^3dO#tfq->^nRvf^y3b&L-k$~XRw;cu~r$Onn8d28y$_8Eg7LI}50z+z=y
zGV@wB)I5{zWi^@5G|hUHiR+w*KppghV()I|ezcC?=}-wFcQt3Up7c-(GLF(<^M1yf
zvN+u?b4*>@yAz<{kQfe(%V+o}LmZ#+7*+HP&xH^kr^1>8wHKf%&-}^r|A3~v_ZtKs
Vr$f&W`HcVo002ovPDHLkV1i?L-kksd

literal 1712
zcmb_cZETZO6n^%h4iRm2EZYLE;${e}qwVba5f%$8+d@j$xUeqd4O?yN)~#QxBWxjJ
zOf&-qPFYyk4-F8fiJ2i27l;tVL=*WjK8)F%#Drj?i5SR!`0<0N&$;c^F_-8M@0)Y(
zx#ymH&U4PW_w@kCDa<7YE-Q}uVHChX`Q-}j!&upOInQ3Q6va8?5!2`f&Oha)4Rg}d
z0ypOtqRe-z>AK-(XGC}U+X8GfncgYEraGs#V3Za5U{;GR-@y_+cBaBTDTJ^B`M7r}
z<sC2Y_aCaRqQ(A)#Vi}lsZLqS?_wuX2&0D_aFKU%73EhA3##Z#<VqO1GQ&=)rd=U?
znYb~(wMK_PC>Duhb0%(=Z?bqkuCY^MX5*@`u$?}O0DZ?0L0tKJJ>#$6KVsLz-Q@Rr
znhr3v=mS1S?2?OhiO;RdY0K*4a3g_z^cdwV{{Kr(HaM6UP>gn1l_$ZV!&LvONE@1Q
zKp}HyaLAsJ;K<n{J*-n_vP}QYo0+pI;)o!~dJ2v;XkiVd?S1~?^9BTsfvRM@gEdcg
zEA9C!<#}^L+EtQux*!GFi2(bOWR@M&7LnRWYe-UMnbS7{*iCsgNl-fdcgA#_uT4&!
z1+S92DVpk==1%O3M-zciN}HaZ{<tj_jReCfZ5|)iF-0e|MHfX|)I4pOqHD_(K!QI6
zocxQUpGXDhO0M6!y~Fmxli_V|ha6uV+g-n3_S(5e&?j3t%Ls*2-MxvVvDabmaCFB|
zdFb<*(RJPK*JjEGZ_I4}#rXWd&0~k}>d$!cXMg?U;`qPq-{(_ZLH|eT+uZDHzJ0j0
z{-VcTcj5k1!_S?FUEM={z635KZ6Y<Z>SmHP^A2QH!_UFl!WSX3?3?*nsjZ>bPQ8hr
zQN1L&V^-LxH*w#hY-M-8SHLO85iq8?igWiGN_As%x$Q^Zy)*s{^^cMim;%mAuYk1p
z2{CX9yZWR0-H7rrS&K0Luc@HCkQWQUSL{Ut4EVF9p=Tico0lqe;BgUL!ZLp=5e2FM
zJhk?Gp*6?6V`Mh^*_DpcQHk(k1DT7o_`nt}<-kzBJ2dFIp&v{Zpk|^pPhhMPTPd%k
zw!t7JG@y?pQl)`PjyFi+;Qg-P`r6}P>nEpixoNiedW8C?#XuZvB>f*3RQpF^B|<js
zPkL|uKCm@!%b8E-CTgelUX!##V&D?Cs7?Vc1+}O3)(;2I?b?39@aiu2mGSSlQLp~O
zf?D2o8uj|UwwE4!P%FK!3@!JBcti~cxdfOfin%{Jnr!@_(N*<cZQqf#)OU(SBgymS
M(3r?zO_z?p0d%WWi2wiq

diff --git a/static/tabber/c.png b/static/tabber/c.png
index cd9db0e3e9ca68e44edbdcb391e82f243308a232..383123106c674e40afb8d178d9d1ace4c8cbd3e6 100644
GIT binary patch
literal 1482
zcmV;*1vUDKP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px)gh@m}R9HvdmtAaAWf;f*PtQJJowE!iFfu3xL<F;qB_edlP%e~>tR}#XiO>r{
zBQ0Cx!Wao41TK^?wiu%qYztRv%!agJOo&_DM>N59h!~JS&16F)q{FpyqwQm!)1B_L
zJN+1PL41;4^gZu+-`{yY{?Gdo9x<awj0gV@pqKlOTXQ(44vcCrEKINfY#}B;2muf}
zqipIrYkS)_-3Uy}Lz{Y<b`WR}0p;0j#9%+zbih-!yDgjfGAApbO+6o%6QV5%AdG(T
z1T*_dAs>mSSOv8(U?*Ua2El-jOlWYgadu_`%LpW1F@aii3!Mm?!j0doY4E38Tt32t
z=nepT;`0dg?zPSn>E25VRNK>h0Kk5A0Y-mV3EMM)ByXmIakLeLve+`*>an>Tsi0B<
z={>`YHcypPzV?Bwrn|Y72-{UC<_1rdtI=pNL!b$Fdt)#EcNlGBJrqpXV3bpaK(*b?
zKGnsHes`5KWkuP&$1V4RxphQrjlq*Y*L?qUM@2)x=<8*EIGEEZYe&J3vo=?2^1LZP
z`cQ>U;l-(PW^-?|ouk|WB1^)e%mFfy<IGxTM=GfCP@XlFMoj^#>1p;$$)*dH3d3lR
zB`JmrbMw6gN?uW5EVSZ2NAhKS-MnQ-Uw?AlXY*-h+G<SeAyt8+IX7fdI`3%E=A69#
z!<AcRnUxs}<(*Ju499*xhk?*t%+4>w(aLRt+(}Rz*@7i_sHVHAo`{Y!@Vm$6RP!R)
zYWte25yf{h-njZT6ey}g;&x~3Z@hQmOZERdD__B~qWMzl0RlNn$ZQx!{ribPJxv`1
zssnJsZFANe0!?VsQ$_QzcjYES8TjbZSzNt$3!6(T)Ze60LkShc%U!BDuVCD-FM<T1
z+McFPfYt*z=(agU6sOn+S3K=M-nnisH5X%FncWcR-3wpf?$`*nS)aqkl9ll};;CF<
z!(1x#Y0|>r(;k~EzEC2NR_-Y@Vu(krH%4w>JaX~t$Mhl5Q(d_?gkzV^sYCCV*|E@E
zoB%C-Z2_4p;-O~_xT{>Vv`Nzf8swnp#&#_v1xg;?TK<xnCt?Eg$*<=Tii{&&NCCXM
ztM8<UZhNxUO)F$KIp`yxOcM8y?=(gu<Ax!dspMf_c^&5DtB#yv3>@6mds4>t1Kj1d
zxvC94RFfg82RX<B)An1p>J1|k&ulDNfq~#%loc<U60+Dk+_kf}MGkL!(&o@)*|Xnc
zb1l|yc$-JcyKZ0ewq5%^K3rN*jPluwP@G?gIWr1X?Gdk>8Stt<3F+3wt6`hFG%1fb
zu(P*iI3~b}jW!`<>4fnO@2R~*p}>c-vVchLqzZ|6QF2KHQf&K@bqP>^{xf`Y-%npH
zkY~vPJf(GLjaA<|RM3dxmA<v+i6w9>eZeqX`ax0c&#(W0zQ3-i!$&H&#y_Cx^0xz*
z0)LbmHSesNtENwLXA}hwui9eHNHZ}(-%6wsMY;7#Zq)HJ9X~q5O4y<Gw>O`D@zYhs
z)?L{GX;Pr+l6Yw{l!?`4SY_H^!T}BJCy-U#d&;)EdK4k4j`#sS8@NNh4mF=7$wi~Y
zqA*n$9YL}>!cJ_ewv!<qt!6~k=9;Z(Rj18QbvTpfnGX5V2xGSfh8jLOunqD^BS4e4
zi8N#ex|Om|W(1N6$=4vcHAGC2gD0QgSq^Y3K#v>o2*~-t%Q!#uOZ;&<&!o+v<PDOq
zGBJn2mv74HTR(4k<+HOEJYym%yfS<Xq3}4a-WyVtdeXQn3Z*`qt98bUq8?857E`@;
z$I6&PjQ%KbqtRhL)w|OI(iRb+R3eHUglYmT;E97iae#q<<Xc3EbWHbBnN<#D^uj})
k@IW4V$P5X~J#s+*0;ox`L-yGs(EtDd07*qoM6N<$f{neu!~g&Q

literal 1696
zcmb_cZD^BM6n@fnv(C9CTa>ow8l)Xg+nS_H^TEoZjct*b28*UhHrpkkO`D{#Z^agw
zLl{)8uA9YT1&5PWVN|8MqD<KwxE~7jV~lp448*~H%%K$a^<!*%&P|%MQrLd%zMON<
zJ@?#mo^$TGuNQ#Mm_rU+QyjH}$cKsYxwC;!;>F+Tj+a`OCpcq~d3X)yn@^<-b*U-C
z*X9^e?7!b|$Mlmcsz3E@KGvGeCknBy#udyMWrZGC)S}(LztDiKTBJ)u7>kjI$DeDy
z(URW4fyxS6?0H(uvcX*Hl(pm$wn9S$UF3k9yp5|Eze-q9L0=-5p`0rV9HdIx8R1XI
zjR$O1dbEV&(F9&g$8GnI7tF>jZ<CnWxGF5{r!Jy}zT=1@q5Qp@_SYL2av0!g2>84W
zdzo5np3fnN<YIfm=LY3;+p?qZpcA|4F~(W^|CgNXa568T0L`!|Pl7>@iQc8r9caW}
zh0K%2A$vlCL$@=RyhfeLGQ&6TrO#@_5k-jg6dWs9Gb`lUdjf-(O$b#a6Rnw=rTku3
zes3Pjqy4j4ml-L<8%Z+1R%(o-H%Kc;QeT-<y#Pq3EF%d%SK#4@p7ZVTiHl$psU8Wc
z8w+|mcPC<<EnzJ<IXQV@hZc*5B3dwo46B%$i>|T_5}b2s!3ByPTp)1?&74pE&CyGo
z0&@x1??2dVfBl8X#t*{I>qp+K-6MO=+#}?ZO`K(fBU(pyXR^H8>1cI!#8GzO%c<d2
z9iDwtCH;4&HvL@oYTvyh2Ok;Ed-JA${p0HBzwQ6RC%Tya57W1$(ck#sU{mc?ucPM5
zpDzx+d@O!zC-qW#6qDAG8rk<2k}ci;vZ~_e<ZR_j5Lxyu{A|=#QR|@I%&%O%An7d|
z?9`jNZ&kLkJ9|^W3C0mH=9$t<kL!x`BQrV8hdz8bx{~^5ND7R+-no}Am;1bIx`o~P
zQT<{>sk%ml+5bx^<xEaYo?Yle9ZdLZTU}RQ<ToExs#l&9!7VKPhZ0d>3b>C}UN+iv
zmd!)cu`h1477a^;Ep=pW(%b{<xs(F~d7f~;_pYHonUAWmqFjNoRBWZRlGYlNl+T17
zl1ODHDmnI%#KGzI(CX@=UmM0Jajjvx;7)}4m&8CEyh8dvnlm`BsNy}F@~7SRe(&3m
zyZ-!VGh@{gyKYO$VKHzEn^U6}E(Ni->HZJ<FKyp+#q`d0&yCUVH&U<ux`McnltR3E
zm;J5z4{3?-?SX}!4v(neB$ohV%j2H2hm-YZ>fIF|SN9x}4rvpMdXo36ff13xdOkV+
E0ZnyMivR!s

diff --git a/store/index.js b/store/index.js
new file mode 100644
index 0000000..59dc6a4
--- /dev/null
+++ b/store/index.js
@@ -0,0 +1,25 @@
+import {
+	createStore
+} from 'vuex'
+const store = createStore({
+	state: {	
+		userInfo:uni.getStorageSync("SY_USER")||null,
+		
+	},
+
+	mutations: {
+		saveUserInfo(state, info) {
+			state.userInfo = info
+		    uni.setStorageSync("SY_USER", info)
+		}
+	},
+	actions: {
+		saveUserInfo({
+			commit
+		}, info) {
+			commit('saveUserInfo', info)
+		
+		}
+	}
+})
+export default store
\ No newline at end of file
diff --git a/store/userInfo.js b/store/userInfo.js
deleted file mode 100644
index 4ce9b18..0000000
--- a/store/userInfo.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import {
-	defineStore
-} from 'pinia'
-
-export const userInfoStore = defineStore('counter', {
-	state: () => ({
-		userInfo: {}
-	}),
-	getters: {},
-	actions: {
-		saveUserInfo(userInfo) {
-			this.userInfo = userInfo
-		}
-	}
-})
\ No newline at end of file
diff --git a/utils/http.js b/utils/http.js
index 830dea2..9837512 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -2,6 +2,11 @@ import {
 	config
 } from '@/config/app';
 
+import {
+	useStore
+} from 'vuex'
+
+import store from "@/store/index.js"
 
 function baseRequest(url, method, data, {
 	noAuth = false,
@@ -9,15 +14,21 @@ function baseRequest(url, method, data, {
 	onReLogin = false
 }) {
 	let Url = config.HTTP_REQUEST_URL,
-		// config.HEADER.token = token
+
+
 		header = config.HEADER;
+	if (store.state.userInfo) {
+		header.TOKEN = store.state.userInfo.token
+	}
+
 	return new Promise((reslove, reject) => {
 
 		uni.request({
 			url: Url + url,
 			method: method || 'GET',
 			header: {
-				...header
+				...header,
+
 			},
 			data: method != 'GET' ? data || {} : {},
 			params: method == 'GET' ? data : {},
@@ -44,7 +55,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);
diff --git a/utils/syhttp.js b/utils/syhttp.js
index ee8763f..57c53fc 100644
--- a/utils/syhttp.js
+++ b/utils/syhttp.js
@@ -2,6 +2,7 @@ import {
 	config
 } from '@/config/app';
 
+import store from "@/store/index.js"
 
 function baseRequest(url, method, data, {
 	noAuth = false,
@@ -9,8 +10,12 @@ function baseRequest(url, method, data, {
 	onReLogin = false
 }) {
 	let Url = config.HTTP_REQUEST_URL,
-		// config.HEADER.token = token
+	
 		header = config.HEADER;
+		if(store.state.userInfo){
+			header.TOKEN = store.state.userInfo.token
+		}
+
 	return new Promise((reslove, reject) => {
 
 		uni.request({