From 100992667f2e45f80349a856fe959372b79d8beb Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 24 七月 2025 14:25:15 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/index/tab1.vue  |  233 +++++++---
 manifest.json         |    4 
 pages/index/_tab1.vue |  172 +++++++
 pages.json            |   10 
 pages/index/_tab2.vue |  118 +++++
 pages/index/tab2.vue  |  191 +++++--
 pages/index/index.vue |  600 ++++++++++++++-----------
 7 files changed, 925 insertions(+), 403 deletions(-)

diff --git a/manifest.json b/manifest.json
index 09c0a4e..4fdb9a3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "鏅轰簯LMES",
     "appid" : "__UNI__B002F49",
     "description" : "",
-    "versionName" : "1.0.17",
-    "versionCode" : 117,
+    "versionName" : "1.0.18",
+    "versionCode" : 118,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 57fb142..7551cc6 100644
--- a/pages.json
+++ b/pages.json
@@ -18,13 +18,13 @@
 		{
 			"path": "pages/index/tab1",
 			"style": {
-				"navigationBarTitleText": "妯″潡鍔熻兘"
+				"navigationBarTitleText": "杞﹂棿宸ュ簭"
 			}
 		},
 		{
 			"path": "pages/index/tab2",
 			"style": {
-				"navigationBarTitleText": "鎶ヨ〃涓績"
+				"navigationBarTitleText": "鍗曟嵁鍒楄〃"
 			}
 		},
 		{
@@ -721,19 +721,19 @@
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabBar/home.png",
 				"selectedIconPath": "static/tabBar/home-default.png",
-				"text": "棣栭〉"
+				"text": "浠撳偍绠＄悊"
 			},
 			{
 				"pagePath": "pages/index/tab1",
 				"iconPath": "static/tabBar/icon1.png",
 				"selectedIconPath": "static/tabBar/icon1-default.png",
-				"text": "妯″潡鍔熻兘"
+				"text": "杞﹂棿宸ュ簭"
 			},
 			{
 				"pagePath": "pages/index/tab2",
 				"iconPath": "static/tabBar/icon2.png",
 				"selectedIconPath": "static/tabBar/icon2-default.png",
-				"text": "鎶ヨ〃涓績"
+				"text": "鍗曟嵁鍒楄〃"
 			},
 			{
 				"pagePath": "pages/index/mine",
diff --git a/pages/index/_tab1.vue b/pages/index/_tab1.vue
new file mode 100644
index 0000000..cb8ff13
--- /dev/null
+++ b/pages/index/_tab1.vue
@@ -0,0 +1,172 @@
+<template>
+	<view class="content">
+		<view class="mains">
+			<view class="box" v-for="(item,index) in itemData" :key="index" @tap="toUrl(item)">
+				<image :src="item.img" mode=""></image>
+				<view class="texts">
+					<view class="font1">{{item.text}}</view>
+					<view class="font2">鏌ョ湅璇︽儏</view>
+				</view>
+				<uni-icons type="forward" color="#888" style="position: absolute;right: 70rpx;" size="18"></uni-icons>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
+				itemData: [{
+					//  img:'../../static/icon0.png',
+					//  text:'鎶ヨ〃涓績',
+					//  url:'/pages/shebeilvli/table',
+					//  id:0
+					// },{
+					img: '../../static/icon/icon_a1.png',
+					text: '璁惧妗ｆ',
+					url: '/pages/shebeidangan/table',
+					id: 1
+				}, {
+					img: '../../static/icon/icon_a2.png',
+					text: '璁惧淇濆吇璁″垝鍗�',
+					url: '/pages/baoyangjihua/table',
+					id: 2
+				}, {
+					img: '../../static/icon/icon_a3.png',
+					text: '璁惧淇濆吇璁板綍鍗�',
+					url: '/pages/baoyangjilu/table',
+					id: 3
+					// },{
+					//  img:'../../static/icon/icon_a4.png',
+					//  text:'璁惧鐐规璁″垝鍗�',
+					//  url:'',
+					//  id:4
+					// },{
+					//  img:'../../static/icon/icon_a5.png',
+					//  text:'璁惧鐐规璁板綍鍗�',
+					//  url:'',
+					//  id:5,
+				}, {
+					img: '../../static/icon/icon_a6.png',
+					text: '璁惧鏁呴殰鐧昏琛�',
+					url: '/pages/guzhangdengji/table',
+					id: 6
+				}, {
+					img: '../../static/icon/icon_a7.png',
+					text: '璁惧缁翠慨璁板綍鍗�',
+					url: '/pages/shebeiweixiu/table',
+					id: 7,
+				}, {
+					img: '../../static/icon/icon_a8.png',
+					text: '璁惧灞ュ巻',
+					url: '/pages/shebeilvli/table',
+					id: 8,
+				}, {
+					img: '../../static/icon/icon_a9.png',
+					text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
+					url: '/pages/gongxuIn/table',
+					id: 9,
+				}, {
+					img: '../../static/icon/icon_a10.png',
+					text: '宸ュ簭鍑虹珯姹囨姤鍗�',
+					url: '/pages/gongxuOut/table',
+					id: 10,
+				}, {
+					img: '../../static/icon/icon_a11.png',
+					text: '宸ュ簭濮斿鍙戝嚭鍗�',
+					url: '/pages/weiwaigxIn/table',
+					id: 11,
+				}, {
+					img: '../../static/icon/icon_a12.png',
+					text: '宸ュ簭濮斿鎺ユ敹鍗�',
+					url: '/pages/weiwaigxOut/table',
+					id: 12,
+				// }, {
+				// 	img: '../../static/icon/icon_a13.png',
+				// 	text: '璁惧绠＄悊',
+				// 	url: '',
+				// 	id: 13,
+				}, {
+					img: '../../static/icon/icon_a14.png',
+					text: '鎶ュ伐骞冲彴',
+					url: '/pages/baogong/table',
+					id: 14,
+				}, {
+					img: '../../static/icon/icon_a15.png',
+					text: '寮傚父鍙嶉鍗�',
+					url: '/pages/yichang/table',
+					id: 15,
+				}, {
+					img: '../../static/icon/icon_a16.png',
+					text: '寮傚父鍙嶉澶勭悊鍗�',
+					url: '/pages/yichang/list',
+					id: 16,
+				}]
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			toUrl(item) {
+				if (item.url) {
+					uni.navigateTo({
+						url: item.url
+					})
+				} else {
+					// uni.showToast({
+					// 	title:'鍔熻兘寮�鍙戜腑銆傘�傘��',
+					// 	icon:'none'
+					// })
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		width: 100vw;
+		min-height: 100vh;
+		background-color: #f5f5f5;
+	}
+
+	.mains {
+		width: 720rpx;
+		margin: 0 auto;
+		padding-bottom: 120rpx;
+
+		.box {
+			width: 680rpx;
+			margin: 0 auto;
+			margin-top: 20rpx;
+			display: flex;
+			align-items: center;
+			background-color: #fff;
+			border-radius: 20rpx;
+			box-shadow: 2upx 2upx 20upx 0 #ddd;
+
+			image {
+				width: 78rpx;
+				height: 78rpx;
+				padding: 10rpx;
+				margin: 14rpx 30rpx;
+			}
+
+			.texts {
+				font-size: 30rpx;
+				font-weight: normal;
+				color: #333333;
+
+				.font1 {}
+
+				.font2 {
+					font-size: 25rpx;
+					color: #999;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/_tab2.vue b/pages/index/_tab2.vue
new file mode 100644
index 0000000..2857ecf
--- /dev/null
+++ b/pages/index/_tab2.vue
@@ -0,0 +1,118 @@
+<template>
+	<view class="content">
+		<view class="mains">
+			<view class="box" v-for="(item,index) in itemData" :key="index" @tap="toUrl(item)">
+				<image :src="item.img" mode=""></image>
+				<view class="texts">
+					{{item.text}}
+				</view>
+				<uni-icons type="forward" color="#888" style="position: absolute;right: 40rpx;" size="18"></uni-icons>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+	    data() {
+	        return {
+				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+	          itemData:[{
+				  img:'../../static/icon/icon_b1.png',
+				  text:'璁惧灞ュ巻鍒嗘瀽',
+				  url:'',
+				  id:1
+			  },{
+				  img:'../../static/icon/icon_b2.png',
+				  text:'璁惧淇濆吇缁熻鍒嗘瀽',
+				  url:'',
+				  id:2
+			  },{
+				  img:'../../static/icon/icon_b3.png',
+				  text:'璁惧鐐规缁熻鍒嗘瀽',
+				  url:'',
+				  id:3
+			  },{
+				  img:'../../static/icon/icon_b4.png',
+				  text:'璁惧缁翠慨缁熻鍒嗘瀽',
+				  url:'',
+				  id:4
+			  },{
+				  img:'../../static/icon/icon_b5.png',
+				  text:'璁惧鏁呴殰缁熻鍒嗘瀽',
+				  url:'',
+				  id:5,
+			  },{
+				  img:'../../static/icon/icon_b6.png',
+				  text:'杞﹂棿宸ユ椂缁熻琛�',
+				  url:'',
+				  id:6
+			  },{
+				  img:'../../static/icon/icon_b7.png',
+				  text:'鐢熶骇姹囨�绘姤琛�',
+				  url:'',
+				  id:7,
+			  },{
+				  img:'../../static/icon/icon_b8.png',
+				  text:'杞﹂棿鍦ㄥ埗鍝佹姤琛�',
+				  url:'',
+				  id:8,
+			  },{
+				  img:'../../static/icon/icon_b9.png',
+				  text:'涓嶈壇鍘熷洜鍒嗘瀽鎶ヨ〃',
+				  url:'',
+				  id:9,
+			  },{
+				  img:'../../static/icon/icon_b10.png',
+				  text:'杞﹂棿鐩撮�氱巼',
+				  url:'',
+				  id:10,
+			  }]
+	        }
+	    },
+		onLoad() {
+
+		},
+	    methods: {
+			toUrl(item){
+				if(item.url){
+					uni.navigateTo({
+						url:item.url
+					})
+				}else{
+					// uni.showToast({
+					// 	title:'鍔熻兘寮�鍙戜腑銆傘�傘��',
+					// 	icon:'none'
+					// })
+				}
+			}
+	    }
+	}
+</script>
+
+<style lang="scss" scoped>
+.mains{
+	width: 720rpx;
+	margin: 0 auto;
+	display: flex;
+	flex-wrap: wrap;
+	margin-top: 10rpx;
+	.box{
+		width: 100%;
+		margin: 40rpx 26rpx 0 26rpx;
+		padding: 0 0 20rpx 10rpx;
+		display: flex;
+		align-items: center;
+		border-bottom: 1px solid #f0f0f0;
+		image{
+			width: 40rpx;
+			height: 40rpx;
+		}
+		.texts{
+			font-size: 30rpx;
+			color: #333333;
+			margin-left: 30rpx;
+		}
+	}
+}
+</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f76362f..e3184c7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,9 +1,6 @@
 <template>
 	<view class="content">
 		<view class="header">鏅轰簯L-MES鍒堕�犳墽琛岀郴缁�</view>
-		<!-- 		<scroll-view scroll-y="true" id="content" :style="{
-			height: `calc(100vh - ${contentTop * 2}rpx - 50rpx)`
-		}"> -->
 		<view class="mains">
 			<view class="box" v-for="(item,index) in itemData" :key="index" @tap="toUrl(item)">
 				<image :src="item.img" mode=""></image>
@@ -12,9 +9,7 @@
 				</view>
 			</view>
 		</view>
-
-
-		<!-- </scroll-view> -->
+		
 		<vers></vers>
 	</view>
 </template>
@@ -27,293 +22,358 @@
 		},
 		data() {
 			return {
-				contentTop: 0,
 				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
 				itemData: [{
-						img: '../../static/icon/icon1.png',
-						text: '璁惧妗ｆ',
-						url: '/pages/shebeidangan/table',
-						id: 1
-					}, {
 						img: '../../static/icon/icon8.png',
-						text: '璁惧灞ュ巻',
-						url: '/pages/shebeilvli/table',
-						id: 0,
-					}, {
-						img: '../../static/icon/icon2.png',
-						text: '璁惧淇濆吇璁″垝鍗�',
-						url: '/pages/baoyangjihua/table',
-						id: 2
-					}, {
-						img: '../../static/icon/icon3.png',
-						text: '璁惧淇濆吇璁板綍鍗�',
-						url: '/pages/baoyangjilu/table',
-						id: 3
-					}, {
+						text: '閲囪喘璁㈠崟鏍囩',
+						url: '/pages/caigoudingdan/caigoudingdan',
+						id: 1
+					},{
 						img: '../../static/icon/icon4.png',
-						text: '璁惧鐐规璁″垝鍗�',
-						url: '',
-						id: 4
-					}, {
-						img: '../../static/icon/icon5.png',
-						text: '璁惧鐐规璁板綍鍗�',
-						url: '',
-						id: 5,
-					}, {
-						img: '../../static/icon/icon6.png',
-						text: '璁惧鏁呴殰鐧昏琛�',
-						url: '/pages/guzhangdengji/table',
-						id: 6
-					}, {
-						img: '../../static/icon/icon7.png',
-						text: '璁惧缁翠慨璁板綍鍗�',
-						url: '/pages/shebeiweixiu/table',
-						id: 7,
-						// },{
-						//  img:'../../static/icon/icon8.png',
-						//  text:'璁惧灞ュ巻',
-						//  url:'/pages/shebeilvli/table',
-						//  id:8,
-					}, {
-						img: '../../static/icon/icon9.png',
-						text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
-						url: '/pages/gongxuIn/table',
-						id: 9,
-					}, {
-						img: '../../static/icon/icon10.png',
-						text: '宸ュ簭鍑虹珯姹囨姤鍗�',
-						url: '/pages/gongxuOut/table',
-						id: 10,
-					}, {
+						text: '閲囪喘璁㈠崟瀛愭爣绛�',
+						url: '/pages/tiaomadaying/tiaomadaying',
+						id: 2,
+					},{
 						img: '../../static/icon/icon11.png',
-						text: '宸ュ簭濮斿鍙戝嚭鍗�',
-						url: '/pages/weiwaigxIn/table',
-						id: 11,
-					}, {
-						img: '../../static/icon/icon12.png',
-						text: '宸ュ簭濮斿鎺ユ敹鍗�',
-						url: '/pages/weiwaigxOut/table',
-						id: 12,
-						// }, {
-						// 	img: '../../static/icon/icon13.png',
-						// 	text: '璁惧绠＄悊',
-						// 	url: '/pages/shebeiguanli/table',
-						// 	id: 13,
-					}, {
-						img: '../../static/icon/icon14.png',
-						text: '鎶ュ伐骞冲彴',
-						url: '/pages/baogong/table',
-						id: 14,
-					}, {
-						img: '../../static/icon/icon15.png',
-						text: '寮傚父鍙嶉鍗�',
-						url: '/pages/yichang/table',
-						id: 15,
-					}, {
-						img: '../../static/icon/icon16.png',
-						text: '寮傚父鍙嶉澶勭悊鍗�',
-						url: '/pages/yichang/list',
-						id: 16,
-					}, {
-						img: '../../static/icon/icon17.png',
-						text: '閲囪喘鍏ュ簱',
-						url: '/pages/caigouruku/table',
-						id: 17,
-					}, {
-						img: '../../static/icon/icon18.png',
-						text: '閲囪喘閫�鏂�',
-						url: '/pages/caigoutuiliao/table',
-						id: 18,
-					}, {
-						img: '../../static/icon/icon19.png',
-						text: '閿�鍞嚭搴�',
-						url: '/pages/xiaoshouchuku/table',
-						id: 19,
-					}, {
-						img: '../../static/icon/icon20.png',
-						text: '閿�鍞��璐�',
-						url: '/pages/xiaoshoutuihuo/table',
-						id: 20,
-					}, {
-						img: '../../static/icon/icon21.png',
-						text: '鏀舵枡閫氱煡鍗�',
+						text: '鏀舵枡閫氱煡鍗曟爣绛�',
 						url: '/pages/shouliaotongzhi/table',
-						id: 21,
-					}, {
+						id: 3,
+					},{
+						img: '../../static/icon/icon17.png',
+						text: '閲囪喘鍏ュ簱鏂板',
+						url: '/pages/caigouruku/form?OperationType=1',
+						id: 4,
+					},{
+						img: '../../static/icon/icon20.png',
+						text: '閲囪喘閫�鏂欐柊澧�',
+						url: '/pages/caigoutuiliao/form?OperationType=1',
+						id: 5,
+					},{
+						img: '../../static/icon/icon32.png',
+						text: '鐩存帴璋冩嫧鏂板',
+						url: '',
+						id: 6,
+					},{
 						img: '../../static/icon/icon30.png',
-						text: '鐢熶骇棰嗘枡鏍￠獙',
-						url: '/pages/shengchanlingliao/table',
-						id: 30,
-					}, {
+						text: '鐢熶骇棰嗘枡鏂板',
+						url: '/pages/shengchanlingliaoshengdan/form?OperationType=1',
+						id: 7,
+					},{
 						img: '../../static/icon/icon31.png',
-						text: '鐢熶骇鍏ュ簱鏍￠獙',
-						url: '/pages/shengchanruku/table',
-						id: 31,
-					}, {
+						text: '鐢熶骇琛ユ枡鏂板',
+						url: '',
+						id: 8,
+					},{
+						img: '../../static/icon/icon17.png',
+						text: '鐢熶骇鍏ュ簱鏂板',
+						url: '',
+						id: 9,
+					},{
+						img: '../../static/icon/icon30.png',
+						text: '濮斿棰嗘枡鏂板',
+						url: '',
+						id: 10,
+					},{
+						img: '../../static/icon/icon17.png',
+						text: '鍏朵粬鍏ュ簱鏂板',
+						url: '/pages/qitaruku/form?OperationType=1',
+						id: 11,
+					},{
+						img: '../../static/icon/icon18.png',
+						text: '鍏朵粬鍑哄簱鏂板',
+						url: '/pages/qitachuku/form?OperationType=1',
+						id: 12,
+					},{
+						img: '../../static/icon/icon18.png',
+						text: '閿�鍞嚭搴撴柊澧�',
+						url: '/pages/xiaoshouchuku/form?OperationType=1',
+						id: 13,
+					},{
+						img: '../../static/icon/icon19.png',
+						text: '閿�鍞��璐ф柊澧�',
+						url: '/pages/xiaoshoutuihuo/form?OperationType=1',
+						id: 14,
+					},{
+						img: '../../static/icon/icon30.png',
+						text: '鐢熶骇棰嗘枡妫�楠�',
+						url: '/pages/shengchanlingliao/form?OperationType=1',
+						id: 15,
+					},{
+						img: '../../static/icon/icon31.png',
+						text: '鐢熶骇琛ユ枡鏍￠獙',
+						url: '/pages/shengchanbuliaojiaoyan/form?OperationType=1',
+						id: 16,
+					},{
 						img: '../../static/icon/icon32.png',
 						text: '鐢熶骇璋冩嫧鏍￠獙',
-						url: '/pages/shengchandiaobo/table',
-						id: 32,
-					},
-					{
-						img: '../../static/icon/icon16.png',
-						text: '鏍囩鎵撳嵃',
-						url: '/pages/labelPrinter/index',
-						id: 22,
-					},
-					{
-						img: '../../static/icon/icon16.png',
-						text: '璁惧杩愯鐘舵��',
-						url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
-						id: 23,
-					},
-					{
-						img: '../../static/icon/icon16.png',
-						text: '妯″叿杩愯鐘舵��',
-						url: '/pages/mujvzhuangtai/mujvzhuangtai',
-						id: 24,
-					},
-					{
-						img: '../../static/icon/icon16.png',
-						text: '鏉＄爜鎷嗙爜',
-						url: '/pages/tiaomachaima/tiaomachaima',
-						id: 25,
-					},
-					{
-						img: '../../static/icon/icon16.png',
-						text: '鍏朵粬鍏ュ簱',
-						url: '/pages/qitaruku/qitaruku',
-						id: 26,
-					},
-					{
-						img: '../../static/icon/icon16.png',
-						text: '鍏朵粬鍑哄簱',
-						url: '/pages/qitachuku/qitachuku',
-						id: 27,
-					},
-					{
-						img: '../../static/icon/icon16.png',
-						text: '鏉ユ枡鏉＄爜鎵撳嵃',
-						url: '/pages/tiaomadaying/tiaomadaying',
-						id: 28,
-					},
-					{
-						img: '../../static/icon/icon16.png',
-						text: '涓婃ā鍗�',
-						url: '/pages/MJGL/shangmudan/table',
-						id: 29,
-					},
-					{
-						img: '../../static/icon/icon16.png',
-						text: '閲囪喘璁㈠崟',
-						url: '/pages/caigoudingdan/caigoudingdan',
-						id: 30,
-					},
-					{
-						img: '../../static/icon/icon16.png',
+						url: '/pages/shengchandiaobo/form?OperationType=1',
+						id: 17,
+					},{
+						img: '../../static/icon/icon18.png',
 						text: '鍏朵粬鍑哄簱鏍￠獙',
-						url: '/pages/qitachukujiaoyan/qitachukujiaoyan',
-						id: 31,
-					},
-					{
-						img: '../../static/icon/icon16.png',
-						text: '鐢熶骇琛ユ枡鏍￠獙',
-						url: '/pages/shengchanbuliaojiaoyan/CacheList',
-						id: 32,
-					},
-					{
-						img: '../../static/icon/icon16.png',
+						url: '/pages/qitachukujiaoyan/detail?OperationType=1',
+						id: 18,
+					},{
+						img: '../../static/icon/icon17.png',
+						text: '鐢熶骇鍏ュ簱鏍￠獙',
+						url: '/pages/shengchanruku/form?OperationType=1',
+						id: 19,
+					},{
+						img: '../../static/icon/icon18.png',
 						text: '閿�鍞嚭搴撴牎楠�',
-						url: '/pages/xiaoshouchukujiaoyan/table',
-						id: 33,
-					},
-					{
-						img: '../../static/icon/icon16.png',
+						url: '/pages/xiaoshouchukujiaoyan/form?OperationType=1',
+						id: 20,
+					},{
+						img: '../../static/icon/icon30.png',
 						text: '濮斿棰嗘枡鏍￠獙',
-						url: '/pages/weiwailingliaojiaoyan/table',
-						id: 34,
-					},
-					{
-						img: '../../static/icon/icon16.png',
-						text: '閲囪喘鍏ュ簱鏍￠獙',
-						url: '/pages/caigourukujiaoyan/table',
-						id: 35,
-					},
-					{
-						img: '../../static/icon/icon16.png',
-						text: '鍏朵粬鍏ュ簱鏍￠獙',
-						url: '/pages/qitarukujiaoyan/table',
-						id: 36,
-					},
-					{
-						img: '../../static/icon/icon16.png',
-						text: '濮斿琛ユ枡鏍￠獙',
-						url: '/pages/weiwaibuliaojiaoyan/table',
-						id: 37,
-					},
-					{
-						img: '../../static/icon/icon30.png',
-						text: '鐢熶骇棰嗘枡',
-						url: '/pages/shengchanlingliaoshengdan/table',
-						id: 38,
-					},
-					{
-						img: '../../static/icon/icon30.png',
-						text: '濮斿棰嗘枡',
-						url: '/pages/weiwailingliao/table',
-						id: 39,
-					},
-					{
-						img: '../../static/icon/icon17.png',
-						text: '鐢熶骇鍏ュ簱',
-						url: '/pages/shengchanrukushengdan/table',
-						id: 40,
-					},
-					{
-						img: '../../static/icon/zy_icon33.png',
-						text: '鐢熶骇琛ユ枡',
-						url: '/pages/shengchanbuliao/table',
-						id: 41,
-					},
-					{
-						img: '../../static/icon/icon17.png',
-						text: '鍏朵粬鍏ュ簱',
-						url: '/pages/qitaruku_v2/table',
-						id: 42,
-					},
-					{
-						img: '../../static/icon/icon19.png',
-						text: '鍏朵粬鍑哄簱',
-						url: '/pages/qitachuku_v2/table',
-						id: 43,
-					}
-				]
+						url: '/pages/weiwailingliaojiaoyan/form?OperationType=1',
+						id: 21,
+					}],
+				// itemData: [{
+				// 		img: '../../static/icon/icon1.png',
+				// 		text: '璁惧妗ｆ',
+				// 		url: '/pages/shebeidangan/table',
+				// 		id: 1
+				// 	}, {
+				// 		img: '../../static/icon/icon8.png',
+				// 		text: '璁惧灞ュ巻',
+				// 		url: '/pages/shebeilvli/table',
+				// 		id: 0,
+				// 	}, {
+				// 		img: '../../static/icon/icon2.png',
+				// 		text: '璁惧淇濆吇璁″垝鍗�',
+				// 		url: '/pages/baoyangjihua/table',
+				// 		id: 2
+				// 	}, {
+				// 		img: '../../static/icon/icon3.png',
+				// 		text: '璁惧淇濆吇璁板綍鍗�',
+				// 		url: '/pages/baoyangjilu/table',
+				// 		id: 3
+				// 	}, {
+				// 		img: '../../static/icon/icon4.png',
+				// 		text: '璁惧鐐规璁″垝鍗�',
+				// 		url: '',
+				// 		id: 4
+				// 	}, {
+				// 		img: '../../static/icon/icon5.png',
+				// 		text: '璁惧鐐规璁板綍鍗�',
+				// 		url: '',
+				// 		id: 5,
+				// 	}, {
+				// 		img: '../../static/icon/icon6.png',
+				// 		text: '璁惧鏁呴殰鐧昏琛�',
+				// 		url: '/pages/guzhangdengji/table',
+				// 		id: 6
+				// 	}, {
+				// 		img: '../../static/icon/icon7.png',
+				// 		text: '璁惧缁翠慨璁板綍鍗�',
+				// 		url: '/pages/shebeiweixiu/table',
+				// 		id: 7,
+				// 		// },{
+				// 		//  img:'../../static/icon/icon8.png',
+				// 		//  text:'璁惧灞ュ巻',
+				// 		//  url:'/pages/shebeilvli/table',
+				// 		//  id:8,
+				// 	}, {
+				// 		img: '../../static/icon/icon9.png',
+				// 		text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
+				// 		url: '/pages/gongxuIn/table',
+				// 		id: 9,
+				// 	}, {
+				// 		img: '../../static/icon/icon10.png',
+				// 		text: '宸ュ簭鍑虹珯姹囨姤鍗�',
+				// 		url: '/pages/gongxuOut/table',
+				// 		id: 10,
+				// 	}, {
+				// 		img: '../../static/icon/icon11.png',
+				// 		text: '宸ュ簭濮斿鍙戝嚭鍗�',
+				// 		url: '/pages/weiwaigxIn/table',
+				// 		id: 11,
+				// 	}, {
+				// 		img: '../../static/icon/icon12.png',
+				// 		text: '宸ュ簭濮斿鎺ユ敹鍗�',
+				// 		url: '/pages/weiwaigxOut/table',
+				// 		id: 12,
+				// 		// }, {
+				// 		// 	img: '../../static/icon/icon13.png',
+				// 		// 	text: '璁惧绠＄悊',
+				// 		// 	url: '/pages/shebeiguanli/table',
+				// 		// 	id: 13,
+				// 	}, {
+				// 		img: '../../static/icon/icon14.png',
+				// 		text: '鎶ュ伐骞冲彴',
+				// 		url: '/pages/baogong/table',
+				// 		id: 14,
+				// 	}, {
+				// 		img: '../../static/icon/icon15.png',
+				// 		text: '寮傚父鍙嶉鍗�',
+				// 		url: '/pages/yichang/table',
+				// 		id: 15,
+				// 	}, {
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '寮傚父鍙嶉澶勭悊鍗�',
+				// 		url: '/pages/yichang/list',
+				// 		id: 16,
+				// 	}, {
+				// 		img: '../../static/icon/icon17.png',
+				// 		text: '閲囪喘鍏ュ簱',
+				// 		url: '/pages/caigouruku/table',
+				// 		id: 17,
+				// 	}, {
+				// 		img: '../../static/icon/icon18.png',
+				// 		text: '閲囪喘閫�鏂�',
+				// 		url: '/pages/caigoutuiliao/table',
+				// 		id: 18,
+				// 	}, {
+				// 		img: '../../static/icon/icon19.png',
+				// 		text: '閿�鍞嚭搴�',
+				// 		url: '/pages/xiaoshouchuku/table',
+				// 		id: 19,
+				// 	}, {
+				// 		img: '../../static/icon/icon20.png',
+				// 		text: '閿�鍞��璐�',
+				// 		url: '/pages/xiaoshoutuihuo/table',
+				// 		id: 20,
+				// 	}, {
+				// 		img: '../../static/icon/icon21.png',
+				// 		text: '鏀舵枡閫氱煡鍗�',
+				// 		url: '/pages/shouliaotongzhi/table',
+				// 		id: 21,
+				// 	},{
+				// 		img: '../../static/icon/icon30.png',
+				// 		text: '鐢熶骇棰嗘枡鏍￠獙',
+				// 		url: '/pages/shengchanlingliao/table',
+				// 		id: 30,
+				// 	},{
+				// 		img: '../../static/icon/icon31.png',
+				// 		text: '鐢熶骇鍏ュ簱鏍￠獙',
+				// 		url: '/pages/shengchanruku/table',
+				// 		id: 31,
+				// 	},{
+				// 		img: '../../static/icon/icon32.png',
+				// 		text: '鐢熶骇璋冩嫧鏍￠獙',
+				// 		url: '/pages/shengchandiaobo/table',
+				// 		id: 32,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鏍囩鎵撳嵃',
+				// 		url: '/pages/labelPrinter/index',
+				// 		id: 22,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '璁惧杩愯鐘舵��',
+				// 		url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
+				// 		id: 23,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '妯″叿杩愯鐘舵��',
+				// 		url: '/pages/mujvzhuangtai/mujvzhuangtai',
+				// 		id: 24,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鏉＄爜鎷嗙爜',
+				// 		url: '/pages/tiaomachaima/tiaomachaima',
+				// 		id: 25,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鍏朵粬鍏ュ簱',
+				// 		url: '/pages/qitaruku/qitaruku',
+				// 		id: 26,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鍏朵粬鍑哄簱',
+				// 		url: '/pages/qitachuku/qitachuku',
+				// 		id: 27,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鏉ユ枡鏉＄爜鎵撳嵃',
+				// 		url: '/pages/tiaomadaying/tiaomadaying',
+				// 		id: 28,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '涓婃ā鍗�',
+				// 		url: '/pages/MJGL/shangmudan/table',
+				// 		id: 29,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '閲囪喘璁㈠崟',
+				// 		url: '/pages/caigoudingdan/caigoudingdan',
+				// 		id: 30,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鍏朵粬鍑哄簱鏍￠獙',
+				// 		url: '/pages/qitachukujiaoyan/qitachukujiaoyan',
+				// 		id: 31,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鐢熶骇琛ユ枡鏍￠獙',
+				// 		url: '/pages/shengchanbuliaojiaoyan/CacheList',
+				// 		id: 32,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '閿�鍞嚭搴撴牎楠�',
+				// 		url: '/pages/xiaoshouchukujiaoyan/table',
+				// 		id: 33,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '濮斿棰嗘枡鏍￠獙',
+				// 		url: '/pages/weiwailingliaojiaoyan/table',
+				// 		id: 34,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '閲囪喘鍏ュ簱鏍￠獙',
+				// 		url: '/pages/caigourukujiaoyan/table',
+				// 		id: 35,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '鍏朵粬鍏ュ簱鏍￠獙',
+				// 		url: '/pages/qitarukujiaoyan/table',
+				// 		id: 36,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon16.png',
+				// 		text: '濮斿琛ユ枡鏍￠獙',
+				// 		url: '/pages/weiwaibuliaojiaoyan/table',
+				// 		id: 37,
+				// 	},
+				// 	{
+				// 		img: '../../static/icon/icon17.png',
+				// 		text: '鐢熶骇棰嗘枡',
+				// 		url: '/pages/shengchanlingliaoshengdan/table',
+				// 		id: 38,
+				// 	}, 
+				// ]
 			}
 		},
 		onLoad() {
-			// this.$nextTick(() => {
-			// 	this.setScrollHeight()
-			// })
+
 		},
 		methods: {
-			setScrollHeight() {
-				// const query = uni.createSelectorQuery().in(this);
-				// query.select("#content")
-				// .boundingClientRect((data) => {
-				// 	this.contentTop = data.top
-				// })
-				// .exec()
-			},
 			toUrl(item) {
 				if (item.url) {
 					uni.navigateTo({
 						url: item.url
 					})
 				} else {
-					// uni.showToast({
-					// 	title:'鍔熻兘寮�鍙戜腑銆傘�傘��',
-					// 	icon:'none'
-					// })
+					uni.showToast({
+						title:'鍔熻兘寮�鍙戜腑銆傘�傘��',
+						icon:'none'
+					})
 				}
 			}
 		}
@@ -337,7 +397,7 @@
 		display: flex;
 		flex-wrap: wrap;
 		margin-top: 3vh;
-		// padding-bottom: 5vh;
+		padding-bottom: 5vh;
 
 		.box {
 			width: 25%;
diff --git a/pages/index/tab1.vue b/pages/index/tab1.vue
index cb8ff13..182e044 100644
--- a/pages/index/tab1.vue
+++ b/pages/index/tab1.vue
@@ -5,7 +5,7 @@
 				<image :src="item.img" mode=""></image>
 				<view class="texts">
 					<view class="font1">{{item.text}}</view>
-					<view class="font2">鏌ョ湅璇︽儏</view>
+					<view class="font2">{{item.tip}}</view>
 				</view>
 				<uni-icons type="forward" color="#888" style="position: absolute;right: 70rpx;" size="18"></uni-icons>
 			</view>
@@ -19,91 +19,182 @@
 			return {
 				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
 				itemData: [{
-					//  img:'../../static/icon0.png',
-					//  text:'鎶ヨ〃涓績',
-					//  url:'/pages/shebeilvli/table',
-					//  id:0
-					// },{
-					img: '../../static/icon/icon_a1.png',
-					text: '璁惧妗ｆ',
-					url: '/pages/shebeidangan/table',
-					id: 1
-				}, {
-					img: '../../static/icon/icon_a2.png',
-					text: '璁惧淇濆吇璁″垝鍗�',
-					url: '/pages/baoyangjihua/table',
-					id: 2
-				}, {
-					img: '../../static/icon/icon_a3.png',
-					text: '璁惧淇濆吇璁板綍鍗�',
-					url: '/pages/baoyangjilu/table',
-					id: 3
-					// },{
-					//  img:'../../static/icon/icon_a4.png',
-					//  text:'璁惧鐐规璁″垝鍗�',
-					//  url:'',
-					//  id:4
-					// },{
-					//  img:'../../static/icon/icon_a5.png',
-					//  text:'璁惧鐐规璁板綍鍗�',
-					//  url:'',
-					//  id:5,
-				}, {
-					img: '../../static/icon/icon_a6.png',
-					text: '璁惧鏁呴殰鐧昏琛�',
-					url: '/pages/guzhangdengji/table',
-					id: 6
-				}, {
-					img: '../../static/icon/icon_a7.png',
-					text: '璁惧缁翠慨璁板綍鍗�',
-					url: '/pages/shebeiweixiu/table',
-					id: 7,
-				}, {
-					img: '../../static/icon/icon_a8.png',
-					text: '璁惧灞ュ巻',
-					url: '/pages/shebeilvli/table',
-					id: 8,
+					img: '../../static/icon/icon_a9.png',
+					text: '宸ュ簭杩涚珯鎺ユ敹鍗曟柊澧�',
+					tip: '绔嬪嵆鏂板',
+					url: '/pages/gongxuIn/form',
+					id: 1,
 				}, {
 					img: '../../static/icon/icon_a9.png',
-					text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
+					text: '宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�',
+					tip: '鏌ョ湅鍒楄〃',
 					url: '/pages/gongxuIn/table',
-					id: 9,
+					id: 2,
 				}, {
 					img: '../../static/icon/icon_a10.png',
-					text: '宸ュ簭鍑虹珯姹囨姤鍗�',
+					text: '宸ュ簭鍑虹珯姹囨姤鍗曟柊澧�',
+					tip: '绔嬪嵆鏂板',
+					url: '/pages/gongxuOut/form',
+					id: 3,
+				}, {
+					img: '../../static/icon/icon_a10.png',
+					text: '宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�',
+					tip: '鏌ョ湅鍒楄〃',
 					url: '/pages/gongxuOut/table',
-					id: 10,
+					id: 4,
 				}, {
 					img: '../../static/icon/icon_a11.png',
-					text: '宸ュ簭濮斿鍙戝嚭鍗�',
+					text: '宸ュ簭濮斿鍙戝嚭鍗曟柊澧�',
+					tip: '绔嬪嵆鏂板',
+					url: '/pages/weiwaigxIn/form',
+					id: 5,
+				}, {
+					img: '../../static/icon/icon_a11.png',
+					text: '宸ュ簭濮斿鍙戝嚭鍗曞垪琛�',
+					tip: '鏌ョ湅鍒楄〃',
 					url: '/pages/weiwaigxIn/table',
-					id: 11,
+					id: 6,
 				}, {
 					img: '../../static/icon/icon_a12.png',
-					text: '宸ュ簭濮斿鎺ユ敹鍗�',
+					text: '宸ュ簭濮斿鎺ユ敹鍗曟柊澧�',
+					tip: '绔嬪嵆鏂板',
+					url: '/pages/weiwaigxOut/form',
+					id: 7,
+				}, {
+					img: '../../static/icon/icon_a12.png',
+					text: '宸ュ簭濮斿鎺ユ敹鍗曞垪琛�',
+					tip: '鏌ョ湅鍒楄〃',
 					url: '/pages/weiwaigxOut/table',
-					id: 12,
-				// }, {
-				// 	img: '../../static/icon/icon_a13.png',
-				// 	text: '璁惧绠＄悊',
-				// 	url: '',
-				// 	id: 13,
+					id: 8,
+				}, {
+					img: '../../static/icon/icon_a1.png',
+					text: '璁惧妗ｆ鏌ヨ',
+					tip: '鏌ョ湅璇︽儏',
+					url: '/pages/shebeidangan/table',
+					id: 9,
+				}, {
+					img: '../../static/icon/icon_a8.png',
+					text: '璁惧灞ュ巻鏌ヨ',
+					tip: '鏌ョ湅璇︽儏',
+					url: '/pages/shebeilvli/table',
+					id: 10,
 				}, {
 					img: '../../static/icon/icon_a14.png',
-					text: '鎶ュ伐骞冲彴',
+					text: '鎴戠殑鎶ュ伐骞冲彴',
+					tip: '鐐瑰嚮杩涘叆',
 					url: '/pages/baogong/table',
+					id: 11,
+				}, {
+					img: '../../static/icon/icon_a13.png',
+					text: '涓婃ā鍗�',
+					tip: '鏌ョ湅璇︽儏',
+					url: '/pages/MJGL/shangmudan/table',
+					id: 12,
+				}, {
+					img: '../../static/icon/icon_a13.png',
+					text: '涓嬫ā鍗�',
+					tip: '鏌ョ湅璇︽儏',
+					url: '',
+					id: 13,
+				}, {
+					img: '../../static/icon/icon_a32.png',
+					text: '璁惧杩愯鐘舵��',
+					tip: '鏌ョ湅璇︽儏',
+					url: '/pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai',
 					id: 14,
 				}, {
-					img: '../../static/icon/icon_a15.png',
-					text: '寮傚父鍙嶉鍗�',
-					url: '/pages/yichang/table',
+					img: '../../static/icon/icon_a6.png',
+					text: '妯″叿鐘舵�佸垎鏋�',
+					tip: '鏌ョ湅璇︽儏',
+					url: '/pages/mujvzhuangtai/mujvzhuangtai',
 					id: 15,
-				}, {
-					img: '../../static/icon/icon_a16.png',
-					text: '寮傚父鍙嶉澶勭悊鍗�',
-					url: '/pages/yichang/list',
-					id: 16,
 				}]
+				// itemData: [{
+				// 	//  img:'../../static/icon0.png',
+				// 	//  text:'鎶ヨ〃涓績',
+				// 	//  url:'/pages/shebeilvli/table',
+				// 	//  id:0
+				// 	// },{
+				// 	img: '../../static/icon/icon_a1.png',
+				// 	text: '璁惧妗ｆ',
+				// 	url: '/pages/shebeidangan/table',
+				// 	id: 1
+				// }, {
+				// 	img: '../../static/icon/icon_a2.png',
+				// 	text: '璁惧淇濆吇璁″垝鍗�',
+				// 	url: '/pages/baoyangjihua/table',
+				// 	id: 2
+				// }, {
+				// 	img: '../../static/icon/icon_a3.png',
+				// 	text: '璁惧淇濆吇璁板綍鍗�',
+				// 	url: '/pages/baoyangjilu/table',
+				// 	id: 3
+				// 	// },{
+				// 	//  img:'../../static/icon/icon_a4.png',
+				// 	//  text:'璁惧鐐规璁″垝鍗�',
+				// 	//  url:'',
+				// 	//  id:4
+				// 	// },{
+				// 	//  img:'../../static/icon/icon_a5.png',
+				// 	//  text:'璁惧鐐规璁板綍鍗�',
+				// 	//  url:'',
+				// 	//  id:5,
+				// }, {
+				// 	img: '../../static/icon/icon_a6.png',
+				// 	text: '璁惧鏁呴殰鐧昏琛�',
+				// 	url: '/pages/guzhangdengji/table',
+				// 	id: 6
+				// }, {
+				// 	img: '../../static/icon/icon_a7.png',
+				// 	text: '璁惧缁翠慨璁板綍鍗�',
+				// 	url: '/pages/shebeiweixiu/table',
+				// 	id: 7,
+				// }, {
+				// 	img: '../../static/icon/icon_a8.png',
+				// 	text: '璁惧灞ュ巻',
+				// 	url: '/pages/shebeilvli/table',
+				// 	id: 8,
+				// }, {
+				// 	img: '../../static/icon/icon_a9.png',
+				// 	text: '宸ュ簭杩涚珯鎺ユ敹鍗�',
+				// 	url: '/pages/gongxuIn/table',
+				// 	id: 9,
+				// }, {
+				// 	img: '../../static/icon/icon_a10.png',
+				// 	text: '宸ュ簭鍑虹珯姹囨姤鍗�',
+				// 	url: '/pages/gongxuOut/table',
+				// 	id: 10,
+				// }, {
+				// 	img: '../../static/icon/icon_a11.png',
+				// 	text: '宸ュ簭濮斿鍙戝嚭鍗�',
+				// 	url: '/pages/weiwaigxIn/table',
+				// 	id: 11,
+				// }, {
+				// 	img: '../../static/icon/icon_a12.png',
+				// 	text: '宸ュ簭濮斿鎺ユ敹鍗�',
+				// 	url: '/pages/weiwaigxOut/table',
+				// 	id: 12,
+				// // }, {
+				// // 	img: '../../static/icon/icon_a13.png',
+				// // 	text: '璁惧绠＄悊',
+				// // 	url: '',
+				// // 	id: 13,
+				// }, {
+				// 	img: '../../static/icon/icon_a14.png',
+				// 	text: '鎶ュ伐骞冲彴',
+				// 	url: '/pages/baogong/table',
+				// 	id: 14,
+				// }, {
+				// 	img: '../../static/icon/icon_a15.png',
+				// 	text: '寮傚父鍙嶉鍗�',
+				// 	url: '/pages/yichang/table',
+				// 	id: 15,
+				// }, {
+				// 	img: '../../static/icon/icon_a16.png',
+				// 	text: '寮傚父鍙嶉澶勭悊鍗�',
+				// 	url: '/pages/yichang/list',
+				// 	id: 16,
+				// }]
 			}
 		},
 		onLoad() {
@@ -116,10 +207,10 @@
 						url: item.url
 					})
 				} else {
-					// uni.showToast({
-					// 	title:'鍔熻兘寮�鍙戜腑銆傘�傘��',
-					// 	icon:'none'
-					// })
+					uni.showToast({
+						title:'鍔熻兘寮�鍙戜腑銆傘�傘��',
+						icon:'none'
+					})
 				}
 			}
 		}
