diff --git a/pages/home/home.vue b/pages/home/home.vue
index 40e64cc..cab7ba0 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -15,7 +15,7 @@
 			<view class="zd_home_wrapper">
 				<view class="menus_wrap">
 					<view class="fir_menu_wrap">
-						<view class="fir_menu-item" v-for="(e, i) in menuList" :key="i" @click="toPage2(e)">
+						<view class="fir_menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage1(e)">
 							<image class="menu-img" :src="require('../../static/image/menu/' + e.path + '.png')" alt="">
 							<view class="menu-name">{{e.title}}</view>
 						</view>
@@ -23,7 +23,7 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view class="sec_menu_wraper" :class="show ? 'popshow' : 'pophide'">
+		<view class="sec_menu_wraper" :class="show ? 'popshow' : 'pophide'">
 			<view class="pop-title">{{title}}</view>
 			<view class="sec_menu_w">
 				<view class="sec_menu-item" :style="{'background-image': 'url(' + require('../../static/image/menu/' + icon + '.png') + ')'}" v-for="(e, i) in secM" :key="'sontree' + i" @click="toPage2(e)">
@@ -31,7 +31,7 @@
 				</view>
 			</view>
 		</view>
-		<view v-if="show" class="modal" @click.stop="show = false"></view> -->
+		<view v-if="show" class="modal" @click.stop="show = false"></view>
 	</view>
 </template>
 
