~jhz/STUWMS.git

			@@ -1,8 +1,7 @@
			{
			"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
			{
			"path": "pages/index/login",

			"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
			{
			"path": "pages/index/login",
			"style": {
			"navigationBarTitleText": "登录",
			"navigationStyle": "custom"
			@@ -18,13 +17,13 @@
			{
			"path": "pages/index/tab1",
			"style": {
			"navigationBarTitleText": "模块功能"
			"navigationBarTitleText": "车间工序"
			}
			},
			{
			"path": "pages/index/tab2",
			"style": {
			"navigationBarTitleText": "报表中心"
			"navigationBarTitleText": "单据列表"
			}
			},
			{
			@@ -410,6 +409,12 @@
			}
			},
			{
			"path": "pages/tiaomachaima/tiaomachaima2",
			"style": {
			"navigationBarTitleText": "条码拆码2"
			}
			},
			{
			"path": "pages/wuliaosaoma/wuliaosaoma",
			"style": {
			"navigationBarTitleText": "物料清单"
			@@ -502,7 +507,7 @@
			{
			"path": "pages/tiaomadaying/tiaomadaying",
			"style": {
			"navigationBarTitleText": "来料条码打印"
			"navigationBarTitleText": "采购条码打印"
			}
			},
			{
			@@ -710,6 +715,28 @@
			{
			"navigationBarTitleText" : "其他出库单"
			}
			},
			{
			"path" : "pages/zhijiediaobo/table",
			"style" :
			{
			"navigationBarTitleText" : "直接调拨",
			"enablePullDownRefresh": true
			}
			},
			{
			"path" : "pages/zhijiediaobo/form",
			"style" :
			{
			"navigationBarTitleText" : "直接调拨单"
			}
			},
			{
			"path" : "pages/xiugaimima/index",
			"style" :
			{
			"navigationBarTitleText" : "修改密码"
			}
			}
			],
			"tabBar": {
			@@ -721,19 +748,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",