diff --git a/pages/index/tab2.vue b/pages/index/tab2.vue
index 2857ecf..3d0894c 100644
--- a/pages/index/tab2.vue
+++ b/pages/index/tab2.vue
@@ -17,57 +17,137 @@
 	    data() {
 	        return {
 				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
-	          itemData:[{
-				  img:'../../static/icon/icon_b1.png',
-				  text:'璁惧灞ュ巻鍒嗘瀽',
-				  url:'',
-				  id:1
-			  },{
-				  img:'../../static/icon/icon_b2.png',
-				  text:'璁惧淇濆吇缁熻鍒嗘瀽',
-				  url:'',
-				  id:2
-			  },{
-				  img:'../../static/icon/icon_b3.png',
-				  text:'璁惧鐐规缁熻鍒嗘瀽',
-				  url:'',
-				  id:3
-			  },{
-				  img:'../../static/icon/icon_b4.png',
-				  text:'璁惧缁翠慨缁熻鍒嗘瀽',
-				  url:'',
-				  id:4
-			  },{
-				  img:'../../static/icon/icon_b5.png',
-				  text:'璁惧鏁呴殰缁熻鍒嗘瀽',
-				  url:'',
-				  id:5,
-			  },{
-				  img:'../../static/icon/icon_b6.png',
-				  text:'杞﹂棿宸ユ椂缁熻琛�',
-				  url:'',
-				  id:6
-			  },{
-				  img:'../../static/icon/icon_b7.png',
-				  text:'鐢熶骇姹囨�绘姤琛�',
-				  url:'',
-				  id:7,
-			  },{
-				  img:'../../static/icon/icon_b8.png',
-				  text:'杞﹂棿鍦ㄥ埗鍝佹姤琛�',
-				  url:'',
-				  id:8,
-			  },{
-				  img:'../../static/icon/icon_b9.png',
-				  text:'涓嶈壇鍘熷洜鍒嗘瀽鎶ヨ〃',
-				  url:'',
-				  id:9,
-			  },{
-				  img:'../../static/icon/icon_b10.png',
-				  text:'杞﹂棿鐩撮�氱巼',
-				  url:'',
-				  id:10,
-			  }]
+				itemData:[{
+						img:'../../static/icon/icon_a17.png',
+						text:'閲囪喘鍏ュ簱鏆傚瓨鍒楄〃',
+						url:'/pages/caigouruku/table',
+						id:1
+					},{
+						img:'../../static/icon/icon_a18.png',
+						text:'閲囪喘閫�鏂欐殏瀛樺垪琛�',
+						url:'/pages/caigoutuiliao/table',
+						id:2,
+					},{
+						img:'../../static/icon/icon_a17.png',
+						text:'鍏朵粬鍏ュ簱鏆傚瓨鍒楄〃',
+						url:'/pages/qitaruku/qitaruku',
+						id:3,
+					},{
+						img:'../../static/icon/icon_a18.png',
+						text:'鍏朵粬鍑哄簱鏆傚瓨鍒楄〃',
+						url:'/pages/qitachuku/qitachuku',
+						id:4,
+					},{
+						img:'../../static/icon/icon_a32.png',
+						text:'鐩存帴璋冩嫧鏆傚瓨鍒楄〃',
+						url:'',
+						id:5,
+					},{
+						img:'../../static/icon/icon_a30.png',
+						text:'鐢熶骇棰嗘枡鏆傚瓨鍒楄〃',
+						url:'/pages/shengchanlingliaoshengdan/table',
+						id:6,
+					},{
+						img:'../../static/icon/icon_a31.png',
+						text:'鐢熶骇琛ユ枡鏆傚瓨鍒楄〃',
+						url:'',
+						id:7,
+					},{
+						img:'../../static/icon/icon_a17.png',
+						text:'鐢熶骇鍏ュ簱鏆傚瓨鍒楄〃',
+						url:'',
+						id:8,
+					},{
+						img:'../../static/icon/icon_a30.png',
+						text:'濮斿棰嗘枡鏆傚瓨鍒楄〃',
+						url:'',
+						id:9,
+					},{
+						img:'../../static/icon/icon_a18.png',
+						text:'閿�鍞嚭搴撴殏瀛樺垪琛�',
+						url:'/pages/xiaoshouchuku/table',
+						id:10,
+					},{
+						img:'../../static/icon/icon_a20.png',
+						text:'閿�鍞��璐ф殏瀛樺垪琛�',
+						url:'/pages/xiaoshoutuihuo/table',
+						id:11
+					},{
+						img:'../../static/icon/icon_a30.png',
+						text:'鐢熶骇棰嗘枡鏍￠獙鏆傚瓨鍒楄〃',
+						url:'/pages/shengchanlingliao/table',
+						id:12,
+					},{
+						img:'../../static/icon/icon_a31.png',
+						text:'鐢熶骇琛ユ枡鏍￠獙鏆傚瓨鍒楄〃',
+						url:'/pages/shengchanbuliaojiaoyan/CacheList',
+						id:13,
+					},{
+						img:'../../static/icon/icon_a32.png',
+						text:'鐢熶骇璋冩嫧鏍￠獙鏆傚瓨鍒楄〃',
+						url:'/pages/shengchandiaobo/table',
+						id:14,
+					},{
+						img:'../../static/icon/icon_a18.png',
+						text:'鍏朵粬鍑哄簱鏍￠獙鏆傚瓨鍒楄〃',
+						url:'/pages/qitachuku/qitachuku',
+						id:15,
+					},{
+						img:'../../static/icon/icon_a17.png',
+						text:'鐢熶骇鍏ュ簱鏍￠獙鏆傚瓨鍒楄〃',
+						url:'/pages/shengchanruku/table',
+						id:16,
+					},{
+						img:'../../static/icon/icon_a18.png',
+						text:'閿�鍞嚭搴撴牎楠屾殏瀛樺垪琛�',
+						url:'/pages/xiaoshouchukujiaoyan/table',
+						id:17,
+					},{
+						img:'../../static/icon/icon_a30.png',
+						text:'濮斿棰嗘枡鏍￠獙鏆傚瓨鍒楄〃',
+						url:'/pages/weiwailingliaojiaoyan/table',
+						id:18,
+					},{
+						img:'../../static/icon/icon_a3.png',
+						text:'璁惧淇濆吇璁板綍鍗�',
+						url:'/pages/baoyangjilu/table',
+						id:19,
+					},{
+						img:'../../static/icon/icon_a5.png',
+						text:'璁惧鐐规璁板綍鍗�',
+						url:'',
+						id:20,
+					},{
+						img:'../../static/icon/icon_a6.png',
+						text:'璁惧鏁呴殰鐧昏琛�',
+						url:'/pages/guzhangdengji/table',
+						id:21,
+					},{
+						img:'../../static/icon/icon_a7.png',
+						text:'璁惧缁翠慨璁板綍鍗�',
+						url:'/pages/shebeiweixiu/table',
+						id:22,
+					},{
+						img:'../../static/icon/icon_a15.png',
+						text:'寮傚父鍙嶉鍗�',
+						url:'/pages/yichang/table',
+						id:23,
+					},{
+						img:'../../static/icon/icon_a16.png',
+						text:'寮傚父鍙嶉澶勭悊鍗�',
+						url:'/pages/yichang/list',
+						id:24,
+					},{
+						img:'../../static/icon/icon_a21.png',
+						text:'鏍囩鎵撳嵃',
+						url:'/pages/labelPrinter/index',
+						id:25,
+					},{
+						img:'../../static/icon/icon_a21.png',
+						text:'鏉＄爜鎷嗙爜',
+						url:'/pages/tiaomachaima/tiaomachaima',
+						id:26,
+					}]
 	        }
 	    },
 		onLoad() {
@@ -80,10 +160,10 @@
 						url:item.url
 					})
 				}else{
-					// uni.showToast({
-					// 	title:'鍔熻兘寮�鍙戜腑銆傘�傘��',
-					// 	icon:'none'
-					// })
+					uni.showToast({
+						title:'鍔熻兘寮�鍙戜腑銆傘�傘��',
+						icon:'none'
+					})
 				}
 			}
 	    }
@@ -97,6 +177,7 @@
 	display: flex;
 	flex-wrap: wrap;
 	margin-top: 10rpx;
+	padding-bottom: 80rpx;
 	.box{
 		width: 100%;
 		margin: 40rpx 26rpx 0 26rpx;

--
Gitblit v1.9.1