1.18整合

pages.json

@@ -14,6 +14,12 @@
 				"navigationBarTitleText": "三查一曝光"
 			}
 		},
+		{
+			"path": "pages/map/map",
+			"style": {
+				"navigationBarTitleText": "一张图"
+			}
+		},
 		{
 			"path": "pages/plandetail/plandetail",
 			"style": {
@@ -98,6 +104,12 @@
 							"navigationBarTitleText": "隐患验收"
 						}
 		},
+		{
+			"path":"pages/hiddendanger/assignment",
+			"style": {
+							"navigationBarTitleText": "隐患交办"
+						}
+		},
 		{
 			"path":"pages/closeout/application",
 			"style": {
@@ -170,7 +182,53 @@
 							"navigationBarTitleText": "编辑资料"
 							
 						}
-		}
+		},
+		{
+					"path" : "pages/login/login",
+					"style" : 
+					{
+						"navigationBarTitleText" : "登录页面",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path" : "pages/login/reg",
+					"style" : 
+					{
+						"navigationBarTitleText" : "注册账号",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path" : "pages/login/enterprise",
+					"style" : 
+					{
+						"navigationBarTitleText" : "注册新企业"
+					}
+				},
+				{
+					"path" : "pages/login/success",
+					"style" : 
+					{
+						"navigationBarTitleText" : "注册成功"
+					}
+				},
+				{
+					"path" : "pages/login/forget",
+					"style" : 
+					{
+						"navigationBarTitleText" : "忘记密码",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path" : "pages/login/agreement",
+					"style" : 
+					{
+						"navigationBarTitleText" : "用户协议",
+						"navigationStyle": "custom"
+					}
+				}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
@@ -178,5 +236,37 @@
 		"navigationBarBackgroundColor": "#007aff",
 		"backgroundColor": "#F8F8F8"
 	},
+	"tabBar": {
+		"color": "#999999",
+		"selectedColor": "#007aff",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [
+			{
+				"pagePath": "pages/index/index",
+				"text": "首页",
+				"iconPath": "static/tabBar/home.png",
+				"selectedIconPath": "static/tabBar/home.png"
+			},
+			{
+				"pagePath": "pages/map/map",
+				"text": "一张图",
+				"iconPath": "static/tabBar/map.png",
+				"selectedIconPath": "static/tabBar/map.png"
+			},
+			{
+				"pagePath": "pages/Inspectionwarning/Inspectionwarning",
+				"text": "预警",
+				"iconPath": "static/tabBar/warning.png",
+				"selectedIconPath": "static/tabBar/warning.png"
+			},
+			{
+				"pagePath": "pages/personalcenter/my",
+				"text": "我的",
+				"iconPath": "static/tabBar/my.png",
+				"selectedIconPath": "static/tabBar/my.png"
+			}
+		]
+	},
 	"uniIdRouter": {}
 }