diff --git a/components/colorui/components/cu-navbar.vue b/components/cu-navbar.vue
similarity index 63%
rename from components/colorui/components/cu-navbar.vue
rename to components/cu-navbar.vue
index def8557..07b988c 100644
--- a/components/colorui/components/cu-navbar.vue
+++ b/components/cu-navbar.vue
@@ -7,12 +7,32 @@
 			top:0;
 			left:0;
 			width:100%;
-			height:calc(var(--status-bar-height) + 100rpx);
+			box-sizing: content-box;
+			padding-top:var(--status-bar-height);
+			height:100rpx;
 			background-color:var(--bg);
 			color:var(--c);
 			&>.left{
 				transform: rotate(180deg);
 				padding:10rpx;
+				text.plant-youbian{
+					font-size:45rpx;
+				}
+			}
+			&>.content{
+				top:var(--status-bar-height);
+			}
+			&>.action /deep/{
+				&>button{
+					background:rgba(255, 255, 255, 0.1);
+					width:96rpx;
+					height:48rpx;
+					line-height: 48rpx;
+					text-align: center;
+					font-size:30rpx;
+					padding:0;
+					color:#fff;
+				}
 			}
 		}
 	}
@@ -24,7 +44,7 @@
 				<text v-if="isBack" class="plant-youbian" @click="$u.route({type:'back'})"/>
 			</view>
 			<view class="content">
-				{{text||$root.$holder.navigationBarTitleText}}
+				{{text}}
 			</view>
 			<view class="action">
 				<slot name="right"/>
