From 3568e261d98d2f2f86ce08cf6742c69f0b3ae9b3 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 31 Jan 2024 11:16:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                              |   5 +-
 components/customTabbar/tabbar.vue   |  71 +++++
 pages.json                           |   8 +-
 pages/addPlant/select_address_n.nvue |   4 +-
 pages/feedDetail/expellingDetail.vue |   2 +-
 pages/feedDetail/feedDetail.vue      |   2 +-
 pages/feedDetail/sterilizeDetail.vue |  51 ++--
 pages/feedDetail/vaccineDetail.vue   |  61 ++--
 pages/feedDetail/waterDetail.vue     |  37 +--
 pages/index/index.vue                | 441 ---------------------------
 pages/index/manager.vue              |  11 +-
 pages/index/massif.vue               |  11 +-
 pages/index/personal.vue             |  20 +-
 pages/plantAdmin/addBreed.vue        | 104 ++++---
 pages/plantAdmin/breedDetail.vue     |   4 +-
 pages/plantAdmin/houseDetail.vue     |  13 +-
 pages/plantAdmin/moreBreed.vue       |  10 +-
 pages/plantAdmin/moreFeed.vue        |  41 ++-
 static/img/ADL.png                   | Bin 3888 -> 0 bytes
 static/img/AHL.png                   | Bin 3888 -> 0 bytes
 static/img/AQHL.png                  | Bin 2364 -> 0 bytes
 static/img/CO2.png                   | Bin 2534 -> 0 bytes
 static/img/CTPH.png                  | Bin 1990 -> 0 bytes
 static/img/CTWD.png                  | Bin 1873 -> 0 bytes
 static/img/DD.png                    | Bin 507 -> 0 bytes
 static/img/FS.png                    | Bin 828 -> 0 bytes
 static/img/FX.png                    | Bin 697 -> 0 bytes
 static/img/GZ.png                    | Bin 1415 -> 0 bytes
 static/img/HJ.png                    | Bin 741 -> 0 bytes
 static/img/JY.png                    | Bin 1356 -> 0 bytes
 static/img/PH.png                    | Bin 493 -> 0 bytes
 static/img/QY.png                    | Bin 359 -> 0 bytes
 static/img/SD.png                    | Bin 1361 -> 0 bytes
 static/img/hl.png                    | Bin 625 -> 0 bytes
 static/tabber/a-a.png                | Bin 772 -> 0 bytes
 static/tabber/a.png                  | Bin 1016 -> 0 bytes
 static/tabber/b-b.png                | Bin 695 -> 0 bytes
 static/tabber/b.png                  | Bin 1095 -> 0 bytes
 static/tabber/c-a.png                | Bin 999 -> 0 bytes
 static/tabber/c.png                  | Bin 1482 -> 0 bytes
 store/index.js                       |  53 ++--
 41 files changed, 332 insertions(+), 617 deletions(-)
 create mode 100644 components/customTabbar/tabbar.vue
 delete mode 100644 pages/index/index.vue
 delete mode 100644 static/img/ADL.png
 delete mode 100644 static/img/AHL.png
 delete mode 100644 static/img/AQHL.png
 delete mode 100644 static/img/CO2.png
 delete mode 100644 static/img/CTPH.png
 delete mode 100644 static/img/CTWD.png
 delete mode 100644 static/img/DD.png
 delete mode 100644 static/img/FS.png
 delete mode 100644 static/img/FX.png
 delete mode 100644 static/img/GZ.png
 delete mode 100644 static/img/HJ.png
 delete mode 100644 static/img/JY.png
 delete mode 100644 static/img/PH.png
 delete mode 100644 static/img/QY.png
 delete mode 100644 static/img/SD.png
 delete mode 100644 static/img/hl.png
 delete mode 100644 static/tabber/a-a.png
 delete mode 100644 static/tabber/a.png
 delete mode 100644 static/tabber/b-b.png
 delete mode 100644 static/tabber/b.png
 delete mode 100644 static/tabber/c-a.png
 delete mode 100644 static/tabber/c.png

