From 167df46b786ef95f076015b825d7242f7be1e255 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Thu, 12 Jan 2023 17:07:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index 3766c30..95fd718 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -73,7 +73,7 @@
 						color:#10C176;
 					}
 					.more{
-						color:#10C176;
+						color:#999;
 						font-size:24rpx;
 						margin-left:auto;
 					}
@@ -172,12 +172,20 @@
 						background:#10C176;
 						margin-right:14rpx;
 					}
-					.plant-xinjian{
+					.plant-jiantou_zuoyouqiehuan{
 						margin-left:auto;
 						color:#10C176;
 						font-size:28rpx;
 						&:before{
 							margin-right:8rpx;
+							color:#fff;
+							background:#10C176;
+							font-weight: normal;
+							border-radius: 50%;
+							width:34rpx;
+							height:34rpx;
+							text-align: center;
+							line-height: 34rpx;
 						}
 					}
 				}
@@ -255,7 +263,7 @@
 		<view style="display:flex;">
 			<view class="card mana">
 				<view class="title">
-					<text class="plant-dikuaimianji"/> 地块管理 <text class="more">更多>></text>
+					<text class="plant-dikuaimianji"/> 地块管理 <text class="more" @click="$u.route({type:'switchTab',url:'pages/massif/index'})">更多>></text>
 				</view>
 				<view class="item">
 					<text class="over">西南角一号地块</text> <text>35亩</text>
@@ -298,7 +306,7 @@
 		</view>
 		<view class="card base">
 			<view class="title">
-				基地管理 <text class="plant-xinjian">新建</text>
+				基地管理 <text class="plant-jiantou_zuoyouqiehuan" @click="show=true">切换基地</text>
 			</view>
 			<view class="matter">
 				<text class="plant-jilu" style="--c:16, 193, 118;margin-right:40px;">农事记录</text>
@@ -315,6 +323,8 @@
 				<text>投入品</text> <text>[示例]今日完成了草莓园浇水任务。</text>
 			</view>
 		</view>
+
+		<u-picker :show="show" :columns="baseList" closeOnClickOverlay @close="show=false" @cancel="show=false"/>
 	</view>
 </template>
 
@@ -324,22 +334,23 @@ import request from '@/common/request.js'
 		data() {
 			return {
 				mapContext:null,
+				show:false,
+				baseList:[['东方红壹号基地','东方红贰号基地','东方红叁号基地']],
 			}
 		},
 		onLoad() {
-			
+			this.getMassif()
 		},
 		onShow(){
-			this.$nextTick(()=>{
-				// this.$u.getRect(".title").then(res=>{
-				// 	console.log(res,'---------res---------')
-				// })
-				
-			})
 			
 		},
 		methods: {
-
+			async getMassif(){
+				var res=await request("/api/plantIndex/queryPlot",{
+					params:{companyId:""}
+				})
+				console.log(res,'-----------res----------')
+			}
 		}
 	}
 </script>