@@ -41,12 +41,22 @@
 			return {
 				userName: '',
 				menuList: [
-					{title: '解包上料', path: 'RF01', sonTree: [{title: '解包上料', path: '/pages/zw/jb-up-mater'}]},
-					{title: '解包下料', path: 'RF02', sonTree: [{title: '解包下料', path: '/pages/zw/jb-lower-mater'}]},
-					{title: '料桶入库', path: 'RF04', sonTree: [{title: '料桶入库', path: '/pages/zw/materbox-instore'}]},
-					{title: '解包退料', path: 'RF07', sonTree: [{title: '解包退料', path: '/pages/zw/jb-return-mater'}]},
+					{title: '解包管理', path: 'RF03', sonTree: [{title: '解包上料', path: '/pages/zw/jb-up-mater'}, {title: '解包下料', path: '/pages/zw/jb-lower-mater'}, {title: '料桶入库', path: '/pages/zw/materbox-instore'}, {title: '解包退料', path: '/pages/zw/jb-return-mater'}]},
+					// {title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]},
+					// {title: '产线管理', path: 'RF07', sonTree: [{title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}]},
+					// {title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},
+					// {title: '出库管理', path: 'RF02', sonTree: [{title: '线边仓出库', path: '/pages/outbound/mater-outstore'}, {title: '产线叫料', path: '/pages/outbound/line-callmater'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]},
+					// {title: '入库管理', path: 'RF01', sonTree: [{title: '组盘入库', path: '/pages/entry/groupplate-instore'}, {title: '拣选余料回库', path: '/pages/entry/pick-yl-return-store'}, {title: '空载具入库', path: '/pages/entry/empty-vehicle-instore'}]},
+					// {title: '出库管理', path: 'RF02', sonTree: [{title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]}
+					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '合格证入库', path: '/pages/entry/qualified-to-store'}, {title: '单据入库', path: '/pages/entry/bill-to-store'}, {title: '盘点入库', path: '/pages/entry/check-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
+					{title: '出库管理', path: 'RF02', sonTree: [{title: '空托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-list'}, {title: '盘点出库', path: '/pages/outbound/stock-out-store'}, {title: '物料出库', path: '/pages/outbound/mater-outstore'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}, {title: '产线转运', path: '/pages/outbound/line-transfer'}, {title: '空载具出库', path: '/pages/outbound/empty-vehicle-outstore'}, {title: 'CTU载具出库', path: '/pages/outbound/ctu-vehicle-outstore'}]},
+					{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
+					{title: '设备操控', path: 'RF07', sonTree: [{title: '切换出入库模式', path: '/pages/mode/switch-in-out'}, {title: '拣选工位启停模式', path: '/pages/mode/pick'}, {title: '下发输送线运动命令', path: '/pages/mode/command'}]},
+					{title: '产线叫料', path: 'RF10', sonTree: [{title: '二楼生产出库', path: '/pages/outbound/produce-out-store-2nd'}, {title: '二楼取货确认', path: '/pages/outbound/pick-confirm-2nd'}, {title: '二楼货架绑定', path: '/pages/outbound/shelf-bind-2nd'}]},
+					{title: '转运管理', path: 'RF09', sonTree: [{title: '托盘转运', path: '/pages/transfer/tray-transfer'}]},
+					{title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}
 				],
-				// menu: [{title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}],
+				menu: [{title: '叫料搬运', path: 'RF11', sonTree: [{title: '叫料搬运', path: '/pages/carry/call-carry'}]}],
 				show: false,
 				secM: [],
 				icon: '',
@@ -75,13 +85,10 @@
 				}
 			},
 			toPage2 (e) {
-				console.log(2)
-				let url = e.sonTree[0].path + '?title=' + e.sonTree[0].title
-				// let url = e.path + '?title=' + e.title
-				// if (e.active === false) {
-				// 	return
-				// }
-				console.log(url, 666)
+				let url = e.path + '?title=' + e.title
+				if (e.active === false) {
+					return
+				}
 				uni.redirectTo({
 					url: url
 				})	
diff --git a/pages/zw/jb-lower-mater.vue b/pages/zw/jb-lower-mater.vue
index 08fa14d..4f7730c 100644
--- a/pages/zw/jb-lower-mater.vue
+++ b/pages/zw/jb-lower-mater.vue
@@ -28,7 +28,7 @@
 						<!-- <search-box v-model="code" @handleChange="handleChange1" @handleDel="handleDel1" /> -->
 						<input type="text" class="filter_input" v-model="val3" disabled>
 					</view>
-					<button class="mini-btn" type="primary" size="mini" @tap="toSearch">获取重量</button>
+					<button class="mini-btn" type="primary" size="mini" @tap="_getWeight">获取重量</button>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
@@ -136,9 +136,9 @@
 				try {
 					let res = await regionList()
 					if (res) {
-						this.options = res
+						this.options = res.data
 					} else {
-						this.options =[]
+						this.options = []
 					}
 				} catch (e) {
 					this.options = []
@@ -148,9 +148,9 @@
 				try {
 					let res = await pointList(e)
 					if (res) {
-						this.options2 = res
+						this.options2 = res.data
 					} else {
-						this.options2 =[]
+						this.options2 = []
 					}
 				} catch (e) {
 					this.options2 = []
@@ -219,6 +219,7 @@
 				}
 				let res = await getWeight(this.index2, this.pkId)
 				if (res.code === '200') {
+					console.log(11111)
 					this.val3 = res.data.weight
 					this.flag = res.data.flag
 				}
diff --git a/pages/zw/jb-return-mater.vue b/pages/zw/jb-return-mater.vue
index 170a0eb..6f39e46 100644
--- a/pages/zw/jb-return-mater.vue
+++ b/pages/zw/jb-return-mater.vue
@@ -115,9 +115,9 @@
 				try {
 					let res = await regionList()
 					if (res) {
-						this.options = res
+						this.options = res.data
 					} else {
-						this.options =[]
+						this.options = []
 					}
 				} catch (e) {
 					this.options = []
@@ -127,9 +127,9 @@
 				try {
 					let res = await pointList(e)
 					if (res) {
-						this.options2 = res
+						this.options2 = res.data
 					} else {
-						this.options2 =[]
+						this.options2 = []
 					}
 				} catch (e) {
 					this.options2 = []
diff --git a/pages/zw/jb-up-mater.vue b/pages/zw/jb-up-mater.vue
index 7080501..069ff35 100644
--- a/pages/zw/jb-up-mater.vue
+++ b/pages/zw/jb-up-mater.vue
@@ -106,9 +106,9 @@
 				try {
 					let res = await regionList()
 					if (res) {
-						this.options = res
+						this.options = res.data
 					} else {
-						this.options =[]
+						this.options = []
 					}
 				} catch (e) {
 					this.options = []
@@ -118,9 +118,9 @@
 				try {
 					let res = await pointList(e)
 					if (res) {
-						this.options2 = res
+						this.options2 = res.data
 					} else {
-						this.options2 =[]
+						this.options2 = []
 					}
 				} catch (e) {
 					this.options2 = []
diff --git a/utils/getData4.js b/utils/getData4.js
index ab92d81..aab8948 100644
--- a/utils/getData4.js
+++ b/utils/getData4.js
@@ -125,9 +125,9 @@ export const regionList = () => request({
 	data: {}
 })
 // 获取设备下拉框数组
-export const pointList = () => request({
+export const pointList = (rcode) => request({
 	url:'api/pda/schPoint/pointList',
-	data: {}
+	data: {region_code: rcode}
 })
 
 // 解包上料