diff --git a/App.vue b/App.vue
index 62a55bb..4a3379e 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,7 @@
 <script>
 	export default {
 		onLaunch: function() {
-
+      uni.hideTabBar()
 
 		},
 		onShow: function() {
@@ -17,6 +17,9 @@
 
 <style lang="scss">
 	@import "uview-plus/index.scss";
+  page{
+    background-color: $theme-bg-color;
+  }
 
 
 	.card {
diff --git a/components/customTabbar/tabbar.vue b/components/customTabbar/tabbar.vue
new file mode 100644
index 0000000..d285308
--- /dev/null
+++ b/components/customTabbar/tabbar.vue
@@ -0,0 +1,71 @@
+<template>
+
+	<u-tabbar :value="value1" :fixed="true" :placeholder="false" :safeAreaInsetBottom="true">
+		<u-tabbar-item @click="click1">
+			<template #active-icon>
+				<image class="u-page__item__slot-icon" src="/static/main/index/sydj.png"
+					style="width: 60rpx;height: 60rpx;"></image>
+			</template>
+			<template #inactive-icon>
+				<image class="u-page__item__slot-icon" src="/static/main/index/sy.png"
+					style="width: 60rpx;height: 60rpx;"></image>
+			</template>
+
+
+		</u-tabbar-item>
+		<u-tabbar-item @click="click1">
+			<template #active-icon>
+				<image class="u-page__item__slot-icon" src="/static/main/index/dkdj.png"
+					style="width: 60rpx;height: 60rpx;"></image>
+			</template>
+			<template #inactive-icon>
+				<image class="u-page__item__slot-icon" src="/static/main/index/dk.png"
+					style="width: 60rpx;height: 60rpx;"></image>
+			</template>
+
+
+		</u-tabbar-item>
+		<u-tabbar-item @click="click1">
+			<template #active-icon>
+				<image class="u-page__item__slot-icon" src="/static/main/index/wddj.png"
+					style="width: 60rpx;height: 60rpx;"></image>
+			</template>
+			<template #inactive-icon>
+				<image class="u-page__item__slot-icon" src="/static/main/index/wd.png"
+					style="width: 60rpx;height: 60rpx;"></image>
+			</template>
+
+		</u-tabbar-item>
+	</u-tabbar>
+
+
+</template>
+
+<script setup>
+	import store from "@/store/index.js"
+	import {
+		ref
+	} from "vue"
+	const value1 = ref(store.state.tabbrIndex)
+	const click1 = (e) => {
+		store.dispatch('changeTabbar', e)
+		if (e == 0) {
+			uni.switchTab({
+				url: '/pages/index/massif'
+			})
+		}
+		if (e == 1) {
+			uni.switchTab({
+				url: '/pages/index/manager'
+			})
+		}
+		if (e == 2) {
+			uni.switchTab({
+				url: '/pages/index/personal'
+			})
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 6dca859..5a74b59 100644
--- a/pages.json
+++ b/pages.json
@@ -18,13 +18,7 @@
         "navigationBarBackgroundColor": "#feb048",
         "navigationBarTextStyle": "white"
       }
-    }, {
-      "path": "pages/index/index",
-      "style": {
-        "navigationStyle": "custom",
-        "enablePullDownRefresh": true
-      }
-    },
+    }, 
     // 和撒旦发射点恢复健康快点发货速度较快live harvest
     {
       "path": "pages/landDetail/index",
diff --git a/pages/addPlant/select_address_n.nvue b/pages/addPlant/select_address_n.nvue
index 60fadfe..ff60250 100644
--- a/pages/addPlant/select_address_n.nvue
+++ b/pages/addPlant/select_address_n.nvue
@@ -155,14 +155,14 @@
   }
 </script>
 
-<style>
+<style lang="scss">
   /* page {
     background-color: #fff;
   } */
 
   .text {
     font-size: 28rpx;
-    white-space: normal;
+    // white-space: normal;
   }
 
   .head_top {
diff --git a/pages/feedDetail/expellingDetail.vue b/pages/feedDetail/expellingDetail.vue
index 12ab30b..34b5fc4 100644
--- a/pages/feedDetail/expellingDetail.vue
+++ b/pages/feedDetail/expellingDetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="card-d">
-			<u--form labelWidth='130' :model="formData" :rules="rules" ref="form">
+			<u--form labelWidth='130' :model="formData"  ref="form">
 				<view class="c-title">驱虫信息</view>
 				<view class="c-box">
 					<u-form-item label="驱虫药名称" borderBottom>
diff --git a/pages/feedDetail/feedDetail.vue b/pages/feedDetail/feedDetail.vue
index 1cf9032..c8b352f 100644
--- a/pages/feedDetail/feedDetail.vue
+++ b/pages/feedDetail/feedDetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="card-d">
-			<u--form labelWidth='130' :model="formData" :rules="rules" ref="form">
+			<u--form labelWidth='130' :model="formData"  ref="form">
 				<view class="c-title">喂食信息</view>
 				<view class="c-box">
 					<u-form-item label="饲料种类" borderBottom>
diff --git a/pages/feedDetail/sterilizeDetail.vue b/pages/feedDetail/sterilizeDetail.vue
index 93a5c0b..6a1e97f 100644
--- a/pages/feedDetail/sterilizeDetail.vue
+++ b/pages/feedDetail/sterilizeDetail.vue
@@ -1,41 +1,41 @@
 <template>
 	<view class="content">
 		<view class="card-d">
-			<u--form labelWidth='130' :model="formData" :rules="rules" ref="form">
+			<u--form labelWidth='130' :model="formData"  ref="form">
 				<view class="c-title">消毒信息</view>
 				<view class="c-box">
 					<u-form-item label="消毒剂名称" borderBottom>
-						<up-input  readonly type="txt"
-							border="none" v-model="formData.user"></up-input>
+						<up-input  readonly 
+							border="none" v-model="formData.disinfectant_name"></up-input>
 					</u-form-item>
 					<u-form-item label="消毒剂浓度" borderBottom>
-						<up-input  readonly type="number"
-							border="none" v-model="formData.breed"></up-input>
+						<up-input  readonly 
+							border="none" v-model="formData.concentration"></up-input>
 					</u-form-item>
           <u-form-item label="消毒方法" borderBottom>
-          	<up-input  readonly type="number"
-          		border="none" v-model="formData.breed"></up-input>
+          	<up-input  readonly 
+          		border="none" v-model="formData.disinfectant_method"></up-input>
           </u-form-item>
           <u-form-item label="消毒区域" borderBottom>
-          	<up-input  readonly type="number"
-          		border="none" v-model="formData.breed"></up-input>
+          	<up-input  readonly 
+          		border="none" v-model="formData.disinfectant_area"></up-input>
           </u-form-item>
           <u-form-item label="消毒人员" borderBottom >
-          	<up-input  readonly type="number"
-          		border="none" v-model="formData.breed"></up-input>
+          	<up-input  readonly 
+          		border="none" v-model="formData.operator"></up-input>
           </u-form-item>
           <u-form-item label="消毒时间" borderBottom >
-          	<up-input  type="number" readonly
-          		border="none" v-model="formData.breed"></up-input>
+          	<up-input readonly
+          		border="none" v-model="formData.create_time"></up-input>
           </u-form-item>
           <swiper class="swiper" autoplay indicator-dots indicator-active-color="#ffb049" indicator-color="rgba(255,255,255,0.4)">
-            <swiper-item class="swiper-item" v-for="(item, index) in 2" :key="index">
-              <image class="img" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/91fb0202311021455371420.jpg"></image>
+            <swiper-item class="swiper-item" v-for="(item, index) in formData.pic" :key="index">
+              <image class="img" :src="item"></image>
             </swiper-item>
           </swiper>
           <u-form-item label="备注" borderBottom >
           	<view class="">
-          	  
+          	  {{formData.remark}}
           	</view>
           </u-form-item>
 				</view>
@@ -48,19 +48,22 @@
 <script setup>
 	import {
 		reactive,
-		ref
+		ref,
+    getCurrentInstance
 	} from "vue";
 	import {
 		onLoad,
 		onReady
 	} from "@dcloudio/uni-app"
-
-	const formData = reactive({
-		user: "",
-		remark: "",
-		pic: [],
-		start_date: '',
-    notes: ''
+  
+	const formData = reactive({})
+	
+	onLoad(function(options){
+	  const eventChannel = getCurrentInstance().proxy.getOpenerEventChannel();
+	  eventChannel.on('setDatasItem', function(data) {
+      console.log(data);
+	    Object.assign(formData, data)
+	  })
 	})
 	
 </script>
diff --git a/pages/feedDetail/vaccineDetail.vue b/pages/feedDetail/vaccineDetail.vue
index 0911e08..5c348a8 100644
--- a/pages/feedDetail/vaccineDetail.vue
+++ b/pages/feedDetail/vaccineDetail.vue
@@ -1,49 +1,49 @@
 <template>
 	<view class="content">
 		<view class="card-d">
-			<u--form labelWidth='130' :model="formData" :rules="rules" ref="form">
+			<u--form labelWidth='130' :model="formData"  ref="form">
 				<view class="c-title">疫苗信息</view>
 				<view class="c-box">
 					<u-form-item label="疫苗名称" borderBottom>
-						<up-input  readonly type="txt"
-							border="none" v-model="formData.user"></up-input>
+						<up-input  readonly
+							border="none" v-model="formData.vaccine_name"></up-input>
 					</u-form-item>
 					<u-form-item label="疫苗厂家" borderBottom>
-						<up-input  readonly type="number"
-							border="none" v-model="formData.breed"></up-input>
+						<up-input  readonly 
+							border="none" v-model="formData.vaccine_manufacturers"></up-input>
 					</u-form-item>
           <u-form-item label="疫苗批次号" borderBottom>
-          	<up-input  readonly type="number"
-          		border="none" v-model="formData.breed"></up-input>
+          	<up-input  readonly 
+          		border="none" v-model="formData.vaccine_batch"></up-input>
           </u-form-item>
           <u-form-item label="接种方式" borderBottom >
-          	<up-input  readonly type="number"
-          		border="none" v-model="formData.breed"></up-input>
+          	<up-input  readonly 
+          		border="none" v-model="formData.vaccination_method"></up-input>
           </u-form-item>
           <u-form-item label="接种部位" borderBottom>
-          	<up-input  readonly type="number"
-          		border="none" v-model="formData.breed"></up-input>
+          	<up-input  readonly 
+          		border="none" v-model="formData.vaccination_site"></up-input>
           </u-form-item>
           <u-form-item label="免疫有限期" borderBottom >
-          	<up-input  type="number" readonly
-          		border="none" v-model="formData.breed"></up-input>
+          	<up-input   readonly
+          		border="none" v-model="formData.immune_validity_period"></up-input>
           </u-form-item>
           <u-form-item label="注射人员" borderBottom >
-          	<up-input  type="number" readonly
-          		border="none" v-model="formData.breed"></up-input>
+          	<up-input   readonly
+          		border="none" v-model="formData.operator"></up-input>
           </u-form-item>
           <u-form-item label="接种时间" borderBottom >
-          	<up-input  type="number" readonly
-          		border="none" v-model="formData.breed"></up-input>
+          	<up-input   readonly
+          		border="none" v-model="formData.create_time"></up-input>
           </u-form-item>
           <swiper class="swiper" autoplay indicator-dots indicator-active-color="#ffb049" indicator-color="rgba(255,255,255,0.4)">
-            <swiper-item class="swiper-item" v-for="(item, index) in 2" :key="index">
-              <image class="img" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/91fb0202311021455371420.jpg"></image>
+            <swiper-item class="swiper-item" v-for="(item, index) in formData.pic" :key="index">
+              <image class="img" :src="item"></image>
             </swiper-item>
           </swiper>
           <u-form-item label="备注" borderBottom >
           	<view class="">
-          	  
+          	  {{formData.remark}}
           	</view>
           </u-form-item>
 				</view>
@@ -56,19 +56,26 @@
 <script setup>
 	import {
 		reactive,
-		ref
+		ref,
+    getCurrentInstance
 	} from "vue";
 	import {
 		onLoad,
 		onReady
 	} from "@dcloudio/uni-app"
 
-	const formData = reactive({
-		user: "",
-		remark: "",
-		pic: [],
-		start_date: '',
-    notes: ''
+	const formData = reactive({})
+	
+	onLoad(function(options){
+	  const eventChannel = getCurrentInstance().proxy.getOpenerEventChannel();
+	  eventChannel.on('setDatasItem', function(data) {
+	    console.log(data);
+	    Object.assign(formData, data);
+      if(formData.vaccination_method=='1') formData.vaccination_method = '肌肉注射';
+      if(formData.vaccination_method=='2') formData.vaccination_method = '皮下注射';
+      if(formData.vaccination_site=='1') formData.vaccination_site = '颈部';
+      if(formData.vaccination_site=='2') formData.vaccination_site = '大腿';
+	  })
 	})
 	
 </script>
diff --git a/pages/feedDetail/waterDetail.vue b/pages/feedDetail/waterDetail.vue
index 147ad2a..2cf2b38 100644
--- a/pages/feedDetail/waterDetail.vue
+++ b/pages/feedDetail/waterDetail.vue
@@ -1,29 +1,29 @@
 <template>
 	<view class="content">
 		<view class="card-d">
-			<u--form labelWidth='130' :model="formData" :rules="rules" ref="form">
+			<u--form labelWidth='130' :model="formData"  ref="form">
 				<view class="c-title">喂水信息</view>
 				<view class="c-box">
 					<u-form-item label="喂水量(L)" borderBottom>
-						<up-input  readonly type="number"
-							border="none" v-model="formData.breed"></up-input>
+						<up-input  readonly
+							border="none" v-model="formData.water_consumption"></up-input>
 					</u-form-item>
           <u-form-item label="喂水人员" borderBottom >
-          	<up-input  readonly type="number"
-          		border="none" v-model="formData.breed"></up-input>
+          	<up-input  readonly
+          		border="none" v-model="formData.operator"></up-input>
           </u-form-item>
           <u-form-item label="喂水时间" borderBottom >
-          	<up-input  type="number" readonly
-          		border="none" v-model="formData.breed"></up-input>
+          	<up-input  readonly
+          		border="none" v-model="formData.create_time"></up-input>
           </u-form-item>
           <swiper class="swiper" autoplay indicator-dots indicator-active-color="#ffb049" indicator-color="rgba(255,255,255,0.4)">
-            <swiper-item class="swiper-item" v-for="(item, index) in 2" :key="index">
-              <image class="img" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/91fb0202311021455371420.jpg"></image>
+            <swiper-item class="swiper-item" v-for="(item, index) in formData.pic" :key="index">
+              <image class="img" :src="item"></image>
             </swiper-item>
           </swiper>
           <u-form-item label="备注" borderBottom >
           	<view class="">
-          	  
+          	  {{formData.remark}}
           	</view>
           </u-form-item>
 				</view>
@@ -36,19 +36,22 @@
 <script setup>
 	import {
 		reactive,
-		ref
+		ref,
+    getCurrentInstance
 	} from "vue";
 	import {
 		onLoad,
 		onReady
 	} from "@dcloudio/uni-app"
 
-	const formData = reactive({
-		user: "",
-		remark: "",
-		pic: [],
-		start_date: '',
-    notes: ''
+	const formData = reactive({})
+	
+	onLoad(function(options){
+	  const eventChannel = getCurrentInstance().proxy.getOpenerEventChannel();
+	  eventChannel.on('setDatasItem', function(data) {
+	    console.log(data);
+	    Object.assign(formData, data);
+	  })
 	})
 	
 </script>
diff --git a/pages/index/index.vue b/pages/index/index.vue
deleted file mode 100644
index 6050cd9..0000000
--- a/pages/index/index.vue
+++ /dev/null
@@ -1,441 +0,0 @@
-<template>
-	<view class="">
-		<view class="" style="height: var(--status-bar-height);background-color: #feb048;">
-
-		</view>
-		<view class="header">
-			<u-icon name="plus-circle" color="white" @click="navto('/pages/addLand/addLand')" :size="28"></u-icon>
-
-			<Myindex url='/pages/index/index' />
-		</view>
-		<view class="content">
-			<view class="serch">
-				<u-search bgColor="white" :show-action="false" placeholder="搜索你的土地信息" v-model="fomData.keyword"
-					shape="round" :clearabled='false' @change="inputval"></u-search>
-				<view class="ser-text" @click="search">
-					搜索
-				</view>
-			</view>
-			<view class="tits">
-				土地信息
-			</view>
-			<view class="card" v-for="(item,index) in datalist" :key="index" @click="navgo(item)">
-				<view class="plant-status" v-if="item.residual_area!=item.total_area"
-					:style="{backgroundImage:`url(${bgc('yzz')})`}">
-					已种植
-				</view>
-				<view class="plant-status" v-if="item.residual_area==item.total_area"
-					:style="{backgroundImage:`url(${bgc('wzz')})`}">
-					未种植
-				</view>
-				<view class="card-content">
-					<u--image v-if="item.pic" :src="item.pic[0]||''" height="150rpx" width="150rpx"
-						style="margin-right: 20rpx;border-radius: 10rpx;overflow: hidden;"></u--image>
-
-					<view style="color:#7B7B7B ;">
-						<view class="card-tit">
-							{{item.title}}
-						</view>
-						<view class="">
-							<text style="color: black;">种植面积</text> : {{item.total_area-item.residual_area}}亩
-						</view>
-						<view class="">
-							<text style="color: black;">土地面积</text>: {{item.total_area}}亩
-						</view>
-						<view class="card-address">
-							<text style="color: black;white-space: nowrap;">地址</text>: {{item.address}}
-						</view>
-					</view>
-
-				</view>
-
-
-
-				<!-- old -->
-
-				<!-- <view class="tit card-li" style="margin-top: 50rpx;">
-					<view class="">
-						{{item.title}}
-					</view>
-					<view class="" style="color: #00A15E;" v-if="item.residual_area!=item.total_area">
-						已种植
-					</view>
-					<view class="" style="color: #00A15E;" v-if="item.residual_area==item.total_area">
-						未种植
-					</view>
-				</view>
-				<view class="card-li" v-if="item.residual_area!=item.total_area">
-					<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="">
-						未种植面积:{{item.total_area}}亩
-					</view>
-				</view>
-				<view class="card-li tit">
-					<view class="" style="font-weight: normal;">
-						地址: {{item.address}}
-					</view>
-				</view>
-
-			 -->
-
-
-			</view>
-			<!-- <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>
-
-
-	</view>
-</template>
-
-<script setup>
-	import {
-		onLoad,
-		onShow,
-		onReachBottom,
-		onPullDownRefresh
-	} from "@dcloudio/uni-app"
-	import {
-		ref,
-		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()
-	})
-	onPullDownRefresh(() => {
-		list()
-		uni.stopPullDownRefresh()
-	})
-	onReachBottom(() => {
-
-		getlist()
-	})
-	const datalist = reactive([])
-	const fomData = reactive({
-		page_no: 1,
-		page_size: 15,
-		keyword: ''
-	})
-
-
-	// 获取位置
-	const getPositionFn = () => {
-		uni.getLocation({
-			type: 'gcj02',
-			geocode: true,
-			isHighAccuracy: true,
-			success: function(res) {
-				uni.request({
-					url: `https://restapi.amap.com/v3/geocode/regeo?output=JSON&location=${res.longitude},${res.latitude}&key=b0c21bc6b220aa882bad8ffb6bce8829&radius=1000&extensions=all`,
-					success: (res) => {
-						console.log(res)
-					}
-				})
-			}
-		});
-	}
-	const list = () => {
-		datalist.splice(0)
-		fomData.page_no = 1
-		getlist()
-	}
-	const getlist = () => {
-		landlist(fomData).then((res) => {
-			if (res.code == 1) {
-				datalist.push(...res.data)
-				fomData.page_no = fomData.page_no + 1
-
-
-			}
-
-		})
-
-	}
-
-	//输入监听
-	const inputval = (e) => {
-		// console.log(e)
-		if (e.length == 0) {
-			list()
-		}
-	}
-
-	//搜索
-	const search = () => {
-		list()
-	}
-	const navto = (url) => {
-		uni.navigateTo({
-			url
-		})
-	}
-
-	const navgo = (item) => {
-		uni.navigateTo({
-			url: '/pages/landDetail/index?id=' + item.id
-		})
-	}
-
-	onMounted(() => {
-		// console.log('22222222')
-	})
-	const u = (name) => {
-		return `/static/main/index/${name}.png`
-	}
-	const bgc = (icon) => {
-		return `/static/main/index/${icon}.png`
-	}
-</script>
-
-<style lang="scss">
-	page {
-		// background-color: $theme-bg-color;
-		background-color: #F5FDFA;
-
-	}
-
-	.header {
-		background-color: #feb048;
-		display: flex;
-		justify-content: space-between;
-		padding: 10rpx 0 10rpx 20rpx;
-	}
-
-	.tits {
-		position: relative;
-		padding-left: 20rpx;
-		font-weight: bold;
-		margin-bottom: 20rpx;
-	}
-
-	.tits::before {
-		content: "";
-		position: absolute;
-		top: 50%;
-		transform: translateY(-50%);
-		left: 0;
-		width: 3px;
-		/* 左边框的宽度 */
-		height: 30rpx;
-		background-color: #FFB049;
-	}
-
-	// old
-	.content {
-
-		position: relative;
-		padding: 0 20rpx;
-
-
-		// padding-top: 100rpx;
-
-		.head-img {
-			// position: absolute;
-			// display: flex;
-			// top: 0;
-			// right: 10rpx;
-			// margin-top: 20rpx;
-
-		}
-
-		.land {
-			width: 100rpx;
-			height: 100rpx;
-			line-height: 100rpx;
-			text-align: center;
-			background-color: #fff;
-			border-radius: 50%;
-			position: absolute;
-			right: 60rpx;
-			bottom: 130rpx;
-			position: fixed;
-		}
-
-
-		.serch {
-
-			// padding-bottom: 20rpx;
-			box-shadow: 1rpx 1rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);
-			border-radius: 200rpx;
-			position: relative;
-			color: #feb048;
-			font-size: 28rpx;
-			margin-top: 20rpx;
-
-			margin-bottom: 20rpx;
-
-			.ser-text {
-				position: absolute;
-				padding-left: 20rpx;
-				top: 50%;
-				transform: translateY(-50%);
-				right: 40rpx;
-
-			}
-
-			.ser-text::before {
-				content: "";
-				position: absolute;
-				top: 50%;
-				transform: translateY(-50%);
-				left: 0;
-				width: 2px;
-				/* 左边框的宽度 */
-				height: 20rpx;
-				background-color: #FFB049;
-			}
-
-			// width: 100%;
-			// height: 100rpx;
-			// background-color: #EAF2EF;
-			// position: absolute;
-			// position: fixed;
-			// display: flex;
-			// top: 0;
-			// // padding-top: calc(70rpx + var(--status-bar-height) + 20rpx);
-			// padding-right: 20rpx;
-
-
-			// .custom-style {
-			// 	color: #606266;
-			// 	width: 140rpx;
-			// 	border-radius: 30rpx;
-			// 	margin-top: 10rpx;
-			// 	margin-right: 20rpx;
-			// }
-
-			// z-index: 8888 !important;
-
-		}
-
-		.border-bgc {
-			height: 200rpx;
-			background-color: #feb048;
-			border-radius: 0 0 40rpx 40rpx;
-			position: absolute;
-			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: 300rpx auto;
-
-			image {
-				width: 280rpx;
-				height: 142rpx;
-				margin-bottom: 20rpx;
-
-
-			}
-		}
-
-		.card {
-			position: relative;
-
-			margin: auto;
-			background-color: #FFFFFF;
-			box-sizing: border-box;
-			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
-			margin-bottom: 40rpx;
-
-
-			.plant-status {
-				position: absolute;
-				width: 109rpx;
-				height: 99rpx;
-				background-image: url('/static/main/index/wzz.png');
-				background-size: 100% 100%;
-				top: -10rpx;
-				right: 50rpx;
-				color: white;
-				text-align: center;
-				padding-top: 20rpx;
-				font-size: 26rpx;
-
-			}
-
-			.card-content {
-				display: flex;
-
-				.card-tit {
-					font-weight: bold;
-					margin-bottom: 10rpx;
-					color: black;
-				}
-
-				.card-address {
-					// width: 60vw;
-					width: 500rpx;
-					white-space: nowrap;
-					/* 文字不换行 */
-					overflow: hidden;
-					/* 超出部分隐藏 */
-					text-overflow: ellipsis;
-					/* 超出部分显示省略号 */
-				}
-
-				.value {
-
-
-					/* 超出部分显示省略号 */
-
-				}
-			}
-
-			// .tit {
-			// 	display: flex;
-			// 	font-size: 33.29rpx;
-			// 	font-weight: bold;
-
-			// 	justify-content: space-between;
-			// }
-		}
-	}
-</style>
\ No newline at end of file
diff --git a/pages/index/manager.vue b/pages/index/manager.vue
index 565f0a6..8e1164c 100644
--- a/pages/index/manager.vue
+++ b/pages/index/manager.vue
@@ -31,12 +31,19 @@
         </view>
       </block>
     </view>
+    <MyTabbar></MyTabbar>
   </view>
 </template>
 
-<script setup lang="ts">
+<script setup>
   import Myindex from '@/components/return/index.vue';
+  import MyTabbar from "@/components/customTabbar/tabbar.vue"
   import { reactive, ref } from 'vue';
+  import { onLoad } from "@dcloudio/uni-app";
+  
+  onLoad(()=>{
+    uni.hideTabBar()
+  })
 
   const list = reactive([
     {
@@ -69,7 +76,7 @@
     },
   ])
   
-const navTo = (url: string)=>{
+const navTo = (url)=>{
   if(url) uni.navigateTo({
     url: url
   })
diff --git a/pages/index/massif.vue b/pages/index/massif.vue
index 5943da0..345cd21 100644
--- a/pages/index/massif.vue
+++ b/pages/index/massif.vue
@@ -234,7 +234,7 @@
 		</view>
 		<u-picker keyName="name" :show="showPicker1" @cancel="showPicker1=false" @confirm="confirm1"
 			:columns="columns2"></u-picker>
-
+    <MyTabbar></MyTabbar>
 	</view>
 </template>
 
@@ -244,6 +244,7 @@
 		ref,
     computed
 	} from 'vue';
+  import MyTabbar from "@/components/customTabbar/tabbar.vue"
 	import {
 		onLoad,
 		onShow
@@ -279,6 +280,7 @@
   
   const userInfo = ref({});
 	onLoad(() => {
+    uni.hideTabBar()
 		// console.log(store.state.userInfo)
 		if (!store.state.userInfo) {
 			uni.redirectTo({
@@ -696,13 +698,6 @@
 
 	}
 
-	.note {
-		height: 168rpx;
-		background-image: url('/static/main/index/JNS.png');
-		background-size: 100% 100%;
-		margin-bottom: 20rpx;
-		position: relative;
-	}
 
 	.area-check {
 		display: flex;
diff --git a/pages/index/personal.vue b/pages/index/personal.vue
index d6972ed..a74e53e 100644
--- a/pages/index/personal.vue
+++ b/pages/index/personal.vue
@@ -49,24 +49,32 @@
 
 
 		</view>
+    <MyTabbar></MyTabbar>
 	</view>
 
 </template>
 
 <script setup lang="ts">
 	import Myindex from '@/components/return/index.vue';
+  import MyTabbar from "@/components/customTabbar/tabbar.vue"
 	import {
 		reactive,
 		ref
 	} from 'vue';
 	import { logout } from '@/api/api.js'
+  import { onLoad, onShow } from "@dcloudio/uni-app"
 	import store from "@/store/index.js"
+  
+  onLoad(()=>{
+    uni.hideTabBar()
+  })
 
-	const userinfo = reactive({})
-	if (store.state.userInfo != null) {
-		Object.assign(userinfo, store.state.userInfo)
-
-	}
+  const userinfo = reactive({})
+	onShow(()=>{
+    if (store.state.userInfo != null) {
+    	Object.assign(userinfo, store.state.userInfo)
+    }
+  })
 
 	const previewImageFn = () => {
 		uni.previewImage({
@@ -187,7 +195,7 @@
 
 
 			position: absolute;
-			bottom: 100rpx;
+			bottom: 160rpx;
 			left: 50%;
 			transform: translateX(-50%);
 			// border-radius: 500rpx;
diff --git a/pages/plantAdmin/addBreed.vue b/pages/plantAdmin/addBreed.vue
index 42d9fbb..b24bea2 100644
--- a/pages/plantAdmin/addBreed.vue
+++ b/pages/plantAdmin/addBreed.vue
@@ -31,9 +31,9 @@
             <up-form-item label="来源" borderBottom>
               <up-input input-align="right" border="none" v-model="animal_source" readonly></up-input>
             </up-form-item>
-            <up-form-item label="栏舍" prop="fence_house_name" borderBottom required>
-              <up-input input-align="right" placeholder="请输入栏舍" border="none"
-                v-model="data.formData.fence_house_name"></up-input>
+            <up-form-item label="栏舍" prop="fence_house_name" borderBottom required @click="isshow2">
+              <up-input input-align="right" placeholder="请选择栏舍" border="none" suffixIcon="arrow-down"
+                suffix-icon-style="color: #b6b6b6;" v-model="data.formData.fence_house_name" readonly></up-input>
             </up-form-item>
             <up-form-item label="现估重(kg)" prop="current_estimation" borderBottom required>
               <up-input input-align="right" placeholder="请输入现估重" type="number" border="none"
@@ -41,16 +41,16 @@
             </up-form-item>
             <up-form-item label="入场日期" prop="entry_date" borderBottom required @click="showDate=true">
               <up-input input-align="right" placeholder="请选择入场日期" border="none" suffixIcon="arrow-down"
-              suffix-icon-style="color: #b6b6b6;" v-model="data.formData.entry_date"></up-input>
+                suffix-icon-style="color: #b6b6b6;" v-model="data.formData.entry_date"></up-input>
             </up-form-item>
           </block>
           <block v-else>
             <up-form-item label="来源" borderBottom>
               <up-input input-align="right" border="none" v-model="animal_source" readonly></up-input>
             </up-form-item>
-            <up-form-item label="栏舍" prop="fence_house_name" borderBottom required>
-              <up-input input-align="right" placeholder="请输入栏舍" border="none"
-                v-model="data.formData.fence_house_name"></up-input>
+            <up-form-item label="栏舍" prop="fence_house_name" borderBottom required @click="isshow2">
+              <up-input input-align="right" placeholder="请选择栏舍" border="none" suffixIcon="arrow-down"
+                suffix-icon-style="color: #b6b6b6;" v-model="data.formData.fence_house_name" readonly></up-input>
             </up-form-item>
             <up-form-item label="代数" prop="algebra" borderBottom required>
               <up-input input-align="right" placeholder="请输入代数" type="number" border="none"
@@ -64,9 +64,9 @@
               <up-input input-align="right" placeholder="请输入出生体重" type="number" border="none"
                 v-model="data.formData.birth_estimation"></up-input>
             </up-form-item>
-            <up-form-item label="出生日期"  borderBottom required @click="showDate=true">
+            <up-form-item label="出生日期" borderBottom required @click="showDate=true">
               <up-input input-align="right" placeholder="请选择出生日期" border="none" suffixIcon="arrow-down"
-              suffix-icon-style="color: #b6b6b6;" v-model="data.formData.brith_date"></up-input>
+                suffix-icon-style="color: #b6b6b6;" v-model="data.formData.brith_date"></up-input>
             </up-form-item>
           </block>
         </view>
@@ -104,11 +104,12 @@
       </up-form>
       <u-action-sheet :show="showSex" keyName="name" closeOnClickOverlay :actions="[{name:'公'}, {name:'母'}]" title="请选择"
         @close="showSex = false" @select="selectSex"></u-action-sheet>
-      <u-datetime-picker :show="showDate" :max-date="Date.now()" mode="date" v-model="changeTime"
-      	@confirm="selectDate" :formatter="formatter" @cancel="showDate=false"></u-datetime-picker>
+      <u-datetime-picker :show="showDate" :max-date="Date.now()" mode="date" v-model="changeTime" @confirm="selectDate"
+        :formatter="formatter" @cancel="showDate=false"></u-datetime-picker>
       <u-action-sheet :show="show1" keyName="name" :actions="animal_type_lists" title="请选择" @close="show1 = false"
-        @select="leavaType1">
-      </u-action-sheet>
+        @select="leavaType1"> </u-action-sheet>
+      <u-action-sheet :show="show2" keyName="name" :actions="houses_lists" title="请选择栏舍" @close="show2 = false"
+        @select="leavaType2"> </u-action-sheet>
       <u-button class="btn" @click="submit">提交</u-button>
     </view>
   </view>
@@ -137,12 +138,15 @@
   import {
     animalInfoAdd
   } from "@/api/manage.js"
+  import {
+    fenceHouseList
+  } from "@/api/manage.js"
 
   const form1 = ref(null);
   const data = reactive({
     formData: {
       fence_house_id: '', //栏舍id
-      sn: '', 
+      sn: '',
       animal_type: '',
       brand: '',
       physi_stage: '',
@@ -187,14 +191,19 @@
 
   const showSex = ref(false);
   const showDate = ref(false);
-  
+  const changeFlag = ref(false);
+
   const show1 = ref(false)
   const isshow1 = () => {
     show1.value = true
   }
+  const show2 = ref(false)
+  const isshow2 = () => {
+    show2.value = true
+  }
   const animal_type_lists = ref([]);
-  const initAnimalTypeLists = ()=>{
-    animalTypeLists().then(res=>{
+  const initAnimalTypeLists = () => {
+    animalTypeLists().then(res => {
       animal_type_lists.value = res.data;
     })
   }
@@ -204,6 +213,22 @@
     animal_type.value = e.name;
     data.formData.animal_type = e.value;
   }
+  const houses_lists = ref([]);
+  const initHousesLists = () => {
+    fenceHouseList().then(res => {
+      houses_lists.value = res.data.lists.map(item=>{
+        return {
+          value: item.id,
+          name: item.fence_house_name
+        }
+      });
+    })
+  }
+  initHousesLists();
+  const leavaType2 = (e) => {
+    data.formData.fence_house_name = e.name;
+    data.formData.fence_house_id = e.value;
+  }
 
   //图片删除
   const delimg = (i) => {
@@ -240,37 +265,37 @@
     // let res = await Uploads()
     // data.formData.pic = res.data.image
   }
-  
+
   const gender = ref('');
-  const selectSex = (e)=>{
-    if(e.name=='公') data.formData.gender = 1;
+  const selectSex = (e) => {
+    if (e.name == '公') data.formData.gender = 1;
     else data.formData.gender = 0;
     gender.value = e.name;
   }
-  
+
   const changeTime = ref(Date.now())
-  const selectDate = (e)=>{
+  const selectDate = (e) => {
     let date = new Date(e.value);
-    if(data.formData.type>1) data.formData.brith_date = uni.$u.timeFormat(e.value, 'yyyy-mm-dd');
+    if (data.formData.type > 1) data.formData.brith_date = uni.$u.timeFormat(e.value, 'yyyy-mm-dd');
     else data.formData.entry_date = uni.$u.timeFormat(e.value, 'yyyy-mm-dd');
     showDate.value = false;
   }
-  
+
   onReady(() => {
     form1.value.setRules(data.rules);
   });
-  
+
   const formatter = (type, value) => {
-  	if (type === 'year') {
-  		return `${value}年`;
-  	}
-  	if (type === 'month') {
-  		return `${value}月`;
-  	}
-  	if (type === 'day') {
-  		return `${value}日`;
-  	}
-  	return value;
+    if (type === 'year') {
+      return `${value}年`;
+    }
+    if (type === 'month') {
+      return `${value}月`;
+    }
+    if (type === 'day') {
+      return `${value}日`;
+    }
+    return value;
   };
 
   const submit = async () => {
@@ -307,8 +332,8 @@
     }
   }
 
-  const animal_source = ref('');//来源
-  
+  const animal_source = ref(''); //来源
+
   onLoad((options) => {
     if (options.type > 1) {
       data.formData.animal_source = +options.type;
@@ -317,9 +342,12 @@
       data.formData.animal_source = 1;
       animal_source.value = '购买';
     }
-    if(options.id) {
+    if (options.id) {
       data.formData.fence_house_id = options.id;
       data.formData.fence_house_name = options.fence_house_name;
+      changeFlag.value = false;
+    } else {
+      changeFlag.value = true;
     }
   })
 </script>
diff --git a/pages/plantAdmin/breedDetail.vue b/pages/plantAdmin/breedDetail.vue
index 81fa9c5..5debaaa 100644
--- a/pages/plantAdmin/breedDetail.vue
+++ b/pages/plantAdmin/breedDetail.vue
@@ -12,7 +12,7 @@
         </view>
       </view>
       <view class="video" @click="navTo('/pages/live/live')">
-        <u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/91fb0202311021455371420.jpg" width="100%"
+        <u--image v-if="dataobj&&dataobj.pic" :src="dataobj.pic[0]" width="100%"
           height="300rpx"></u--image>
       </view>
 
@@ -171,8 +171,8 @@
       id: typeID.value,
     }).then((res) => {
       if (res.code == 1) {
+        res.data.pic = JSON.parse(res.data.pic||'[]');
         Object.assign(dataobj, res.data);
-        console.log(dataobj);
       }
     });
   };
diff --git a/pages/plantAdmin/houseDetail.vue b/pages/plantAdmin/houseDetail.vue
index 886eefa..00b2bcc 100644
--- a/pages/plantAdmin/houseDetail.vue
+++ b/pages/plantAdmin/houseDetail.vue
@@ -12,7 +12,7 @@
         </view>
       </view>
       <view class="video" @click="navTo('/pages/live/live')">
-        <u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/91fb0202311021455371420.jpg" width="100%"
+        <u--image v-if="dataobj&&dataobj.pic" :src="dataobj.pic[0]" width="100%"
           height="300rpx"></u--image>
       </view>
 
@@ -36,7 +36,7 @@
           <view class="thing-card" v-for="(item,index) in dataList" :key="index">
             <view class="card_body">
               <view class="left">
-                <u--image @click="perviewFn(item.img)" radius='10' :src="item.img" width="250rpx"
+                <u--image @click="perviewFn(item.pic)" radius='10' :src="item.pic[0]" width="250rpx"
                   height="250rpx"></u--image>
                 <u---image class="qr-code" @click="perviewFn(item.qr_code)" src="/static/main/house/su_yuan_ma_btn.png" width="60rpx" height="60rpx"></u---image>
               </view>
@@ -223,6 +223,7 @@
       id: typeID.value,
     }).then((res) => {
       if (res.code == 1) {
+        res.data.pic = JSON.parse(res.data.pic||'[]')
         Object.assign(dataobj, res.data);
       }
     });
@@ -236,10 +237,12 @@
       page_size: 3
     }).then((res) => {
       if (res.code == 1) {
-        dataList.splice(0, dataList.length, ...res.data.lists);
-        dataList.forEach(item => {
-          item.showCode = false
+        res.data.lists = res.data.lists.map(item => {
+          item.showCode = false;
+          item.pic = JSON.parse(item.pic||'[]');
+          return item
         })
+        dataList.splice(0, dataList.length, ...res.data.lists);
         // console.log(dataList)
       }
     });
diff --git a/pages/plantAdmin/moreBreed.vue b/pages/plantAdmin/moreBreed.vue
index af87c31..142af09 100644
--- a/pages/plantAdmin/moreBreed.vue
+++ b/pages/plantAdmin/moreBreed.vue
@@ -6,7 +6,7 @@
           <view class="thing-card" v-for="(item,index) in dataList" :key="index">
             <view class="card_body">
               <view class="left">
-                <u--image @click="perviewFn(item.img)" radius='10' :src="item.img" width="250rpx"
+                <u--image @click="perviewFn(item.pic[0])" radius='10' :src="item.pic[0]" width="250rpx"
                   height="250rpx"></u--image>
                 <u---image class="qr-code" @click="perviewFn(item.qr_code)" src="/static/main/house/su_yuan_ma_btn.png" width="60rpx" height="60rpx"></u---image>
               </view>
@@ -118,10 +118,12 @@
       page_size: where.value.page_size
     }).then((res) => {
       if (res.code == 1) {
-        dataList.splice(0, dataList.length, ...res.data.lists);
-        dataList.forEach(item => {
-          item.showCode = false
+        res.data.lists = res.data.lists.map(item => {
+          item.showCode = false;
+          item.pic = JSON.parse(item.pic||'[]');
+          return item
         })
+        dataList.splice(0, dataList.length, ...res.data.lists);
         // console.log(dataList)
       }
     });
diff --git a/pages/plantAdmin/moreFeed.vue b/pages/plantAdmin/moreFeed.vue
index d971ff1..16446eb 100644
--- a/pages/plantAdmin/moreFeed.vue
+++ b/pages/plantAdmin/moreFeed.vue
@@ -10,8 +10,8 @@
                 <u--image v-if="item.pic" @click="perviewFn(item.pic[0])" radius='10' :src="item.pic[0]" width="200rpx"
                   height="200rpx"></u--image>
               </view>
-              <u--image src="/static/main/house/xia_yi_ji_btn.png" class="next" width="38rpx" height="38rpx" @click="navFeed(item, index)"></u--image>
-              <view class="right" style="color: #7B7B7B;" @click="navFeed(item, index)">
+              <u--image src="/static/main/house/xia_yi_ji_btn.png" class="next" width="38rpx" height="38rpx" @click="navFeed(item, current)"></u--image>
+              <view class="right" style="color: #7B7B7B;" @click="navFeed(item, current)">
                 <view class="r-item">
                   <view class="item-title">操作类型:</view>
                   <view v-if="current==0">{{'喂食'}}</view>
@@ -93,12 +93,37 @@
       url
     })
   }
-  const navFeed = (e) => {
-    if (e.type_name == '喂食') navTo(`/pages/feedDetail/feedDetail?id=1`)
-    if (e.type_name == '喂水') navTo(`/pages/feedDetail/waterDetail?id=1`)
-    if (e.type_name == '消毒') navTo(`/pages/feedDetail/sterilizeDetail?id=1`)
-    if (e.type_name == '疫苗') navTo(`/pages/feedDetail/vaccineDetail?id=1`)
-    if (e.type_name == '驱虫') navTo(`/pages/feedDetail/expellingDetail?id=1`)
+  const navFeed = (item, index) => {
+    if(index==0) uni.navigateTo({
+      url: `/pages/feedDetail/feedDetail`,
+      success: (res) => {
+        res.eventChannel.emit('setDatasItem', item);
+      }
+    })
+    if(index==1) uni.navigateTo({
+      url: `/pages/feedDetail/waterDetail`,
+      success: (res) => {
+        res.eventChannel.emit('setDatasItem', item);
+      }
+    })
+    if(index==2) uni.navigateTo({
+      url: `/pages/feedDetail/sterilizeDetail`,
+      success: (res) => {
+        res.eventChannel.emit('setDatasItem', item);
+      }
+    })
+    if(index==3) uni.navigateTo({
+      url: `/pages/feedDetail/vaccineDetail`,
+      success: (res) => {
+        res.eventChannel.emit('setDatasItem', item);
+      }
+    })
+    if(index==4) uni.navigateTo({
+      url: `/pages/feedDetail/expellingDetail`,
+      success: (res) => {
+        res.eventChannel.emit('setDatasItem', item);
+      }
+    })
   }
 
 
diff --git a/static/img/ADL.png b/static/img/ADL.png
deleted file mode 100644
index 1acfad2df0830cd900b88f7e460369e10c732cf0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3888
zcmV-056|$4P)<h;3K|Lk000e1NJLTq003A3003AB1^@s6ag{JM00001b5ch_0Itp)
z=>Px@>PbXFRCr$PTzkwMRTV#HRwF1vCA<-AL;{G?-5GfpAQY7d8l)f^P?45M1QG-i
zqVR_S${#{ZL<p}C0r3%tf;<(7$|IJS;m&RmOi>=C6f6`=3us&E++%+0xtse<XLs-H
z&V1izvXeAvyEAw0{mr@O@jK@prpZ++0$l6plfh{MaLqz60eAv%%?Q*y{6vB$0N0E_
z&BIS5cmi<E2-H0Mtdrnov)ODk8i$F<TxOmxB6FB|u81u6u$V(cYnk~SBHAP(4_Rv;
zBBF;oozB{tF)KCvj04<kHs>@Njbn)DTSW9Ro&8QCLd;>)!@Web!2`U*%(ob0ZYqUF
z4L66apoSMWo6TdQC_0Uq4-k<pnR&~qUgH2KqPIolF%h|-)9G}o8o$gq(++U6*__{K
zG_Dbm4-?T={iM`Mu!yW;<}I)&5$SG!W`>Huzag~)rCrBaBO;cWPc_EeQ3jxK@0~V)
zePEe+tD=cpYu7|k^ez!SXRTclMbYC~maXk{I?%71T{`9*YwbZ%6deK;BO(IOi|!YZ
zcbIv3mSt!58*^Mh^Uv1~u<F>mMWmSr7SbgmYnU05cx9Gl_l~=j)kq#CBBzVU2bg)=
z{4UX*@VK@1#JY`QtpG#9qA0qZh~NqIKCW)tRU)#~T6^BOp!SnGfE`8AVrD*6y^$$%
zAfmUdwa3&c&9wm>$MN;d{AD8ACI`S;5&5IF_S{aV<GWr}@6O(M&1Q3M6h+rE^MM6G
z!`-{q7;}Cd6Q~?uRSBtx?Bsg}BC?K|S7urEjk+Xu7(fa%jNIPL{62TT8p~x_mK|QT
z%BU1z1$QYC?VelgIwHE%81sW+AWX;atyb$2xQPDlQnmGLmSqQ3336osE4Yt~$X-t0
zsz3Uwwf2iMCACBJ^KY5?Lqyc|!4>2cS(eSK3gk)vE&`W`){Dq%*4kE8ldW31b>2@9
z(QXc8eMe;=R|0U7ByDxW90u!&=!q=Lj-9RGx``^t@N^E$f&8K|=A+|&)Ug3>wOZFO
z^U0n;gXI1-P18?}JGtq6K91wNnE7*_x`2>em!|32<IH0$fRiLyKtw-v#zJ-O%huZc
zX1nATffmOx_=<U+4Owfg#V#z2Btw878DMpJ{>;qVdoOw|%d)-yAHl^MR9!41q8&XK
zZk@Gu?x<@T8Q>&I{v;xYcoEuK)wv^o?GTBm`yLIov4(Ddq@KkRW6YtWyn7^om1Oxf
z5pAb0-C(V~yxne}H_9Yt+cQa$oG&8hG4s|sw^dn|fww3vJR<>|B*|Zh=o20=&l+R)
z?gvzoBxi`o{@%7*(Qdad2mw}A(Ug0wwHMVLW+zDkRk4>h$ES@kpA4C^e@|(E<2YVO
zM3*^EmWbZSvg|8^zAlUhGtW~a2tIdRmSqb<Btmz~gWj{GA#G`CDg#b_mxAiF)*c-)
z=WzjE!OU>XyZVWU?oZS7$U&3OTW5Xt)ih0a9kys?<R0{+Lu)NKgIWQ`ypkkYA|eNS
zc4nC|W}jhm9vNW$s<#o*wmJx;_lRL(a36r-FJCcCZ_gyaP*06U<1r%Y68NJ?aVZr6
zXPk(R_M~ZPnx@TRU$h8doiJRW<{*7KlK`s}Ba}YC+p%}2Y5JvMYj(c}0}LNAilV<c
zzgI-wLIf9*;~D@k^l`@+)9N?jSpe_?5xL2E6e`8Lh5E(80IPAk+J(d-vN}!E9YVfj
zKY&##27aiS23Vzdl?y&Z1R?YpX__K}9eM==oLBfFa$B0F#}9o25e)*^Qx%2L(rf@Y
zj^i7cd682S%>0Nk21(YTR~dl)uNbTzFoObs*NMnBxjfyCX_}srpK%oc$8mfiGxvOH
zV@&Y6F&~}7uRQg*E=|*J>A<in=tXKxA0?ulb-*=QmhBO$hYCoPmzWu$Xm66p^cE2-
zRRK&y7vO{9J!zVPWG{6kN%GIK-V<IB1Ta`L5xLnb0C_o0(|lT}?}Up0CZY$J`GjE{
z>?{Jf7ul)*zbHfx2LTKnL_~{J0w4vqwcG6={ad6WMC2v7XN^W9&s?ECVzHmQn=Jsh
zTCHC)^Vb{(M09xwR~!m(H`H|^Dk2x9X?kJk9xIaIG)?C!pM1Ty_3-glTWb$+zVU1U
zSiPtlJ-ZQP=z;)FlH_S3+E)SHkY(9XWkS_{0QZq@_{I+!V?N^<n6W}-7`btEutu@>
z5|OKudp=E5R}I=%)`9?z<9InUe?;As<<{CoRRNq2M|Gw>GHA9)u+9S#Jl6@DF=l8*
zXehv_e(4g>*4mXKa#B?QV@$16ILk?gen_PIv1?HNG#exsHskk>14kiEh^rO~urI-I
zr@&?f*V_(K5pHkAaol6+6yR>s(OP@QFo0FMZbd!t0K0&SdFc4Jh-l4#`v6=azY@ps
zn_lVcORyuu?9iwHmr4YN09=qI0T`$VLRPnDT;L+*>B@rbJ8a#3e}{+D54hR@PLkvw
zj<TymMR-z-)cMh#w}QXo97eBDd!_)^%u3sn;GlpdRD$83c8le37^O-h=ZjLGtS+|n
z)`JLlO;p|@B3%n#a3NxJq4@?>9Q6}n5qYx6$JZTpv&RkBri0-|9UDSZdXky1H|V<!
zHR1SOFC{eviy{dgrVpxe(@^W|NpPiZS})Mhs`N{TWg`4Vhv;Dce)!!YvTxD(jhO;C
zj^neL`7&>w)dd=H9RHYz&ho;<p?SD*0M;$vbBX-1W(wd|tAzsYZ`TznPx*Qx@=BVf
zI3*Nxm6c!&svK;d4C*FY%O*XmP!WC_zjCriB?@7pJH3Ns=bq!xmBW0<B7>(!cBTN%
z)0O*&)Mf;E5m;D~BtGE|uj0f|LpO>9>pM|gm?wj#9bomd@AN8tUNgoN9u>=P=`sK>
zA)<qw6cJHyc6C&M733+k2{WN0;yAul5A+1rf;gaq0R~;i%-48q5-MGSva4D{{Aus&
zZb;Mgpb!PF4nD%*_qhA5wF^sz>ZnF?b-tU*)-K0!{JK{~3P1Yv5V9Tf4F*_s;`5HX
zEt_2p0dqFqquHEZ+8#VcnRHn&z;3%bHKAavFvfIg%>31AwGPAoMN!n$vuQX}yji5h
z%s7yU>P-0BI77EI)Ob$E2k{FXLrcZ{d6fkixw)UaBe5vLKv`!LMQ=w@g!;52wa>!_
zY-tg}ndE-qYi}N2Dr%)08)xc>=pJkBeeHJp;pqS~|Biz2xO4$vDS*{KokA-TQ6?h)
z@+@qnSRjSe)n&{t5YaW$*#jbu<7bHI;~o!ED%o2~2RqaX%2%fV>NV1U1a74VuaPG2
zb|?{%O$wNkaQqWQ3_6$KH{AQaK4CK28N91KAa3Y%I(Jt3HFYr98)m)=S#M^J)N{hS
z&j~edrM(D$A$f8fi4GBYgPB*0$RC*bp+Rj3`hnuw6Nt!socIxu9Ymy&KQXVm5Hu$E
z;`^<&cU1wl9v(lFnZF<+J2EqS0yD74yx*Eis|XC_%2-9D*D3&uY`5EJ4O8i*i~bG~
zeI7=#57?+Qg7m*GB9CG&FqngMw@T@}D2nD<YmZ~*MD>6E@H*DBY15`n$1YvE^q#Vd
z8wp^%q@Xw%X_)UDW3C<`p~!1pOGNNI5N?-hjN!mm2}8oM#}m7Ex=MHvaRw8r2_6h0
zQEdG!w2KPV7n*l$pYIRkSJUfnLCjgvx<>}M&oM3>7C}mXvwWR`(>uMRlR*cPlR`so
ze*x;Bo}xW}x?N84K$Vd;1@%8f^j=>z<m)ubj5(5#%P+FvAmW?W+Bi>yIF1)7AQ8DL
zilT+kb3{~%nJZeLemv;y<3$8kf1?71W=q>RiR>Ak|0O>+5)qP^Fs?9UPcid;BC?BT
zV4>p|jv@eK8M&OnLuqG^R_xan00~2EQ4#5q^&Ww}(iqb{^HJpm(D6PEbdHFkD26nO
z$nThWnY9+pK+q4U<JvHY$nGAv>#eo7x7+Qnk29~4RfKz~R=z*U%zOBHkeShY;RL5H
zz^9_s0TDgV%oh{UVl0S=3J=4m3iu%mk9ra>WLb7v84d#TLCpnt2;>wspqX;i*L4cW
z9od3}2c?9Dfj>6D>Q$h*Tv4xxUJZqM9(SNF*!vLZGPRju)IyX~;iVAKMu4L`13bWI
z%YY1;RaFuATqJHcxiVQ*EjV|wo1auw;i#lBM<oC|kfSJis$jCP-WS8WP^p9iA88-6
zEAw4Yw3NyyxF~ozN5k*$X`7m7j4}Qp$bmu>$MGvfv<n&_>5Ut$wO@^*Xjf*w!gn=2
z^>$<knLbQ<$2M~L7xde1V4%<kO+-!}M&u|hdLt3RBiYB@@6n~;KZ3I<IAuyi7m3Jr
zXdfmbFA~vX%nUN$9Y=FZnY}G#ayl6W8eshML=U7H^}pbi3olphpRfJWtOAO_aniHU
z73?>rJ_|rU2p`%@eYr;f{Hi*-vs9)c{Kcu^`w=rAmv8F@ZUPh~5nWP5+_?0Nj(3)e
z{gWhlfQSw+bGpg<=&qe3TrhXQ+x?95BEKm*9}=PhhTT&O!0x50bFU+!?F+i^K_>$2
zOR_Ax*;gH2T?Begu4m?k9-86MQ~h37S9mK3>8G@FRNr_tGha9;`Wyz}u-|J1SdAZ!
zqyEBLyH6BFd7TG$2mqpz^6#J{vn&Jm3;z{qB9sPnOSW);oQT@Sn8OFC0=x@E|LH`u
z=YX!R80%^6;Z|#NyxIZww`mkbKU4moh){92z5!PXMh=mdh-|Hf={__K^}z*Eqs^G+
zt6s(F^qu>K%v!C9c8cFDQ{OyHN(cQuZ2-GTD4)C-yl=lQtnOY1lx}ALj!cQWT)pqW
zM$R6!iO~4mvV871;C6T3xC4y(ydHo#mx$0F;Qb+~rIPQ$$N0C1Ji^R3jKe3CeD9Ro
zXAEFZbwJ-PVCHU%ao7L13^V3QI+{6SP0xwQPf#5{%<motypU&S9N_#UHGBn8gFn!%
zsO?3gQRw5Yicn4$sU@flq;f!mc95Aa6Gn#sH10jK4&ZSYG~1q^09^AInE*TixMl=u
y9)2Rh6M$<*pyuHx5<CI8W&~;;ej>p&1N>ju(z5SJOcEOa0000<MNUMnLSTZKn=A|f

diff --git a/static/img/AHL.png b/static/img/AHL.png
deleted file mode 100644
index 1acfad2df0830cd900b88f7e460369e10c732cf0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3888
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

diff --git a/static/img/AQHL.png b/static/img/AQHL.png
deleted file mode 100644
index 237eac848c91fbddfdfff4bedf9d4c058bb901ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2364
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

diff --git a/static/img/CO2.png b/static/img/CO2.png
deleted file mode 100644
index 95288fd79960eaa46c26c8518af8f657b14cfd38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2534
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

diff --git a/static/img/CTPH.png b/static/img/CTPH.png
deleted file mode 100644
index a1a430b03928e102eb336dd5c7a7aa24e223f1f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1990
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
YKT~Q*s7^ti*Z=?k07*qoM6N<$g4ub%ZU6uP

diff --git a/static/img/CTWD.png b/static/img/CTWD.png
deleted file mode 100644
index 2fa401a5907d7f811bb1ad93c7153e9647bcd564..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1873
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
LNkvXXu0mjfpWb<M

diff --git a/static/img/DD.png b/static/img/DD.png
deleted file mode 100644
index 4d5b6babc0501df8172fc03a2744326c46b817e0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 507
zcmV<X0R;YuP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px$wMj%lR7gw3l+jTFF%X6~*#_u9I&euExDx0<?BGhk4(LFhe6|Dd)tQT-0<{9M
zfMlJYNoEkdg9jMzEpy4Y|Ni?YhOYFPD{<-n!6Gtd=0(?a({s8!Te0_ksjA};LUS>2
zQTwi{4<Us4#lX(Fb%8BI2+NCrMWnIT&W$l!RsABOj{^Q2Dss|esLeT}eE`RRGIOh{
zambcIu!xAYc4dr-wf&URy|os_B*wVyv*ifvoP#>eIRm!A!5HJNeeXR$&ncx>B6=bs
zVdh&^9p#)~VvKbb#}@=DnHeol5ifX)>{j)q7zQ{izC%4k#QhF>6|3r6RX26Ba}J=#
zl+pwQbb!G!^9=-?qZlcG(gp|6dI(|RoLc}ELTHg|Yi*4k6vKjH#U)-%oj5GO3Ge+h
zrL;x|*i-#17R^v_e~?F30HCS@u!xM98Ole<EY^sewRQ(8H&Rp;LWaS$s&lS|9re*E
z>$|S&CfIYhK8#&&j;p%8LG9G`txtk+(~L1fL~lq25sk_qA!1wpt#I?oO~h;WopWvn
xb6hK9D1esruZa)+tLIO?73aKUf9<&%_y^qB5GLe|+r<C?002ovPDHLkV1m(8<%0kK

diff --git a/static/img/FS.png b/static/img/FS.png
deleted file mode 100644
index 284fcaf811ccd0c45f7c6f973f724d4f87621902..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 828
zcmV-C1H=4@P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px%_DMuRR9Hvtm@#M+K@^7PO%kvXEeu#Fn94>kH!}(bBPzyDu(7a6k)RUALJP%M
zh?W5nTMH#AEG+^e2-=8OM99qC-kBp}#48k1cp=3>E|=YTGO!0n$Yry0x5pjacFWFt
z@7sU=efxHSblCx2#!Gs@N$*%s;jUFUolajx#1+r;mRfleiCKbk{u=;}Az}sqCZv?V
zS^=Ioa0s~?1i?r)n=LjAoh0xXLdabJ7`Kp!IH#1F>{#F$m=NMCA!HO0%WG?EgT-R8
z(hPKB3fG`G=T8CPnLQ7JV5nJJv;+7(09+x2_@z>5f8q)YAr2U04#wTaAPDvi3=B*V
zLZ-vmjFj@+_B^Rn>No(DJ<t2Qml}}@*Kg@w5;j=l`@VnC^SsRV>zwmh+x8G~0TFL&
zt-amqBo2&->&BSLY&JW;6G#m>>?CCX7?V<dYXlt$%osZl02f@;MZ~4e&CQR6LZRF!
zo-uZcQaVKlxfwz)E2U0a&+ily3G4#u62m!v2>|y)=n<vVLPrBL#>Ob6pF-eCrPN$U
z19Q%&0N|B{G{#)kT7T|XV8+-bO6gld$YJ}CRw|XFjeOtG!;G<O0PsA*kMERH5AB-T
zbmrpU`WR!(1FiLo*j<8iJ^=u;y8+Y>G%WzOU13H_`NXLY4-XHI_VxAMhyc!Lt>1(S
z+ub<iqA&n_uU4xc^7;I7RD8#@wJ6Zq^&aqEm2zDdOJO0zJw%K>x!GyV7_+Fg{^APi
zWQk@w0U|E?zCWJJ<$kz=$5Oai;1F_kYisLtE|>e`0v!uDl}a6<l=jCh6b|!`?A#l^
zdS7d;Z^g}H*T({ODNr9Hgvb*@P9WkxrPQEHzP19_59?A&r`k?IF3J!>`Z?!6!@ogA
zrPPp1p0)s|)9JI6(&_N)*>c*M;c>?T3n8!$ZaMsIwcZWD^BWr*cM65Vstat}x&&kF
zIshyxrB+-)o!)fK7HdU(TOPVrfc6w_rHZ@d>RBRbrT+tW*E&2+63#LJ0000<MNUMn
GLSTZ@8*}~u

diff --git a/static/img/FX.png b/static/img/FX.png
deleted file mode 100644
index 0a63309393a7b98f91502e4efef1069ff405f8b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px%b4f%&R9Hvtn7@nEKorNnFR{47!d><c*uvt#CYdR0w6L?Z5VWv35Gw@{6i-fJ
z1)Bryv=A0fP_YrbKR`k7?3|e_$YP<WASh^IA?y{qc`~vKA>{WG<z!N3-n{q8cfNTu
z31N?2w8wbifZJZN|3_gV#0G$a%>2#sygN#%A8o5wC4a8MQp#5Vj@Ts3{1d=+t@V8X
z(<+JEipd2QLYya}yUD`L{EnF~7-L?v1yq)|NZ}rUuK@O?lQ8o(5nWbFeJCqXG%lsQ
z2w)Y!jjEO_eCdP`&xq(mPSITew<nXy=6F2*)dXA!u|-5{)^bENP)gk^vs@u?7>1`k
z&wEk=^M#q$wbqa8LN9<9^Qu^`5V+s(uXMZJ??kk}F3ghgL#5QYtQ>{FK@c49ec$?c
zr3`?XKV`)9?8DBxjO{e(>(6-V=58Fv17pl)ZQw8r&w8FWEP`d`9cI2{jCqreOL%mk
zwZ54*p18lw%vZG5@AGOFDxB=a840X+uW79x<t48H{5Fnb`_RwJRx%ej2!g)v`yVqB
zRPGKHfKLJF)!C4WHjWJ<x|ITcI#)G!$&&G9z-4OI^01WB00`!jDlgeT0}jLRBoQ3~
z@Okdj+GmKrs&JF#s@o-+)M)iQ>=Xvt`KGg5dZ*JlOhoHMbex$V#Bn@~qUd!K8zkqn
zVhJI{86tX^hMP{OM@OU4&N9$#0k09!RvK(Jn;nay=%oW*Mgcol2;mf7i0C}*ERlMl
zoF$wkoFy`L8MkpHL~&ihiXo+3W#+3%w=nb6{v?T_DC-YU<>N~$3RkY)AkYCf5Uth}
fr*JK~8U+6aW-*pLN6ky{00000NkvXXu0mjflfpxd

diff --git a/static/img/GZ.png b/static/img/GZ.png
deleted file mode 100644
index 32c2ec1720868449c6ec7ca7350883092b45f0fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1415
zcmV;21$g?2P)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px)K}keGR9Hvtmw$*<RTRh1xo<{hz(6*Ih5TbB!C2PW_wG%wGTH?Nr521<N-9!N
z@Q)xRA!8F142_TkgN%|k3=9-9G+Izd$UlU<_dRxH7;vrqC)z)3^AF*TyZhdWBX^eP
zFf%*9Hd@&C=X>{_`?=ryz2}^Vu*e=<WW2BhywE4Mr0}9rIG4-yq*AGO5b=!G`tCx&
zx789-%BzUD82~P7t#|zIft6Cf06-rAT-RFnF98G8pNBoqdkqmc7K_EB`F#FCCH3l6
zSW5XO5%oQM`0#K(pPy{xB<l9CQfdYOQUGu}48tvz7ODqWDfJ!zoMK2K`p6jb@qz$L
zDbFF|TQ+zh48#6%Xes4sM0~dzND>wRCa0&T`^Uz{3JU_v>MEtq1HfP<XxDXLK*UV|
z@H`^^4glkbI8sV)<*)$IueELnme;M@5*G3?=s1o~0KkY4f{)m(q*NTo7ljaq0D$4x
zQta8LV4DHvIShT8h_({ZO(6s;&LE{{l8BZg;_|Y0e<Gp-06UvewiK&Th36Pt*L~S>
zoJ$N#M4UBF6pO{PC11O)>k1*>PxzjdU9Yvi*NA7!$2JAr)zy{h=;#<j#I+W7i!tVA
zl~k9^3d6>j-TyhT=Xrxdhzq=M6h(W3Ao#i#gp~3!BEA9uvr!bS3WDH%v(Qx)<|9YM
z?TDE4=Y!eV+0WDI^nL)?$LdZ^O|6=km?+i)@H}s`5aKG2iQ{;O@B0_q4xA_ykHsdU
z5k$;1(lfZOyTWmte{7(GTI-Y6R+stR)YQ}fZ`yWyKLEf@W6ax?HdR$&rPNnM#GO|;
z@G&6-7mz+8x?zlYaXz&w0Vh?DqNqOzg6mSsAw)dJ@wC<z*_yg^N~teewS<&%7b1RR
z?|~NtL7<d64gj39+Y9V@-Wx&)u6pdrJ-+XsZS>MfDL+NTgFG(`!zZ|*QcCef9wed(
zW6YX{EKv)fLR#xH#^^@Unw0X6O^dgTF&lWUl=2Tm>>{Eo#+ZS20jGL;dY)XiY}p1x
z<O}ksa1havFbszag~H#wkW%VtZh{bTmtA<SaJa6!-EkbA%O`Zm_x(?#lxq?3PV!yL
zz}?;5%QKnG&)nq1aXg5KoruVN#9Zp*;{*UM%_|cNPR4OO;QRh98-t4uD|tVT<29U@
zJ<mICdk&bHnOQ$NI(oY$;O_43&P*nA!FFVG%Glff836QDvC*X{iVg%pz#B=~BC^#g
zdC>R$lbl6_5NwAPL^NlSrhyqYo6Yk7+A}r?|77mu%2f)gl-fi@F984_Ef<n;BKpx7
zGtOgjx!mehDs{fJVIsO_jM>I9lG!1OqE~|;;2x#oQ&(D(QvQaB&sKx2bwPW3d!KR~
zXAc1EX9exp8(|o3<IKQ)wBtC}?Oou4@m#HVbpb1-{sMqb`}_WwvgN^*QY(pQh))9%
zSC?Cbh`uiti+dT?UbJ6rZ0<8Qa6WDsm;=Xg+!F-Bm81<S1@=7e10e)A_T^7NM2C$r
z9D^;gE}c$a0|4F>|KII1#(Y@|mcP}d@O(j%-?<-1r_<+%h>yR3h^*L8TI(C7aZ<|H
z0pLu@B1Ck`7;~VWb=nSGYf;bhdJ*viB0kCzR@o!Qn4|T;E{MX(g>BAV$4!)NRW~L;
zIS22ql@Tg!qU{P>OK_jTDKObfm)4(+<9JvI@nJK+OKk_PcImhRBI0*M^ld3O*K331
zxV8hc4YJwn5D{^ce~*anA|h9>M+KzSr|rP40?jvn33xt*TK&GHaH|T=H-FJ7{4Zs)
VuuGkFTDAZH002ovPDHLkV1mk{q)Pw*

diff --git a/static/img/HJ.png b/static/img/HJ.png
deleted file mode 100644
index 3c1c288704da36266abef6d01149836e5f61e48a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px%pGibPR7gv;Rk3apK@gqUOBGqd6m&@V4>;~p!%<O1n9_0)R}m78QRrjSq9~z3
zN~%z~btLz8MC%=G(j^U{K#?erks_r?b_dPr_E;x&KuEsk)^~Gn-+S|RjIf{!7laFU
z0>^P&jiP7`05WF&hKN-FxCa1zYwe*i=4>9Z5?DZ#Qrn1FW9AV6pscO6JH{9j0>p8g
zDW&QFFmcZPP)a>;&V4k-OnhAloTlkM00_I!a<|sLF~)ql%c?kzKPaW%Nev<zt@V>z
zz)6w_%dgJ4w^0-gnfZW-I(Gr5Y1(Jzm%fIGN}}Z=Ns=}qZUcbGj;*!NjWHvU9YxV5
zGsm8pwYD3)6L9hUh=}r<yv{F*M!jd|pU%0y_?je12N5@Cv1aD3D3b30pr({+Ip;dw
z=a6v=5hq&fz5o?Whq7K@Ux&TDJ*ZSF&}cNE*XzN>#RYg(Qj?}>otdjdB)$5>SemD`
zZh3a%IU+uj-{bKZvMht$-Q65?Fc{=z%zQ{hng2#S*IG+j<^!i`D$x<|a^RDb6Cfhk
z+S)3eVde=D-4B3Ea#L{&8Q%mJrmL%~xfSQ<=N{{q)>=HyuTXUeT*{E5n^vr>tiZ;`
zhCGL6v-$5<BuOG&J(C#CYo2f9Xf%S;)6-eas}a%8&A3Tq+C<b28u-_^g*I4g+qdFY
z$nW?J2l<w{ARFZ2XJ%96btEbQ;L-K<_4lQvrHA23otkdNAnH5k>fu0{bwK>#Vdf)5
ze0+6v_4N4o_=~T-H8ulqku^2d!VQY%o{4;=l=P)PmvJCpMyPmQb<PcqF$W=NamrpJ
z;tOWpM?|sYl|Qvp&6_2+U|&bXeD?Ypnb((>m&4`d<t{VV3buI~=2|gpga3K9u>ZW@
XTb!3B0s&u~00000NkvXXu0mjfy`5m~

diff --git a/static/img/JY.png b/static/img/JY.png
deleted file mode 100644
index e55d5b8f029fa629205519bbf8e5dd908c25ae00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1356
zcmV-S1+)5zP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px)21!IgR9Hvtm|bWbRTO~Fnc0U;=tCqCDhjU9hPZ~^nR^?k4}k_OR$8%QeGnhC
z*kZtd5fKFoR#Z?BjHnnvq2g1qpkPF$fd*PpG55~wrY<o>8lghLZV05Xo3MMYoG=r{
zad&5ScKs>lzU;Dd?>XO`dwv(;23vT8@xnIn-+g1-7A6bZwtYK&uCK3`OQq8FZd$!7
z7S3cc>HhxyCjsCH0PF>Tln<%3UIu^}M4S>r{L(3W$H10lJz$#VGyv?3fT?M%r&m^1
zo?BjCt|kTV2$*yJEC9UOj&iN_e6?B~OX@0#fjQ@o0l=vc?B`0U(}*~)l&S$h1`+Q?
z#BoII^Y<#H<{ZZvYv)D%y@`M=%jz=><8lDvno{Z!$8lyGL2%9owAP;>;(-A4F~@N}
zY8N^YFk|c`L_Fy!tJUlE{jTfIwNjqVW_P61>2rv<hxSo0N-6L7M}Rr!4ggr5;!{$}
zqj3~lmbK3`&2s@Ok2sDqALndhmtc(TLc~jfv~|Cfawe`)&iU^EFyOuHY`tEeEEEbq
z#XTR}C5DEE`g?nODbK!uh?%6m$QUEv-#YJu*J`ziVzKyh6nG@C=X>O{69ABIBG3hZ
zaUsMHQ3@Gjmk@DRgMC%4_2W{?)2(E*1kPr&J9~P1&H})26bJxNVVIOszSnB6Wm%SC
z7zY7h$jcg=?%@Zp*7}f?@|$KdS^=jRW9Jc(O0B=h3X~15de+_>x?ai{hh5kGGR6zi
zmK5jwX#jZLFXvk8RYcq^gt*p7MpNK$71LVJRIAnFrBaDtx0YpD#|*=G3lVpCKVB)9
z%e&htzxjOrP%4%BEC4+vrF^C>;81YP2_g2=wKo#tDg45JR<GB`qVjTB4rA;cFHY#u
zRUyPJv4Jhi%9y5kIdEW92yvm+HFM72r@#Y%i{)~8q#X;BT=H$xG%3Gtu8ob2I~Nuf
z7Q;Flx<oj^3n3!22?@^Sa<>(WMRJ*jHxcF6oO2y@OASF7V-!r^1rFcjy6$R}!cLx3
z`t0fHS@UIRt?!mnejnGueWqzrMe-Z*Ng>4Bod89hwQc($!!XYH`_|UhZeChi`b(y0
zdew}vul(*xYkgfQb-;DqZ<{I3=ks>~z-pmT_$|06pU>Y40DY~>uQ##$7|8b*gb<^#
zgDwyRB*eEe<=|<p^_1f{zXpXd#-2jNcLAWPlp6IL8r!z_7>044a<<lbqES)tDk-&|
zhkcn!sfQiM*|K&}SIb}ufCSG_aTsx3m&)<x;+#_lwvWDRtxrfPU!(7#Hk4B1R@3f*
zJ{s;#wANosDer4`labMH+x8PQKn4l}L5)i(KWGAcQcC%9D`2nWQwj^ufs2(&Wu(>k
z6bbCP2j%7G0f4S;v0kq~7|a@hs!09Bs2|<UENt8M5yLP(4O#I_rBXQ>HS5I!j*4*K
z=PBr1*QK$3b2S5|5zA}jhqczTN~t&ER>rOYH+rd7J{-pgZDon10z=s&IQ#u6=#t9+
z|5})Heo!fO#c`ZMln*DhE}iR&g*oT10Kf?n7;G*7vpyUu9FckWU$-!0>?|VQ)1cD5
zh={Lxzt2i3X$a_Ob;~8_f3^>)NvhRqqs3zJB2ndXx#3hQMROsIPsfB1A9qCCEgvR`
z!NI|SR4P>sS1RfmYPDLrQLC5)zAF|^qB!Z9ZQ!Jqi+gU{!f`E?bl)FMx?D@9CYeV7
O0000<MNUMnLSTX|--z}A

diff --git a/static/img/PH.png b/static/img/PH.png
deleted file mode 100644
index 4b65200cab4471a2337618eff69b7d0100dfac24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 493
zcmV<J0TTX+P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px$r%6OXR7gv`l;KgsFbstydx0=P!vq*-fQAja0qq8K0=fb11e6W30qp?snGG^R
z8Nd=J&hDil<&vYtzY?GG>FMRk2v=HoB`*9Q*cfB9)-SD2s=BT>X+MOp^xk`G?HmA%
zbMC3H>mQ1ZF{Re}9RS{#`GAOXW?mD~PWD3x58nHowRQynrE{(v1x|pXC@N;oh-h^Y
zFaUS}IEX4{UJy|eJ2?tu=KW~J(TWBUeO=d8vWS_NMC7&BVo^RCoUBOl68K^s4*^?i
z#kL6%-FxpF`KB)wnZ!su_TG!f-^&<tvTuyZ0U(Rf6U!#;F3%2#fVyCLj|HS^w`eX!
zl8|0-jM$xX?l!8Gp~+i6F_Y)tu7e{u27bcKTcy;EWY;;j?N~8YN*P2vgb?<kP&&|B
zKLWsvnH%Ta;>2SaQAB+G%caE3n>6AlRun}c3Z?q!#mpZ>R3`6Fz|xjdszSu+7;+cd
z8#mb$zY+0y2wd8id!(I`v*4J7Tqz}2;!HByDe?&bRS03-j#&H5po_jW9P(|GrfX2#
jhO|BA%pk>Mfa&ZPYmY1@ob21^00000NkvXXu0mjfJTcoX

diff --git a/static/img/QY.png b/static/img/QY.png
deleted file mode 100644
index a9635ec4c20029a28643435aac77eb549f3e936a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 359
zcmV-t0hs=YP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px$AxT6*R7gwhl)+8IKoCV|ybVAFaO1k3DFAchgj|A42n|4>0+&Ds_zVX^0Xx|W
z5Ok0RydPO|B!`F`>?8-oo@d{V-u@Y;106mPm;M;odw=4bD?$j(P?@ThZQCwljH};N
z?o=Tnb7sB|A#BvC>Iy(@X7kBlRekCpA%sd*0pMXTU=dk#U^6TJ!P8W9KTbqd7cmie
zCZZcNb3?}>(h||DnO%GD3+LS1&*W^yO++FygNSMXj{rWF%jMM&oagxqGhZ<C9TCj{
zoSNDBFnU{H@4e5mtYPLe0PiWKD#rLJBC|dfbvHPD%_V@Zlu{XEj61>mT1v-RLhBJ8
z(=~uwGppBkH#+Y9mSeyvrDo{)I4Z_;I%>O3dFWs&z5!xA!xsfU0mT3S002ovPDHLk
FV1i41kN^Mx

diff --git a/static/img/SD.png b/static/img/SD.png
deleted file mode 100644
index b0cd21d93e12d3b7ff62b78fab76fc4131a98f26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1361
zcmV-X1+MyuP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00001b5ch_0Itp)
z=>Px)3rR#lR9Hvtm|=(&RTRh1IrE;r0V4y$4GI(#Y}vOvb4Mw$$iTo43JMAe3Q8Lk
z^+Cues6Mqpkb)ly3<U)Rg@g<R35$$~3cYtmS4>b)C`ic2XyM7ex%b48d9rMe_0D?}
zCHTJVd+eEWe)oU>_uexX;XeD|eZ~t9fdB0od!Vo=97WNJAP91;^^a96Ub(_i6fFpX
z;ClhJ)-KPo?0S{Zl>!eA4$cX~P+*4&$gI_BJ$vcWrHQJbD+NxH<Wm6Hz|3C?AR?{;
zfMZ(gjsH8~IF8>Wq7Rt)IwCF;KxRIRhzkH<r`CFR70{I^9LMo<M07`0=iKr%P0z{q
zIF6SRQOD0Kvn>0rU+BJplO&l30OJ5Kz|5~1V?Le=rIdOV5kCTeUt|ng>zn;R_YJI+
zI)#X<0pPgSdVM#TBuPF4fOX7#(ipS$KLhqvub71t03Po)3uOk-v%<}0bIGh(vjn1%
z=lR<6=g*&<sqo0i$eLQMc7mBF+U@qT@$vD?Wk5Tzy#m*iQr{xt(*UqnYyFB(@i>n6
z5z#0!|6q(+?(@v_n4W;ATESY|%(Cp3Pw^;<<_19^3skJ}vN7fppXa8=lm;Fg92{sg
z8b2Z8T<6@zG)<3{DH_M|CL%h*%(oD6aoJs?G_X?Y03vRa)65w2LK)ajtWxT<oPy4|
z{b`!MR3=9$;Njunp?bY83$13Yjk7Gv$`tFwMo|<6K_GeZ$;ruPnFUx1SSfV`5jQdO
zL1WDJUSOxF+?lDP#+c2%xx9gkw(*Ln+itg;7cN}5=v$;)Trpd+0CQ{YV&68@8#qal
z_W<CXe!M#!yyIm67}Hw6>mz_Suu|%pbY9H7)fjU)j^hykm`g;N*7{GMVqJi@AmSnE
z@Qg7FeR6mK7k0QN30tk!V~s}RMMNAc3gn`?b8c^zWuN;LO_Jo{B3BrO;ji-DTD#E4
z7GA({9Iqmx)6#Kit)EDe<Y(FZyTE14{FX81i*DdULqqfH_4*hQZ2^F*TI*(#Bmz8O
zt$jYrvNQJ@uotjWY8xUR=uBObBs^1MQJk5_(lq@>;)aKZpQ_brGX0~{dvu=FTH|!9
zRRSDE(aInQzLwL;81u*s3g4^V-T!w6uax>jPR*(nUWACUrQPvx7=}jxV5K)*_rNo)
zR%>&|!;_PfPx>4nUY3x0Ns{~q0P~!4qeL_Z0QU3=yu&#+K}7oj;HK94QJ;KefcF8w
zoz@T$*D~`JnM$7`(__S1&bfuMkP&fdnUm8SxOkyFTWmq=5OEO^?dk>CIk%IUuLePI
zyvXO>mv{q9Vx`mxL|g*^H(IS$+-NjDL`2!5yg$r*`1bAFZ-ike&CfvDdy7)Qa)1y~
zDpp|Tb9tVxuhnX=BjOGpVrJfx=lSk>y?#n=hYD+my584WrGN{SS0myHX@X>00brAJ
z?ja(2ySVB32YYc6zE4Dd0l-nQlQccdyxtfy<GbMWWTk;6K^(^$i0Dvp2uR_>*4ka|
zcKi3)vu8hph%(i3^K*lU&g6MMKL~=Ig?(h86U@B5?Awau><L&NEShkE?p*u{peTM0
z5#_J^7A2P!igv`hXszAaYxCbTa8bP$MbS1Q5+5&_$;Zrm**Uj6%d&%F2OrOOi|H5m
zZq8!cTj87=Dl8#Zxk*Hqt+ikEs%Rx1?p2*Co~umZDqwtaJOK7lsh^npPT{`+zu#X=
TXUxMp00000NkvXXu0mjf@t%_G

diff --git a/static/img/hl.png b/static/img/hl.png
deleted file mode 100644
index af82fefd1c4d4024f8276d1bf932c3b47d5e7786..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 625
zcmV-%0*?KOP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px%D@jB_R7gv`Rnc)8F%aFA_&4dm=|GXbGsYE|bU+6t9ne9p1YAMzO#VXyrzjPe
z4nhH}HuG+DH{#$tNoE}Va2(Rx_uf7&OmDRKjc{oa*g1D=t^KO1Pcg>kZwZ_MJLeWe
zbVw;3@NBL9PDD>_+phi@IE1hzqB#*QM8p+ve5M){1&uLxc$ag=&(GJ24vf9`hn(}$
zTDwuzU5pWh&Q=Ivhr+6wnE8ljBKjdBpHfQrKCBuTayQJJL}WGISgcu#$Qo*Z;GCNq
zWA->Rw(HgA8Dk!q*#SgVp=dXj?woVhTCjdsler4)y>FQLk%*ol8^FwbOGHZ|dMVO7
z)>t6~6_NXt(!PIp0bH866p>}Uv6pVGZB+Fk=lmWFVTZN$mxz3*8+``sy<ahNBO(iI
zf=p(<DOUXKrIse%v~7D2BC6_QjGbjy8GG*`8;RIpgZCcNV8MZz?|QlA^1Pf*r;oGQ
z>|0M{61aFZNGia46oT(WbgYVk#I`ha@cV*s&!TPHI)aFjsw$YTiRg2m@49I3|70pA
z7~|YN=e)0*IZ^}mxV5km1kQ)hgvXr~wSVIzgb<Dx1I8EtcTK!V1rdGeqlA>?oH3M!
ze3snqRCOL>#Fa*q;Xj_6-l~fnLn0zJz68}}zzjjoyGWi5lc~5>mjH(!RCUYD@E36d
zBg_-VuzC&j!itfPn8zzsMUJ~Hqd7U}?RY?4WBvdCnx?$_)AzptF=>G&s`!M~00000
LNkvXXu0mjf0Z=0`

diff --git a/static/tabber/a-a.png b/static/tabber/a-a.png
deleted file mode 100644
index 701e847631d2052dccc2b20aca59d54a5f6ce127..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 772
zcmV+f1N;1mP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px%zDYzuR9HvtSM5<7F%aF=6@XJgOa&3T0&pq-Du_FXsUW5TNC!>@Kn0irq#PB*
zsUV>M-DaLgnlWeJ>Ao@{Gw6@UKHcu~d;7`s$_~FWJoE-ArO050wARxs%TD3Qd;eGz
z#U|yn>G>c)#+Vys{=DlzM3&CEtG=Lm0Sc_#5|M^u5qZKVGk*v`3h(_zAGSIJGRDk_
z=$e@)MD$EVb8GD#faH08PDCprIueoJM0Dw#!}r#wH6X3^L@5Oz00dSZ%d(tTSpa)V
zsk_LQh^)%8yex_W0F$Q`Ag#4lO5HN^G=RBs&Mlj)8)KHt{3YDqlw}DCixi?Hpo-z2
zft7X2FrI6zXG*CRGrte_7uMRZy|N4vWm$&6odpB;-g`*Yiu&j@*g+hfh2Pd8;1Ak4
z$WV~zAqK99EV>3~l?7wWf|()nHsH&${CG&hgMf@N1%eXk93)C=-%>)vA|yn4D6F+7
z)%W%Qft@VNzK6>DuB${TU_ruP!Tw2=r9*&bS(ZH@t(|i*eo}rqJvYXznfcUv57}NM
z$Y4NVl!#&$J+-OMe+5vG_If7^BTL946vEoL8y!$33%6C9h$cJLxi*VpixH8jbMB^1
zP$y%^7_&jK3t4y`W!h~UBC>JL9d`;YH0bIJsIE;x9U3SK=Ck*HTFt_cMVN_>i0C3V
z-nPIx1KMdN->kLUMq533o})5<5|L!j8!TA_)Z{F62P_g1*xd{K-V6-^l;=6-r!(*U
z@WPn-_mCiUXVkP$Ir|rY(6vzzYcnWjqKIIG-K#ad7^>^WZPT~uUYsV{_A(4+u^S(^
z=}lcghK=P%-84}*4{f_K1}SD9WfqE{MMQ_e@7`LAE#<|jn;5ZSU~|}Rq+_43v7qJb
zjj@eGei+inoQcqMQ4edEgyhySHajVMZ-D+ghW-HfKP^M!ht>H20000<MNUMnLSTY!
CQeVda

diff --git a/static/tabber/a.png b/static/tabber/a.png
deleted file mode 100644
index 06d0260eff4011bffb8695b959459fa97c7e590b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/static/tabber/b-b.png b/static/tabber/b-b.png
deleted file mode 100644
index 37fe8386d1db5797a0ec18c2c520950f80dcb996..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/static/tabber/b.png b/static/tabber/b.png
deleted file mode 100644
index 1edff9bbb76ed507c41f2bc1733adb247e3f115e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/static/tabber/c-a.png b/static/tabber/c-a.png
deleted file mode 100644
index 001143780f92cd97c1911bb1724eee0d67b75cbd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/static/tabber/c.png b/static/tabber/c.png
deleted file mode 100644
index 383123106c674e40afb8d178d9d1ace4c8cbd3e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/store/index.js b/store/index.js
index 63be680..35ef77e 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,37 +1,44 @@
 import {
-	createStore
+  createStore
 } from 'vuex'
 const store = createStore({
-	state: {	
-		userInfo:uni.getStorageSync("SY_USER")||null,
-		farm: JSON.parse(uni.getStorageSync("farm")||"{}"),
-		house: JSON.parse(uni.getStorageSync("house")||"{}"),
-	},
+  state: {
+    userInfo: uni.getStorageSync("SY_USER") || null,
+    farm: JSON.parse(uni.getStorageSync("farm") || "{}"),
+    house: JSON.parse(uni.getStorageSync("house") || "{}"),
+    tabbrIndex: 0,
+  },
 
-	mutations: {
-		saveUserInfo(state, info) {
-			state.userInfo = info
-		    uni.setStorageSync("SY_USER", info)
-		},
-    setFarm(state, data){
+  mutations: {
+    saveUserInfo(state, info) {
+      state.userInfo = info
+      uni.setStorageSync("SY_USER", info)
+    },
+    setFarm(state, data) {
       state.farm = data;
       uni.setStorageSync('farm', JSON.stringify(data));
     },
-    setHouse(state, data){
+    setHouse(state, data) {
       state.house = data;
       uni.setStorageSync('house', JSON.stringify(data));
-    }
-	},
-	actions: {
-		saveUserInfo({commit}, info) {
-			commit('saveUserInfo', info);
-		},
-    setFarm({commit}, info){
+    },
+    changeTabbar(state, index) {
+      state.tabbrIndex = +index
+    },
+  },
+  actions: {
+    saveUserInfo({ commit }, info) {
+      commit('saveUserInfo', info);
+    },
+    setFarm({ commit }, info) {
       commit('setFarm', info)
     },
-    setHouse({commit}, info){
+    setHouse({ commit }, info) {
       commit('setHouse', info)
-    }
-	}
+    },
+    changeTabbar({ commit }, info) {
+      commit('changeTabbar', info)
+    },
+  }
 })
 export default store
\ No newline at end of file