diff --git a/pages.json b/pages.json
index 1a5d8aa..9bff67d 100644
--- a/pages.json
+++ b/pages.json
@@ -9,12 +9,19 @@
 		"selectedColor": "#409eff",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
-		"list": [{
+		"list": [
+			{
 				"pagePath": "pages/index/index",
 				"iconPath": "static/images/tabbar/home.png",
 				"selectedIconPath": "static/images/tabbar/home_.png",
 				"text": "仓库"
 			},
+			{
+				"pagePath": "pages/materialManagement/materialManagement",
+				"iconPath": "static/images/tabbar/work.png",
+				"selectedIconPath": "static/images/tabbar/work_.png",
+				"text": "物料管理"
+			},
 			{
 				"pagePath": "pages/user/user",
 				"iconPath": "static/images/tabbar/mine.png",
@@ -85,8 +92,7 @@
 		{
 			"path": "pages/agv/agv",
 			"style": {
-				"navigationBarTitleText": "AGV",
-				"navigationStyle": "custom",
+				"navigationBarTitleText": "AGV功能",
 				"enablePullDownRefresh": false
 			}
 		},
@@ -94,7 +100,7 @@
 			"path" : "pages/agv/agv-in/agv-in",
 			"style" : 
 			{
-				"navigationBarTitleText" : "入料",
+				"navigationBarTitleText" : "上料工单",
 				"enablePullDownRefresh" : false
 			}
 		},
@@ -178,6 +184,22 @@
 				"navigationBarTitleText" : "拆箱",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/agv/agv-action/agv-action",
+			"style" : 
+			{
+				"navigationBarTitleText" : "AGV任务执行",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/materialManagement/materialManagement",
+			"style" : 
+			{
+				"navigationBarTitleText" : "物料管理",
+				"enablePullDownRefresh" : false
+			}
 		}
 	]
 
diff --git a/pages/agv/agv-action/agv-action.vue b/pages/agv/agv-action/agv-action.vue
new file mode 100644
index 0000000..3160ef0
--- /dev/null
+++ b/pages/agv/agv-action/agv-action.vue
@@ -0,0 +1,95 @@
+<template>
+	<view>
+		<u--form labelWidth="auto" labelPosition="left" :model="formData" ref="uForm">
+			<u-form-item label="AGV起点:" borderBottom>
+				<u-input placeholder="请输入起点" border="surround" v-model="formData.start">
+					<template slot="suffix">
+						<u-button @click="chouseStart" type="success" size="mini" text="选择起点"></u-button>
+					</template>
+				</u-input>
+			</u-form-item>
+			<u-form-item label="AGV终点:" borderBottom>
+				<u-input placeholder="请输入终点点" border="surround" v-model="formData.end">
+					<template slot="suffix">
+						<u-button @click="chouseEnd" type="success" size="mini" text="选择终点"></u-button>
+					</template>
+				</u-input>
+			</u-form-item>
+			<u-form-item>
+				<u-button type="primary" text="执行" @click="doAction"></u-button>
+			</u-form-item>
+		</u--form>
+		<u-picker title="起点" :show="showStart" :columns="startColumns" @confirm="startConfirm"
+			@cancel="showStart = false" keyName="coordinate"></u-picker>
+		<u-picker title="终点" :show="showEnd" :columns="endColumns" @confirm="endConfirm" @cancel="showEnd = false"
+			keyName="coordinate"></u-picker>
+	</view>
+</template>
+
+<script>
+	import * as AgvApi from '@/api/agv/agv.js';
+	export default {
+		data() {
+			return {
+				showStart: false,
+				showEnd: false,
+				formData: {
+					//起点
+					start: '',
+					//终点
+					end: '',
+				},
+				startColumns: [],
+				endColumns: []
+			}
+		},
+		created() {
+			this.init()
+		},
+		methods: {
+			init() {
+				const goStartDictData = {
+					areaCode: 2,
+					type: 0
+				}
+				AgvApi.getAgvPosition(goStartDictData).then(res => {
+					if (res.code === 200) {
+						this.startColumns = [res.data];
+					}
+				})
+				const goEndDictData = {
+					areaCode: 2,
+					type: 1
+				}
+				AgvApi.getAgvPosition(goEndDictData).then(res => {
+					if (res.code === 200) {
+						this.endColumns = [res.data];
+					}
+				})
+			},
+			chouseStart() {
+				this.showStart = true;
+			},
+			chouseEnd() {
+				this.showEnd = true;
+			},
+			startConfirm(item) {
+				this.formData.start = item.value[0].coordinate;
+				this.showStart = false;
+			},
+			endConfirm(item) {
+				this.formData.end  = item.value[0].coordinate;
+				this.showEnd = false;
+			},
+			// 执行AGV任务
+			doAction() {
+				const data = this.formData;
+				console.log(this.formData);
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/agv/agv-order/agv-order.vue b/pages/agv/agv-order/agv-order.vue
index 1fc6dc9..349b43b 100644
--- a/pages/agv/agv-order/agv-order.vue
+++ b/pages/agv/agv-order/agv-order.vue
@@ -74,7 +74,7 @@
 				loading: false,
 				orderInfo: {},
 				list: [],
-				flag:1
+				flag: 1
 			}
 		},
 		onShow() {
@@ -83,6 +83,9 @@
 		methods: {
 			// 获取AGV小车列表
 			getList() {
+				if (!this.orderInfo.id) {
+					return;
+				}
 				this.loading = true;
 				setTimeout(() => {
 					this.loading = false;
@@ -131,7 +134,7 @@
 									this.getList();
 								}
 							})
-						}else{
+						} else {
 							uni.showToast({
 								icon: 'error',
 								title: '删除失败！'
@@ -142,14 +145,14 @@
 				const queryData = {
 					taskId
 				}
-				
+
 			},
-			handlerStart1() {
-				this.flag=1;
+			handlerStart1(id) {
+				this.flag = 1;
 				// 上料		
 				const queryData = {
-					workorder_id: this.orderInfo.id,
-					flag:this.flag
+					taskid: id,
+					flag: this.flag
 				}
 				AgvApi.goTask(queryData).then(res => {
 					if (res.code === 200) {
@@ -157,8 +160,7 @@
 							icon: 'success',
 							title: res.data.message
 						});
-						
-					}else{
+					} else {
 						uni.showToast({
 							icon: 'error',
 							title: res.data
@@ -167,12 +169,12 @@
 				})
 
 			},
-			handlerStart2() {
-					this.flag=2;
+			handlerStart2(id) {
+				this.flag = 2;
 				// 反程
 				const queryData = {
-					workorder_id: this.orderInfo.id,
-					flag:2
+					taskid: id,
+					flag: 2
 				}
 				AgvApi.goTask(queryData).then(res => {
 					if (res.code === 200) {
@@ -180,9 +182,7 @@
 							icon: 'success',
 							title: res.data.message
 						});
-						
-						
-					}else{
+					} else {
 						uni.showToast({
 							icon: 'error',
 							title: res.data
@@ -194,7 +194,7 @@
 			handlerStop() {
 				const queryData = {
 					workorder_id: this.orderInfo.id,
-					flag:this.flag
+					flag: this.flag
 				}
 				AgvApi.Stoptask(queryData).then(res => {
 					if (res.code === 200) {
@@ -202,9 +202,9 @@
 							icon: 'success',
 							title: res.data.message
 						});
-						
-						
-					}else{
+
+
+					} else {
 						uni.showToast({
 							icon: 'error',
 							title: res.data
diff --git a/pages/agv/agv.vue b/pages/agv/agv.vue
index a3f0b94..375a9b8 100644
--- a/pages/agv/agv.vue
+++ b/pages/agv/agv.vue
@@ -1,15 +1,11 @@
 <template>
-	<view class="content background">
-		<view class="grid-box">
-			<uni-grid :column="3" @change="gridCheck" :showBorder="false" :highlight="false">
-				<uni-grid-item v-for="(item, index) in gridItemList" :index="index + 1">
-					<view class="item">
-						<uni-icons :type="item.icon" :size="40" color="#00aaff" />
-						<text class="text">{{ item.name }}</text>
-					</view>
-				</uni-grid-item>
-			</uni-grid>
-		</view>
+	<view class="common-nav-container">
+		<u-grid :border="true" @click="gridCheck" col="4">
+			<u-grid-item v-for="(item,index) in gridItemList" :key="index" :name="item.url">
+				<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" :size="128"></u-icon>
+				<text class="grid-text">{{item.name}}</text>
+			</u-grid-item>
+		</u-grid>
 	</view>
 </template>
 
@@ -17,40 +13,29 @@
 	export default {
 		data() {
 			return {
-				gridItemList: [{
-						name: '入料',
-						icon: 'download-filled'
+				gridItemList: [
+					{
+						name: 'agv操作',
+						icon: 'grid-fill',
+						url: '/pages/agv/agv-action/agv-action'
 					},
 					{
-						name: '出料',
-						icon: 'upload-filled'
+						name: '上料工单',
+						icon: 'grid-fill',
+						url: '/pages/agv/agv-in/agv-in'
 					},
-					// {
-					// 	name: '出料',
-					// 	icon: 'upload-filled'
-					// },
-
 				]
 			}
 		},
 		methods: {
-			gridCheck(item) {
-				const index = item.detail?.index;
-				switch (index) {
-					case 1:
-						uni.navigateTo({
-							url: '/pages/agv/agv-in/agv-in'
-						});
-						break;
-					case 2:
-						uni.navigateTo({
-							url: '/pages/agv/agv-out/agv-out'
-						});
-						break;
-					default:
-						break;
+			gridCheck(url) {
+				if (url === '') {
+					return;
 				}
-			}
+				uni.navigateTo({
+					url
+				});
+			},
 		}
 	}
 </script>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d4ab10e..56dad08 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,71 +1,36 @@
 <template>
 	<view class="home-container">
-		<!-- 顶部图片 -->
-		<view class="home-banner-box">
-			<u--image :showLoading="true" src="/static/images/ui/home-banner.png" width="360px"
-				height="180px"></u--image>
-		</view>
-		<!-- 按钮区域 -->
-		<view class="home-button-box">
-			<u-row>
-				<u-col span="3">
-					<u-row>
-						<view :style="[$u.addStyle(buttonData[0].style)]" class="box-1 home-button-action"
-							@click="toMenuChouse(0)">
-							<u-icon :name="buttonData[0].icon" :color="buttonData[0].style.color" size="100"></u-icon>
-							<text>{{buttonData[0].text}}</text>
-						</view>
-						<view class="gap-10"></view>
-					</u-row>
-				</u-col>
-				<u-col span="9">
-					<view>
-						<u-row>
-							<u-col span="6">
-								<view :style="[$u.addStyle(buttonData[1].style)]" class="box-1 home-button-action"
-									@click="toMenuChouse(1)">
-									<u-icon :name="buttonData[1].icon" :color="buttonData[1].style.color"
-										size="100"></u-icon>
-									<text>{{buttonData[1].text}}</text>
-								</view>
-							</u-col>
-							<u-col span="6">
-								<view :style="[$u.addStyle(buttonData[2].style)]" class="box-1 home-button-action"
-									@click="toMenuChouse(2)">
-									<u-icon :name="buttonData[2].icon" :color="buttonData[2].style.color"
-										size="100"></u-icon>
-									<text>{{buttonData[2].text}}</text>
-								</view>
-							</u-col>
-						</u-row>
-						<view class="gap-10"></view>
-						<u-row>
-							<u-col span="12">
-								<view :style="[$u.addStyle(buttonData[3].style)]" class="box-2 home-button-action"
-									@click="toMenuChouse(3)">
-									<u-icon :name="buttonData[3].icon" :color="buttonData[3].style.color"
-										size="100"></u-icon>
-									<view class="gap-10"></view>
-									<text>{{buttonData[3].text}}</text>
-								</view>
-							</u-col>
-						</u-row>
-					</view>
-
-				</u-col>
-			</u-row>
-			<view class="gap-10"></view>
-			<u-row>
-				<u-col span="12">
-					<view :style="[$u.addStyle(buttonData[4].style)]" class="box-2 home-button-action"
-						@click="toMenuChouse(4)">
-						<u-icon :name="buttonData[4].icon" :color="buttonData[4].style.color" size="100"></u-icon>
-						<view class="gap-10"></view>
-						<text>{{buttonData[4].text}}</text>
-					</view>
-				</u-col>
-			</u-row>
-		</view>
+		<u--text text="入库" size="36" bold></u--text>
+		<u-grid :border="true" @click="gridCheck" col="4">
+			<u-grid-item v-if="item.type === 1" v-for="(item,index) in gridItemList" :key="index" :name="item.url">
+				<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" :size="128"></u-icon>
+				<text class="grid-text">{{item.name}}</text>
+			</u-grid-item>
+		</u-grid>
+		<u-gap height="40"></u-gap>
+		<u--text text="出库" size="36" bold></u--text>
+		<u-grid :border="true" @click="gridCheck" col="4">
+			<u-grid-item v-if="item.type === 2" v-for="(item,index) in gridItemList" :key="index" :name="item.url">
+				<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" :size="128"></u-icon>
+				<text class="grid-text">{{item.name}}</text>
+			</u-grid-item>
+		</u-grid>
+		<u-gap height="40"></u-gap>
+		<u--text text="库存操作" size="36" bold></u--text>
+		<u-grid :border="true" @click="gridCheck" col="4">
+			<u-grid-item v-if="item.type === 3" v-for="(item,index) in gridItemList" :key="index" :name="item.url">
+				<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" :size="128"></u-icon>
+				<text class="grid-text">{{item.name}}</text>
+			</u-grid-item>
+		</u-grid>
+		<u-gap height="40"></u-gap>
+		<u--text text="库内操作" size="36" bold></u--text>
+		<u-grid :border="true" @click="gridCheck" col="4">
+			<u-grid-item v-if="item.type === 4" v-for="(item,index) in gridItemList" :key="index" :name="item.url">
+				<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" :size="128"></u-icon>
+				<text class="grid-text">{{item.name}}</text>
+			</u-grid-item>
+		</u-grid>
 	</view>
 </template>
 
@@ -77,71 +42,96 @@
 		data() {
 			return {
 				// 页面按钮参数
-				buttonData: [{
-						index: 0,
-						text: '入库',
-						icon: '/static/images/icon/rk.svg',
-						style: {
-							width: '80px',
-							height: '180px',
-							fontSize: '20px',
-							backgroundImage: 'linear-gradient(to bottom right, #fe9a9c 0%, #fe7a7c 100%)',
-							color: 'white',
-							borderRadius: '10px'
-						}
+				gridItemList: [{
+						name: '成品入库',
+						icon: 'grid-fill',
+						url: '/pages/inWarehouse/inWarehouse?isStrict=true',
+						type: 1,
+						index: 1
 					},
 					{
-						index: 1,
-						text: '移库',
-						icon: '/static/images/icon/yk.svg',
-						style: {
-							width: '110px',
-							height: '90px',
-							fontSize: '20px',
-							backgroundImage: 'linear-gradient(to bottom right, #fdb886 0%, #fdad6d 100%)',
-							color: 'white',
-							borderRadius: '10px'
-						}
+						name: '油漆入库',
+						icon: 'grid-fill',
+						url: '',
+						type: 1,
+						index: 2
 					},
 					{
-						index: 2,
-						text: '盘点',
-						icon: '/static/images/icon/pd.svg',
-						style: {
-
-							width: '110px',
-							height: '90px',
-							fontSize: '20px',
-							backgroundImage: 'linear-gradient(to bottom right, #67e5f5 0% , #52cee2 100%)',
-							color: 'white',
-							borderRadius: '10px'
-						}
+						name: '毛坯入库',
+						icon: 'grid-fill',
+						url: '',
+						type: 1,
+						index: 3
 					},
 					{
-						index: 3,
-						text: '出库',
-						icon: '/static/images/icon/ck.svg',
-						style: {
-							width: '100%',
-							height: '80px',
-							fontSize: '20px',
-							backgroundImage: 'linear-gradient(to bottom right, #a4a1f9 0%, #8180f9 100%)',
-							color: 'white',
-							borderRadius: '10px'
-						}
+						name: '备品备件',
+						icon: 'grid-fill',
+						url: '',
+						type: 1,
+						index: 4
 					},
 					{
-						index: 4,
-						text: '仓库管理',
-						icon: '/static/images/icon/ckgl.svg',
-						style: {
-							width: '100%',
-							height: '80px',
-							fontSize: '20px',
-							backgroundImage: 'linear-gradient(to bottom right, #59affe 0%, #4d92fe 100%)',
-							color: 'white',
-							borderRadius: '10px'
-						}
+						name: '成品出库',
+						icon: 'grid-fill',
+						url: '/pages/outWarehouse/outWarehouse',
+						type: 2,
+						index: 5
+					},
+					{
+						name: '出货',
+						icon: 'grid-fill',
+						url: '',
+						type: 2,
+						index: 6
+					},
+					{
+						name: '退货',
+						icon: 'grid-fill',
+						url: '',
+						type: 2,
+						index: 7
+					},
+					{
+						name: '盘点',
+						icon: 'grid-fill',
+						url: '/pages/stocktake/stocktake',
+						type: 3,
+						index: 8
+					},
+					{
+						name: '库存查询',
+						icon: 'grid-fill',
+						url: '/pages/watchGoods/watchGoods',
+						type: 3,
+						index: 9
+					},
+					{
+						name: '操作记录',
+						icon: 'grid-fill',
+						url: '/pages/warehoseActionList/warehoseActionList',
+						type: 3,
+						index: 10
+					},
+					{
+						name: '拼箱',
+						icon: 'grid-fill',
+						url: '/pages/consolidation/consolidation',
+						type: 4,
+						index: 11
+					},
+					{
+						name: '拆箱',
+						icon: 'grid-fill',
+						url: '/pages/unpacking/unpacking',
+						type: 4,
+						index: 12
+					},
+					{
+						name: '移库',
+						icon: 'grid-fill',
+						url: '/pages/relocation/relocation',
+						type: 4,
+						index: 13
 					}
 				]
 			};
@@ -159,15 +149,12 @@
 				'LogOut',
 				'GetInfo'
 			]),
-			toMenuChouse(type) {
+			gridCheck(url) {
+				if (url === '') {
+					return;
+				}
 				uni.navigateTo({
-					url: '/pages/menuChouse/menuChouse',
-					success: function(res) {
-						// 向按钮列表页传递消息
-						res.eventChannel.emit('setMenuType', {
-							data: type
-						})
-					}
+					url
 				});
 			},
 		}
diff --git a/pages/materialManagement/materialManagement.css b/pages/materialManagement/materialManagement.css
new file mode 100644
index 0000000..213ed29
--- /dev/null
+++ b/pages/materialManagement/materialManagement.css
@@ -0,0 +1,5 @@
+.home-container {
+	width: 360px;
+	height: 594px;
+	background-color: white;
+}
\ No newline at end of file
diff --git a/pages/materialManagement/materialManagement.vue b/pages/materialManagement/materialManagement.vue
new file mode 100644
index 0000000..aba4a2d
--- /dev/null
+++ b/pages/materialManagement/materialManagement.vue
@@ -0,0 +1,45 @@
+<template>
+	<view class="home-container">
+		<u--text text="生产投料" size="36" bold></u--text>
+		<u-grid :border="true" @click="gridCheck" col="4">
+			<u-grid-item v-if="item.type === 1" v-for="(item,index) in gridItemList" :key="index" :name="item.url">
+				<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" :size="128"></u-icon>
+				<text class="grid-text">{{item.name}}</text>
+			</u-grid-item>
+		</u-grid>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 页面按钮参数
+				gridItemList: [
+					{
+						name: '生产投料(RM)',
+						icon: 'grid-fill',
+						url: '/pages/agv/agv-in/agv-in',
+						type: 1,
+						index: 1
+					},
+				]
+			}
+		},
+		methods: {
+			gridCheck(url) {
+				if (url === '') {
+					return;
+				}
+				uni.navigateTo({
+					url
+				});
+			},
+		}
+	}
+</script>
+
+
+<style scoped>
+	@import url('materialManagement.css');
+</style>
\ No newline at end of file
diff --git a/pages/menuChouse/menuChouse.vue b/pages/menuChouse/menuChouse.vue
index e7701c4..c6890d5 100644
--- a/pages/menuChouse/menuChouse.vue
+++ b/pages/menuChouse/menuChouse.vue
@@ -49,7 +49,7 @@
 					{
 						//展示时机
 						isShowType: 0,
-						isShow: false,
+						isShow: true,
 						name: '油漆入库',
 						// 触发跳转
 						url: '',
@@ -59,7 +59,7 @@
 					{
 						//展示时机
 						isShowType: 0,
-						isShow: false,
+						isShow: true,
 						name: '毛坯入库',
 						// 触发跳转
 						url: '',
@@ -69,7 +69,7 @@
 					{
 						//展示时机
 						isShowType: 0,
-						isShow: false,
+						isShow: true,
 						name: '备品备件',
 						// 触发跳转
 						url: '',
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 7c7c557..f3678d4 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -3,8 +3,7 @@
 		<view class="flex-col page">
 			<view class="flex-col justify-start relative section">
 				<view class="shrink-0 section_2"></view>
-				<u-avatar class="shrink-0 image pos" :showLoading="true" size="64px"
-					src="/static/images/icon/app.png"
+				<u-avatar class="shrink-0 image pos" :showLoading="true" size="64px" src="/static/images/icon/app.png"
 					@click="avatarClick"></u-avatar>
 				<text class="text pos_2">{{name}}</text>
 				<view class="flex-row  items-center section_3 pos_3">
@@ -19,7 +18,8 @@
 			</view>
 			<uni-card>
 				<u-grid :border="false" @click="gridClick" col="3">
-					<u-grid-item v-for="(baseListItem,baseListIndex) in gridList" :key="baseListIndex">
+					<u-grid-item v-for="(baseListItem,baseListIndex) in gridList" :key="baseListIndex"
+						:name="baseListItem.url">
 						<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="baseListItem.name" :size="48"></u-icon>
 						<text class="grid-text">{{baseListItem.title}}</text>
 					</u-grid-item>
@@ -69,15 +69,18 @@
 				},
 				gridList: [{
 						name: 'photo',
-						title: '消息'
+						title: 'agv',
+						url: '/pages/agv/agv'
 					},
 					{
 						name: 'lock',
-						title: '帮助'
+						title: '帮助',
+						url: ''
 					},
 					{
 						name: 'star',
-						title: '客服'
+						title: '客服',
+						url: ''
 					},
 				]
 			};
@@ -91,8 +94,13 @@
 			avatarClick() {
 
 			},
-			gridClick() {
-
+			gridClick(url) {
+				if (url === '') {
+					return;
+				}
+				uni.navigateTo({
+					url
+				});
 			},
 			// 退出登录
 			outLogin() {