@@ -34,7 +54,6 @@
 </template>
 <script>
 export default {
-	name:"cuNavbar",
 	props:{
 		isBack:{
 			type:Boolean,
diff --git a/components/form.vue b/components/form.vue
index 66e96b6..205dc34 100644
--- a/components/form.vue
+++ b/components/form.vue
@@ -1,6 +1,10 @@
 <style lang="scss" scoped>
 	.d-form{
 		&>.u-form-item{
+			position:relative;
+			&.tip{
+				margin-bottom:17rpx;
+			}
 			.textinput{
 				width:100%;
 				display:flex;
@@ -106,12 +110,18 @@
 					color:#BFBFBF;
 				}
 			}
+			.tip{
+				position:absolute;
+				bottom:-20rpx;
+				font-size:20rpx;
+				color:#FBA83C;
+			}
 		}
 	}
 </style>
 <template>
 	<view class="d-form">
-		<u-form-item :label="label" :prop="field" :required="required">
+		<u-form-item :class="{tip:!!tip}" :label="label" :prop="field" :required="required">
 			<view v-if="type=='text'" class="textinput">
 				<u-input :placeholder="placeholder||`请输入${label}`" :value="value" @input="input">
 					<text v-if="suffix" slot="suffix">{{suffix}}</text>
@@ -136,6 +146,8 @@
 				</u-checkbox-group>
 			</view>
 			<view v-if="type=='calendar'" class="calendar" @click="show=true" :class="{noData:value.length<=0}">请选择{{label}} <text class="plant-rili"/></view>
+		
+			<view class="tip" v-if="tip">{{tip}}</view>
 		</u-form-item>
 		<u-picker
 			v-if="type=='select'"
@@ -169,7 +181,6 @@
 
 <script>
 	export default{
-		name:"dForm",
 		props:{
 			label:{
 				type:String,
@@ -183,6 +194,10 @@
 				type:String,
 				default:"",
 			},
+			tip:{
+				type:String,
+				default:'',
+			},
 			required:{
 				type:Boolean,
 				default:false,
diff --git a/components/index.js b/components/index.js
deleted file mode 100644
index 8f86707..0000000
--- a/components/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import cuNavbar from './colorui/components/cu-navbar.vue'
-import dSearch from './search.vue'
-import dForm from './form.vue'
-
-const components=[
-	cuNavbar,
-	dSearch,
-	dForm
-]
-export default{
-	install(Vue, opt){
-		components.forEach(v=>{
-			Vue.component(v.name, v)
-		})
-	}
-}
\ No newline at end of file
diff --git a/components/search.vue b/components/search.vue
index 0031e9d..7e103c6 100644
--- a/components/search.vue
+++ b/components/search.vue
@@ -29,6 +29,6 @@
 </template>
 <script>
 export default {
-	name:"dSearch",
+	
 }
 </script>
\ No newline at end of file
diff --git a/main.js b/main.js
index 2ab4fb6..33d2112 100644
--- a/main.js
+++ b/main.js
@@ -2,11 +2,16 @@ import Vue from 'vue'
 import App from './App'
 import store from './store'
 import uView from 'uview-ui';
-import colorUI from '@/components'
+import cuNavbar from './components/cu-navbar.vue'
+import dSearch from './components/search.vue'
+import dForm from './components/form.vue'
 import {defineObj} from 'black-knight/lib/config/custom'
 
 Vue.use(uView)
-Vue.use(colorUI)
+Vue.component("cuNavbar", cuNavbar)
+Vue.component("dSearch", dSearch)
+Vue.component("dForm", dForm)
+
 Vue.prototype.$store=store
 Vue.config.productionTip = false
 App.mpType = 'app'
diff --git a/pages.js b/pages.js
index fb3ff53..456f679 100644
--- a/pages.js
+++ b/pages.js
@@ -11,14 +11,14 @@ module.exports = hot((pagesJson)=>{
 			...require('./router/stock.js'),
 		],
 		tabBar:{
-			iconfontSrc:"https://at.alicdn.com/t/c/font_3852037_qesfnqbc6t.ttf",
 			color:"#999",
 			selectedColor:"#10C176",
 			backgroundColor:"#fff",
+			// iconWidth:"35rpx",
 			list:[
-				{pagePath:"pages/home/index",text:"首页",iconfont:{text:"\ue602",selectedText:"\ue602",fontSize:"30rpx",color:"#999",selectedColor:"#10C176"}},
-				{pagePath:"pages/massif/index",text:"地块管理",iconfont:{text:"\ue866",selectedText:"\ue866",fontSize:"30rpx",color:"#999",selectedColor:"#10C176"}},
-				{pagePath:"pages/home/my",text:"我的",iconfont:{text:"\ue941",selectedText:"\ue941",fontSize:"30rpx",color:"#999",selectedColor:"#10C176"}},
+				{pagePath:"pages/home/index",text:"首页",iconPath: "/static/tab_home.png",selectedIconPath: "/static/tab_home_active.png"},
+				{pagePath:"pages/massif/index",text:"地块管理",iconPath: "/static/tab_massif.png",selectedIconPath: "/static/tab_massif_active.png"},
+				{pagePath:"pages/home/my",text:"我的",iconPath: "/static/tab_my.png",selectedIconPath: "/static/tab_my_active.png"},
 			]
 		},
 	}
diff --git a/pages.json b/pages.json
index 79c6a26..db5269b 100644
--- a/pages.json
+++ b/pages.json
@@ -12,6 +12,7 @@
 	"condition" : { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
 		"list": [
+			{"name": "登录","path": "pages/home/login","query": ""},
 			{"name": "首页","path": "pages/home/index","query": ""},
 			{"name": "仓库管理","path": "pages/warehouse/mana","query": ""},
 			{"name": "仓库基本信息","path": "pages/warehouse/info","query": ""},
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 2c8f741..3766c30 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,5 +1,5 @@
 <style lang="scss" scoped>
-	.content {
+	.container {
 		background:#F6F6F6;
 		padding-bottom:20rpx;
 		min-height:100%;
@@ -224,7 +224,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<image class="head" src="@/static/banner.png" mode="aspectFit"/>
 		<swiper :display-multiple-items="2" circular>
 			<swiper-item>
diff --git a/pages/home/login.vue b/pages/home/login.vue
index 115cd41..912b263 100644
--- a/pages/home/login.vue
+++ b/pages/home/login.vue
@@ -1,8 +1,10 @@
 <style lang="scss">
-	.content{
+	.container{
 		background-image:url(/static/login_bg.png);
+		background-size:calc(100% + 400rpx);
+		background-position:0 var(--status-bar-height);
 		background-repeat: no-repeat;
-		padding-top:440rpx;
+		padding-top:calc(460rpx + var(--status-bar-height));
 		.item{
 			display:flex;
 			margin:40rpx;
@@ -23,16 +25,23 @@
 			margin-left:30rpx;
 		}
 
-		button{
-			margin:auto;
-			display: flex;
-			width:80%;
-			margin-top:90rpx;
+		.res{
+			position: absolute;
+			bottom:80rpx;
+			width:100%;
+			color:#999;
+			font-size:24rpx;
+			text-align: center;
+			text{
+				color:#10C176;
+				padding:30rpx;
+				margin-left:-30rpx;
+			}
 		}
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<view style="font-size:52rpx;margin-left:42rpx;">登录</view>
 		<view class="item">
 			<text class="plant-shouji1"/> <input placeholder="请输入手机号码"/>
@@ -44,7 +53,9 @@
 			<u-checkbox label="使用溯源系统账号登录并同步企业信息"/>
 		</u-checkbox-group>
 		
-		<button class="cu-btn round bg-green shadow">登录</button>
+		<button class="cu-btn round bg-green shadow submit" @click="$u.route({type:'switchTab',url:'pages/home/index'})">登录</button>
+
+		<view class="res">还没有账号?<text @click="$u.route({url:'pages/home/register'})">立即注册</text></view>
 	</view>
 </template>
 <script>
diff --git a/pages/home/my.vue b/pages/home/my.vue
index d5f6bb1..3a886ad 100644
--- a/pages/home/my.vue
+++ b/pages/home/my.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		min-height:100%;
 		background:#F6F6F6;
 		&>.head{
@@ -52,7 +52,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<image class="head" src="@/static/my_head.png" mode="aspectFit"/>
 		<view class="card">
 			<image class="headImg" src="../../static/logo.png" mode="aspectFill"/>
diff --git a/pages/home/personalInfo.vue b/pages/home/personalInfo.vue
index 42756da..065d198 100644
--- a/pages/home/personalInfo.vue
+++ b/pages/home/personalInfo.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		.item{
 			display:flex;
 			min-height:80rpx;
@@ -25,7 +25,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<view class="item">
 			<text>头像</text> <image src="@/static/logo.png" mode="aspectFill"/> <text class="plant-youbian"/>
 		</view>
diff --git a/pages/home/register.vue b/pages/home/register.vue
index 6d5d212..7951da7 100644
--- a/pages/home/register.vue
+++ b/pages/home/register.vue
@@ -1,9 +1,12 @@
 <style lang="scss">
-	.content{
+	.container{
 		background-image:url(/static/login_bg.png);
+		background-size:calc(100% + 400rpx);
+		background-position:0 var(--status-bar-height);
 		background-repeat: no-repeat;
-		padding-top:440rpx;
+		padding-top:calc(460rpx + var(--status-bar-height));
 		.u-form{
+			margin-top:20rpx;
 			.d-form /deep/{
 				margin:0 30rpx;
 				.u-input,.plant-youbian{
@@ -14,22 +17,16 @@
 				}
 			}
 		}
-		button{
-			margin:auto;
-			display: flex;
-			width:80%;
-			margin-top:90rpx;
-		}
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<view style="font-size:52rpx;margin-left:42rpx;">注册</view>
 		<u-form :model="formData" ref="form" :rules="rules">
 			<d-form v-for="(v,k) in fields" :key="k" v-bind="v" :field="k"/>
 		</u-form>
 		
-		<button class="cu-btn round bg-green shadow">注册</button>
+		<button class="cu-btn round bg-green shadow submit">注册</button>
 	</view>
 </template>
 <script>
diff --git a/pages/massif/add_farming.vue b/pages/massif/add_farming.vue
index 0924f0f..3eda4b6 100644
--- a/pages/massif/add_farming.vue
+++ b/pages/massif/add_farming.vue
@@ -1,22 +1,9 @@
 <style lang="scss">
-	.content{
+	.container{
 		min-height: 100%;
 		background:#f6f6f6;
 		padding:30rpx 0;
 
-		.cu-navbar{
-			.action>button{
-				background:rgba(255, 255, 255, 0.1);
-				width:96rpx;
-				height:48rpx;
-				line-height: 48rpx;
-				text-align: center;
-				font-size:32rpx;
-				padding:0;
-				color:#fff;
-			}
-		}
-
 		.card{
 			margin-top:0;
 			.plant-dikuaimianji{
@@ -96,23 +83,18 @@
 					}
 				}
 			}
-			button{
-				display: flex;
-				width:80%;
-				margin:60rpx auto 0;
-			}
 		}
 	}
 </style>
 <template>
-	<view class="content">
-		<cu-navbar style="--bg:#10C176;--c:#fff;" isBack>
+	<view class="container">
+		<cu-navbar style="--bg:#10C176;--c:#fff;" isBack text="添加农事">
 			<button slot="right" class="cu-btn round">提交</button>
 		</cu-navbar>
 
 		<view class="card">
 			<view class="plant-dikuaimianji">阳光玫瑰种植1号地块</view>
-			<view class="plant-batch-add"/>
+			<view class="plant-batch-add" @click="$u.route({url:'pages/massif/collectList'})"/>
 		</view>
 
 		<view class="card">
@@ -120,7 +102,7 @@
 			<view class="info">
 				<text>化肥</text> <text>中量元素水溶肥</text> <text>200kg</text>
 			</view>
-			<button class="cu-btn round bg-green shadow">+继续添加农资</button>
+			<button class="cu-btn round bg-green shadow submit" @click="$u.route({url:'pages/massif/collectList'})">+继续添加农资</button>
 		</view>
 
 		<view class="card">
diff --git a/pages/massif/agrSpecs.vue b/pages/massif/agrSpecs.vue
new file mode 100644
index 0000000..2a116b7
--- /dev/null
+++ b/pages/massif/agrSpecs.vue
@@ -0,0 +1,161 @@
+<style lang="scss">
+	.container{
+		background:#f6f6f6;
+		min-height: 100%;
+		padding:30rpx 0;
+
+		.card{
+			margin-top:0;
+			&.info{
+				.name{
+					display: flex;
+					align-items: center;
+					margin-bottom: 14rpx;
+					text{
+						&:first-child{
+							flex-shrink: 0;
+							color:#fff;
+							background:#10C176;
+							font-size:20rpx;
+							height:40rpx;
+							width:80rpx;
+							border-radius: 4rpx;
+							text-align: center;
+							line-height: 40rpx;
+							margin-right:16rpx;
+						}
+						&:nth-child(2){
+							flex-grow: 1;
+						}
+						&:nth-child(3){
+							flex-shrink: 0;
+							color:#fff;
+							background:#10C176;
+							border-radius: 50%;
+							width:34rpx;
+							height:34rpx;
+							text-align: center;
+							line-height: 34rpx;
+						}
+					}
+				}
+			}
+		}
+
+		.u-popup{
+			.u-popup__content{
+				&>.btns{
+					display:flex;
+					justify-content: space-between;
+					padding:10rpx;
+				}
+				
+				picker-view{
+					height:500rpx;
+					picker-view-column{
+						view.item{
+							padding:0 30rpx;
+							display:flex;
+							flex-direction: column;
+							justify-content: space-evenly;
+							.name{
+								display:flex;
+								align-items: center;
+								text{
+									font-size:16rpx;
+									&:first-child{
+										color:#fff;
+										background:#10C176;
+										border-radius:0 20rpx 0 20rpx;
+										width:80rpx;
+										height:34rpx;
+										text-align: center;
+										line-height: 34rpx;
+										margin-right:16rpx;
+									}
+									&:nth-child(2){
+										font-weight: bold;
+										font-size:20rpx;
+									}
+									&:nth-child(3){
+										color:#999;
+										margin-left:6rpx;
+									}
+								}
+							}
+							.company{
+								font-size:16rpx;
+								&:before{
+									content:attr(data-name);
+									color:#FBA83C;
+									margin-right:20rpx;
+								}
+								&:after{
+									content:attr(data-company);
+									color:#999999;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
+<template>
+	<view class="container">
+		<cu-navbar style="--bg:#10C176;--c:#fff;" isBack>
+			<button slot="right" class="cu-btn round">确定</button>
+		</cu-navbar>
+
+		<view class="card info">
+			<view class="name">
+				<text>化肥</text> <text>中量元素水溶肥</text> <text @click="show=true" class="plant-jiantou_zuoyouqiehuan"/>
+			</view>
+			<view style="color:#707070;font-size:20rpx;">云南云天化股份有限公司</view>
+		</view>
+		<view class="card">
+			<u-form class="inline" labelWidth="auto" :model="formData" :rules="rules">
+				<d-form
+					v-for="(v,k) in fields"
+					:key="k"
+					v-bind="v"
+					:field="k"
+					:required="!!rules[k]"/>
+			</u-form>
+		</view>
+
+		<u-popup :show="show" @close="show=false">
+			<view class="btns">
+				<button class="cu-btn sm" @click="show=false">取消</button>
+				<button class="cu-btn sm bg-green">确定</button>
+			</view>
+			<picker-view :value="[3]" indicator-style="height:90rpx;">
+				<picker-view-column>
+					<view v-for="i in 10" :key="i" class="item" style="height:90rpx;">
+						<view class="name"><text>化肥</text><text>中量元素水溶肥</text><text>(袋)</text></view>
+						<view class="company" data-name="微量元素肥" data-company="云南云天化股份有限公司"/>
+					</view>
+				</picker-view-column>
+			</picker-view>
+		</u-popup>
+	</view>
+</template>
+<script>
+export default {
+	data(){
+		return{
+			fields:{
+				specs:{label:"规格",tip:"库存：2袋(200kg)",type:"select"},
+				num:{label:"投入数量",suffix:"kg"},
+			},
+			formData:{},
+			rules:{
+
+			},
+
+			show:false,
+		}
+	}
+}
+</script>
\ No newline at end of file
diff --git a/pages/massif/collectList.vue b/pages/massif/collectList.vue
new file mode 100644
index 0000000..8d0d7a2
--- /dev/null
+++ b/pages/massif/collectList.vue
@@ -0,0 +1,77 @@
+<style lang="scss">
+	.container{
+		min-height:100%;
+		background:#f6f6f6;
+		padding:30rpx 0;
+
+		.card{
+			.name{
+				display:flex;
+				align-items: center;
+				margin-bottom:20rpx;
+				text{
+					&:first-child{
+						flex-shrink: 0;
+						color:#fff;
+						font-size:20rpx;
+						border-radius: 0px 20rpx 0px 20rpx;
+						background:#10C176;
+						width:80rpx;
+						height:40rpx;
+						text-align: center;
+						line-height: 40rpx;
+						margin-right:10rpx;
+					}
+					&:nth-child(2){
+						flex-grow: 1;
+						display:flex;
+						align-items: center;
+						font-weight: bold;
+						margin-right:20rpx;
+						&:after{
+							content:"("attr(data-unit)")";
+							font-weight: bold;
+							color:#999;
+							font-size:24rpx;
+						}
+					}
+				}
+			}
+			.company{
+				text{
+					font-size:24rpx;
+					&:first-child{
+						color:#FBA83C;
+						margin-right:16rpx;
+					}
+					&:nth-child(2){
+						color:#999;
+					}
+				}
+			}
+		}
+	}
+</style>
+<template>
+	<view class="container">
+		<d-search/>
+
+		<view class="card" @click="$u.route({url:'pages/massif/agrSpecs'})">
+			<view class="name">
+				<text>化肥</text> <text data-unit="袋">中量元素水溶肥</text> <text class="plant-youbian"/>
+			</view>
+			<view class="company">
+				<text>微量元素肥</text> <text>云南云天化股份有限公司</text>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+export default {
+	data(){
+		return{
+
+		}
+	}
+}
+</script>
\ No newline at end of file
diff --git a/pages/massif/detail.vue b/pages/massif/detail.vue
index c331d9a..2901601 100644
--- a/pages/massif/detail.vue
+++ b/pages/massif/detail.vue
@@ -1,5 +1,5 @@
 <style lang="scss" scoped>
-	.content{
+	.container{
 		padding:30rpx;
 		background:#F6F6F6;
 		min-height: 100%;
@@ -54,7 +54,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<view class="card">
 			<view class="title">基本信息</view>
 			
diff --git a/pages/massif/index.vue b/pages/massif/index.vue
index 8a4713a..058e099 100644
--- a/pages/massif/index.vue
+++ b/pages/massif/index.vue
@@ -1,34 +1,13 @@
 <style lang="scss">
 	page{
-		&>.content{
+		&>.container{
 			background:#F6F6F6;
 			min-height:100%;
-			.u-navbar{
-				margin-bottom:28rpx;
-			}
+			padding:30rpx 0;
 			
-			&>.search{
-				display:flex;
-				align-items: center;
-				background:#fff;
-				margin:30rpx 30rpx;
-				border-radius: 40rpx;
-				padding:6rpx;
-				height:60rpx;
-				.u-icon{
-					margin:0 14rpx;
-					flex-shrink: 0;
-				}
-				input{
-					flex-grow: 1;
-				}
-				.u-button{
-					flex-shrink: 0;
-					width:max-content;
-				}
-			}
 			&>.item{
 				display:flex;
+				margin-bottom:0;
 				&>image{
 					flex-shrink: 0;
 					width:220rpx;
@@ -94,16 +73,12 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<cu-navbar style="--bg:#10C176;--c:#fff;" text="地块管理">
 			<text class="plant-xinjian" slot="right" @click="$u.route({url:'pages/massif/info'})"/>
 		</cu-navbar>
 		
-		<view class="search">
-			<u-icon name="search" color="#999999" size="20"/>
-			<input placeholder="请输入搜索内容"/>
-			<u-button type="primary" shape="circle" color="#10C176" text="搜索" size="mini"></u-button>
-		</view>
+		<d-search/>
 		
 		<view class="card item" v-for="i in 10" :key="i" @click="$u.route({url:'pages/massif/detail'})">
 			<image src="https://ts1.cn.mm.bing.net/th?id=OIP-C.wc_dCG_KbIKZwMdtD3gL2QHaEt&w=313&h=199&c=8&rs=1&qlt=90&o=6&pid=3.1&rm=2"/>
diff --git a/pages/massif/info.vue b/pages/massif/info.vue
index 47ac794..48e3174 100644
--- a/pages/massif/info.vue
+++ b/pages/massif/info.vue
@@ -1,5 +1,5 @@
 <style lang="scss" scoped>
-	.content{
+	.container{
 		background:#F6F6F6;
 		padding:14px 0;
 		min-height:100%;
@@ -10,7 +10,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<u-form class="card inline" :model="formData" ref="form" :rules="rules" labelWidth="auto">
 			<d-form
 				v-for="(v,k) in fields"
diff --git a/pages/massif/mana/farmRecord.vue b/pages/massif/mana/farmRecord.vue
index 0e1abe0..dabdc88 100644
--- a/pages/massif/mana/farmRecord.vue
+++ b/pages/massif/mana/farmRecord.vue
@@ -30,7 +30,7 @@
 						color:#fff;
 						background:#10C176;
 						font-size:20rpx;
-						border-radius: 4px 40px 4px 40px;
+						border-radius: 8rpx 40rpx 8rpx 40rpx;
 						width:80rpx;
 						text-align: center;
 						height:40rpx;
diff --git a/pages/massif/mana/index.vue b/pages/massif/mana/index.vue
index 011f628..9d8e3ca 100644
--- a/pages/massif/mana/index.vue
+++ b/pages/massif/mana/index.vue
@@ -1,10 +1,11 @@
 <style lang="scss">
-	.content{
+	.container{
 		min-height: 100%;
 		background:#F6F6F6;
 		&>map{
 			height:348rpx;
 			width:100%;
+			margin-bottom:-9rpx;
 		}
 		&>.u-tabs{
 			background:#fff;
@@ -14,7 +15,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<map/>
 
 		<u-tabs :list="tabs" :current="tabIndex" activeStyle="color:#10C176;" lineColor="#10C176" lineWidth="50" :scrollable="false" @change="tabIndex=$event.index"/>
diff --git a/pages/massif/mana/plantPlan.vue b/pages/massif/mana/plantPlan.vue
index 73d672c..f64a822 100644
--- a/pages/massif/mana/plantPlan.vue
+++ b/pages/massif/mana/plantPlan.vue
@@ -38,7 +38,7 @@
 								width:80rpx;
 								line-height: 40rpx;
 								text-align: center;
-								border-radius: 4rpx;
+								border-radius: 6rpx;
 								margin-right:12rpx;
 							}
 							&:nth-child(2){
@@ -85,13 +85,6 @@
 				}
 			}
 		}
-		button{
-			margin:auto;
-			display: flex;
-			width:80%;
-			margin-top:90rpx;
-			background:#10C176;
-		}
 	}
 </style>
 <template>
@@ -114,7 +107,7 @@
 				<button class="cu-btn" style="--c:153, 153, 153;" @click="$u.route({url:'pages/massif/plant_info'})">采收</button>
 			</view>
 		</view>
-		<button class="cu-btn round bg-green shadow" @click="$u.route({url:'pages/massif/plant_plan'})">+新增种植计划</button>
+		<button class="cu-btn round bg-green shadow submit" @click="$u.route({url:'pages/massif/plant_plan'})">+新增种植计划</button>
 	</view>
 </template>
 <script>
diff --git a/pages/massif/plant_info.vue b/pages/massif/plant_info.vue
index 7e23fef..5cf4285 100644
--- a/pages/massif/plant_info.vue
+++ b/pages/massif/plant_info.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		.cu-navbar{
 			.action>button{
 				background:rgba(255, 255, 255, 0.1);
@@ -15,7 +15,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<cu-navbar text="采收信息" style="--bg:#10C176;--c:#fff;" isBack>
 			<button slot="right" class="cu-btn round">提交</button>
 		</cu-navbar>
diff --git a/pages/massif/plant_plan.vue b/pages/massif/plant_plan.vue
index 91d4bd2..370ad28 100644
--- a/pages/massif/plant_plan.vue
+++ b/pages/massif/plant_plan.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		min-height: 100%;
 		background:#f6f6f6;
 		padding:30rpx 0;
@@ -8,17 +8,10 @@
 			margin-top:0;
 			
 		}
-		button{
-			margin:auto;
-			display: flex;
-			width:80%;
-			margin-top:90rpx;
-			background:#10C176;
-		}
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<u-form class="card inline" :model="formData" :rules="rules" labelWidth="auto">
 			<d-form
 				v-for="(v,k) in fields"
@@ -28,7 +21,7 @@
 				:required="!!rules[k]"
 				@select="select"/>
 		</u-form>
-		<button class="cu-btn round bg-green shadow">确认提交</button>
+		<button class="cu-btn round bg-green shadow submit">确认提交</button>
 	</view>
 </template>
 <script>
diff --git a/pages/purchase/agrProdList.vue b/pages/purchase/agrProdList.vue
index 1cd3291..2357ca7 100644
--- a/pages/purchase/agrProdList.vue
+++ b/pages/purchase/agrProdList.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		min-height:100%;
 		background:#f6f6f6;
 		padding:30rpx 0;
@@ -41,7 +41,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<cu-navbar text="农资列表" isBack style="--bg:#10C176;--c:#fff;">
 			<text slot="right" class="plant-xinjian" @click="$u.route({url:'pages/purchase/newAgr'})"/>
 		</cu-navbar>
diff --git a/pages/purchase/apply.vue b/pages/purchase/apply.vue
index 3da2808..deb3397 100644
--- a/pages/purchase/apply.vue
+++ b/pages/purchase/apply.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		min-height:100%;
 		background:#F6F6F6;
 		padding:30rpx 0;
@@ -77,7 +77,7 @@
 				}
 			}
 			&.type{
-				.title{
+				.title_mast{
 					margin-bottom:0;
 					&:after{
 						content:attr(data-type);
@@ -87,17 +87,10 @@
 				}
 			}
 		}
-
-		button{
-			margin:auto;
-			display: flex;
-			width:80%;
-			margin-top:90rpx;
-		}
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<view class="card info">
 			<view>
 				<text>申请人</text> <text>张召忠</text>
@@ -132,7 +125,7 @@
 			<view class="title_mast" data-type="审核中">申请状态</view>
 		</view>
 
-		<button class="cu-btn round bg-green shadow">确定提交</button>
+		<button class="cu-btn round bg-green shadow submit">确定提交</button>
 	</view>
 </template>
 <script>
diff --git a/pages/purchase/newAgr.vue b/pages/purchase/newAgr.vue
index 84d8341..b4ac149 100644
--- a/pages/purchase/newAgr.vue
+++ b/pages/purchase/newAgr.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		background:#F6F6F6;
 		min-height: 100%;
 		padding:30rpx 0;
@@ -7,22 +7,15 @@
 		.card{
 			min-height:1000rpx;
 		}
-		
-		button{
-			margin:auto;
-			display: flex;
-			width:80%;
-			margin-top:90rpx;
-		}
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<u-form class="card inline" labelWidth="auto" :model="formData" :rules="rules">
 			<d-form v-for="(v,k) in fields" :key="k" v-bind="v" :field="k" :required="!!rules[k]"/>
 		</u-form>
 
-		<button class="cu-btn round bg-green shadow">保存</button>
+		<button class="cu-btn round bg-green shadow submit">保存</button>
 	</view>
 </template>
 <script>
diff --git a/pages/purchase/newSpecs.vue b/pages/purchase/newSpecs.vue
index acc4719..de62a72 100644
--- a/pages/purchase/newSpecs.vue
+++ b/pages/purchase/newSpecs.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		min-height: 100%;
 		background:#f6f6f6;
 		padding:30rpx 0;
@@ -49,7 +49,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<view class="card spec">
 			<view class="title_mast">规格</view>
 			<view class="data">
diff --git a/pages/purchase/specs.vue b/pages/purchase/specs.vue
index 5f70a66..f514ee2 100644
--- a/pages/purchase/specs.vue
+++ b/pages/purchase/specs.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		min-height: 100%;
 		background:#F6F6F6;
 		padding:30rpx 0;
@@ -105,16 +105,10 @@
 				}
 			}
 		}
-		button{
-			margin:auto;
-			display: flex;
-			width:80%;
-			margin-top:90rpx;
-		}
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<view class="card fertilizer">
 			<view class="name">
 				<text>化肥</text>
@@ -151,7 +145,7 @@
 			</view>
 		</view>
 
-		<button class="cu-btn round bg-green shadow">确定</button>
+		<button class="cu-btn round bg-green shadow submit">确定</button>
 	</view>
 </template>
 <script>
diff --git a/pages/stock/already.vue b/pages/stock/already.vue
index 0153949..8203194 100644
--- a/pages/stock/already.vue
+++ b/pages/stock/already.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		min-height: 100%;
 		background:#f6f6f6;
 		padding:30rpx 0;
@@ -69,7 +69,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<d-search/>
 
 		<view class="card">
diff --git a/pages/stock/goods_detail.vue b/pages/stock/goods_detail.vue
index 54ece1e..7083af6 100644
--- a/pages/stock/goods_detail.vue
+++ b/pages/stock/goods_detail.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		min-height: 100%;
 		background:#f6f6f6;
 		padding:30rpx 0;
@@ -19,7 +19,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<view class="card">
 			<view class="title">基本信息</view>
 
diff --git a/pages/stock/list.vue b/pages/stock/list.vue
index 3583df1..03cd2d3 100644
--- a/pages/stock/list.vue
+++ b/pages/stock/list.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		min-height: 100%;
 		background:#F6F6F6;
 		padding:30rpx 0;
@@ -105,16 +105,10 @@
 				}
 			}
 		}
-		button{
-			margin:auto;
-			display: flex;
-			width:80%;
-			margin-top:90rpx;
-		}
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<view class="card fertilizer">
 			<view class="name">
 				<text>化肥</text>
@@ -151,7 +145,7 @@
 			</view>
 		</view>
 
-		<button class="cu-btn round bg-green shadow">确定</button>
+		<button class="cu-btn round bg-green shadow submit">确定</button>
 	</view>
 </template>
 <script>
diff --git a/pages/stock/mana.vue b/pages/stock/mana.vue
index 070e006..d7b02b3 100644
--- a/pages/stock/mana.vue
+++ b/pages/stock/mana.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		min-height:100%;
 		background:#F6F6F6;
 		.head_btns{
@@ -99,7 +99,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<cu-navbar style="--bg:#10C176;--c:#fff;" isBack text="库存管理">
 			<view slot="right" class="head_btns">
 				<image @click="$u.route({url:'pages/stock/already'})" mode="aspectFit" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAARCAYAAAA7bUf6AAAAAXNSR0IArs4c6QAAAh9JREFUOE+N0++rz2ccx/HH+5z5EZ1QZ+aGJEsStjgKIxrJIkUxRqa1pIlsmrM7ItzbuSN/gJw782Oo5dcN3BFlOYrdIto525EkzhlKjWNvu04fOr7ODe/61Oe6rvf1vN4/Xu/Qj2XmRGzHLNSjB+fQEhF3a69E7UZmrsFufI8/MQ2d+Bh7sDYiLva99xYkM2fgAGZHxD+Z+TnmV6BRWI+zmBcR5YFeewPJzDrcwCpccC3GYAvmqHPQ5O6/DBj+W7W3LiK+7A8yHodxzMvnna4P2qxhwQwxgPoGun/doCln4gT2Y2pEPK2NpBRxB4a5FEsN+aDLyK0MnsTgCdya3aMpi8+Kki6+iYg7tZDp2IcHOpo36Wq556Pm0POIhoW0r/5bU27DuAq0KiI6aiEf4hpWYqe2OKJOq/oR5H88ezzWZ3kaX5WUI2LCOzUpG5n5M27iu/JFRFu2aYzpHlbn6yOiNbM3rUvoxpPaFhdhLcInGIEuHMe/1atFaEPQXvlsKme9kMwsB40oIjqEU9Wlofgag6r13Aq4BPdxBZMiM0stfsdoLIuIM69zzcxPUfTy2n6sOngZV8t/RJwtkNv4CUUnJbwpEfGkinB5DaR043xVjzJHv/R2JzOLQssLpTP38G1fUN8ZycyBld/eiDj6VncqUDMWYzJKSn/0M+Cl8Lsi4mS/A1iBfkBriSYiivjey2pbXIZqI76IiBfvRfjf6RX9Zrpq7UEdfAAAAABJRU5ErkJggg=="/>
diff --git a/pages/stock/record.vue b/pages/stock/record.vue
index b207164..9279f72 100644
--- a/pages/stock/record.vue
+++ b/pages/stock/record.vue
@@ -1,5 +1,5 @@
 <style lang="scss">
-	.content{
+	.container{
 		min-height: 100%;
 		background:#f6f6f6;
 		padding:30rpx 0;
@@ -65,7 +65,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<view class="card" @click="$u.route({url:'pages/stock/goods_detail'})">
 			<view class="head">
 				<text class="plant-rili"/> <text>批次号：A23366683</text> <text>领用出库</text>
diff --git a/pages/warehouse/detail.vue b/pages/warehouse/detail.vue
index b239afb..bbd040b 100644
--- a/pages/warehouse/detail.vue
+++ b/pages/warehouse/detail.vue
@@ -1,5 +1,5 @@
 <style lang="scss" scoped>
-	.content{
+	.container{
 		padding:30rpx;
 		background:#F6F6F6;
 		min-height:100%;
@@ -23,7 +23,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<view class="card">
 			<view class="title">基本信息</view>
 			
diff --git a/pages/warehouse/info.vue b/pages/warehouse/info.vue
index d75727b..f1397ed 100644
--- a/pages/warehouse/info.vue
+++ b/pages/warehouse/info.vue
@@ -1,5 +1,5 @@
 <style lang="scss" scoped>
-	.content{
+	.container{
 		background:#F6F6F6;
 		padding:28rpx 0;
 		&>.u-button{
@@ -9,7 +9,7 @@
 	}
 </style>
 <template>
-	<view class="content">
+	<view class="container">
 		<u-form class="card inline" :model="formData" ref="form" :rules="rules" labelWidth="auto">
 			<d-form v-for="(v,k) in fields" :key="k" v-bind="v" :required="!!rules[k]" :field="k" @input="formData[k]=$event" @select="fields[k].value=$event"/>
 		</u-form>
diff --git a/pages/warehouse/mana.vue b/pages/warehouse/mana.vue
index 96659b5..d9644b1 100644
--- a/pages/warehouse/mana.vue
+++ b/pages/warehouse/mana.vue
@@ -1,5 +1,5 @@
 <style lang="scss" scoped>
-	.content{
+	.container{
 		min-height: 100%;
 		background:#F6F6F6;
 		padding-bottom:20rpx;
@@ -83,20 +83,14 @@
 	}
 </style>
 <template>
-	<view class="content">
-		
- 		<u-navbar @rightClick="rightClick" leftIconColor="#fff" :autoBack="true" bgColor="#10C176">
-			<view slot="center" style="color:#fff;">仓库管理</view>
-			<view slot="right" @click="$u.route({url:'pages/warehouse/info'})"> <text class="plant-xinjian" style="color:#fff;"/> </view>
-		</u-navbar>
+	<view class="container">
+		<cu-navbar style="--bg:#10C176;--c:#fff;" text="仓库管理" isBack>
+			<text class="plant-xinjian" slot="right" @click="$u.route({url:'pages/warehouse/info'})"/>
+		</cu-navbar>
 
-		<view class="search">
-			<u-icon name="search" color="#999999" size="20"/>
-			<input placeholder="请输入搜索内容"/>
-			<u-button type="primary" shape="circle" color="#10C176" text="搜索" size="mini"></u-button>
-		</view>
+		<d-search style="margin-top:30rpx;"/>
 		
-		<view class="card item" v-for="i in 1" :key="i" @click="$u.route({url})">
+		<view class="card item" v-for="i in 1" :key="i" @click="$u.route({url:'pages/warehouse/detail'})">
 			<image src="https://ts1.cn.mm.bing.net/th?id=OIP-C.wc_dCG_KbIKZwMdtD3gL2QHaEt&w=313&h=199&c=8&rs=1&qlt=90&o=6&pid=3.1&rm=2"/>
 			<view class="info">
 				<view class="title">西南角1号仓库 <text class="plant-youbian"/></view>
@@ -107,7 +101,7 @@
 				<view class="btns">
 					<text class="plant-xiugai">修改</text>
 					<text class="plant-shanchu">删除</text>
-					<text class="plant-chakan" @click.stop="$u.rotue({url:'pages/warehouse/info'})">查看库存</text>
+					<text class="plant-chakan" @click.stop="$u.route({url:'pages/warehouse/info'})">查看库存</text>
 				</view>
 			</view>
 		</view>
diff --git a/router/home.js b/router/home.js
index b343ab3..b50b6c5 100644
--- a/router/home.js
+++ b/router/home.js
@@ -1,8 +1,17 @@
 module.exports=[
+	{
+		path:"pages/home/login",
+		style:{
+			navigationBarTitleText:"登录",
+			"app-plus":{
+				titleNView:false
+			}
+		}
+	},
 	{
 		path:"pages/home/index",
 		style:{
-			navigationBarTitleText:"种植管理",
+			navigationBarTitleText:"首页",
 			"app-plus":{
 				titleNView:false
 			}
@@ -28,15 +37,6 @@ module.exports=[
 			}
 		}
 	},
-	{
-		path:"pages/home/login",
-		style:{
-			navigationBarTitleText:"登录",
-			"app-plus":{
-				titleNView:false
-			}
-		}
-	},
 	{
 		path:"pages/home/register",
 		style:{
diff --git a/router/massif.js b/router/massif.js
index f960044..fea4069 100644
--- a/router/massif.js
+++ b/router/massif.js
@@ -70,4 +70,24 @@ module.exports=[
 			}
 		}
 	},
+	{
+		path:"pages/massif/collectList",
+		style:{
+			navigationBarTitleText:"领用列表",
+			navigationBarBackgroundColor:"#10C176",
+			navigationBarTextStyle:"white",
+			"app-plus":{
+				"titleNView":true
+			}
+		}
+	},
+	{
+		path:"pages/massif/agrSpecs",
+		style:{
+			navigationBarTitleText:"农资规格",
+			"app-plus":{
+				"titleNView":false
+			}
+		}
+	},
 ]
\ No newline at end of file
diff --git a/static/tab_home.png b/static/tab_home.png
new file mode 100644
index 0000000..e6c2431
Binary files /dev/null and b/static/tab_home.png differ
diff --git a/static/tab_home_active.png b/static/tab_home_active.png
new file mode 100644
index 0000000..95d9030
Binary files /dev/null and b/static/tab_home_active.png differ
diff --git a/static/tab_massif.png b/static/tab_massif.png
new file mode 100644
index 0000000..9ed4d9e
Binary files /dev/null and b/static/tab_massif.png differ
diff --git a/static/tab_massif_active.png b/static/tab_massif_active.png
new file mode 100644
index 0000000..a7888f5
Binary files /dev/null and b/static/tab_massif_active.png differ
diff --git a/static/tab_my.png b/static/tab_my.png
new file mode 100644
index 0000000..741d332
Binary files /dev/null and b/static/tab_my.png differ
diff --git a/static/tab_my_active.png b/static/tab_my_active.png
new file mode 100644
index 0000000..92a1852
Binary files /dev/null and b/static/tab_my_active.png differ
diff --git a/uni.scss b/uni.scss
index f2944ba..e1eaf44 100644
--- a/uni.scss
+++ b/uni.scss
@@ -128,6 +128,14 @@ view{
 		border:none;
 	}
 }
+button.submit.cu-btn{
+	margin:auto;
+	display: flex;
+	width:80%;
+	height:80rpx;
+	margin-top:90rpx;
+	background:#10C176;
+}
 
 .u-form.inline{
 	margin:0;