From d34c7c19ab062b8e99b7af7e1d44e009c1b9b739 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Tue, 19 Mar 2024 12:02:49 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_app

---
 pages.json |  217 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 207 insertions(+), 10 deletions(-)

diff --git a/pages.json b/pages.json
index 245f622..de67526 100644
--- a/pages.json
+++ b/pages.json
@@ -12,6 +12,15 @@
 				"navigationStyle": "custom"
 			}
 		},
+
+		{
+			"path": "pages/statistics/index",
+			"style": {
+				"navigationBarTitleText": "驾驶舱",
+				"enablePullDownRefresh": false
+			}
+		},
+
 		{
 			"path": "pages/user/center",
 			"style": {
@@ -55,6 +64,14 @@
 			"path": "pages/home/selectSite",
 			"style": {
 				"navigationBarTitleText": "区域选择",
+				"navigationBarBackgroundColor": "#fff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/home/launch",
+			"style": {
+				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#fff",
 				"navigationBarTextStyle": "black"
 			}
@@ -138,6 +155,33 @@
 					"path": "editUserInfo/editUserInfo",
 					"style": {
 						"navigationBarTitleText": "编辑资料",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "event/event",
+					"style": {
+						"navigationBarTitleText": "我的事件",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "commentList/commentList",
+					"style": {
+						"navigationBarTitleText": "我的评论",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "commentList/evaluateList",
+					"style": {
+						"navigationBarTitleText": "我的评价",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#fff",
 						"navigationBarTextStyle": "black"
@@ -266,7 +310,7 @@
 				{
 					"path": "form",
 					"style": {
-						"navigationBarTitleText": "打金店报事",
+						"navigationBarTitleText": "二手交易",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#fff",
 						"navigationBarTextStyle": "black"
@@ -316,6 +360,24 @@
 						"navigationBarBackgroundColor": "#fff",
 						"navigationBarTextStyle": "black"
 					}
+				},
+				{
+					"path": "check",
+					"style": {
+						"navigationBarTitleText": "消防自查",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "checkList",
+					"style": {
+						"navigationBarTitleText": "消防自查",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
 				}
 			]
 		},
@@ -325,7 +387,7 @@
 			"pages": [{
 					"path": "index",
 					"style": {
-						"navigationBarTitleText": "我的任务",
+						"navigationBarTitleText": "待办事项",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#fff",
 						"navigationBarTextStyle": "black"
@@ -404,12 +466,32 @@
 				{
 					"path": "views/audit",
 					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "views/auditList",
+					"style": {
 						"navigationBarTitleText": "标签事件",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#fff",
 						"navigationBarTextStyle": "black"
 					}
 				},
+
+				{
+					"path": "views/auditSite",
+					"style": {
+						"navigationBarTitleText": "场所任务",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+
 				{
 					"path": "views/cshw",
 					"style": {
@@ -448,9 +530,27 @@
 					}
 				},
 				{
+					"path": "views/reportList",
+					"style": {
+						"navigationBarTitleText": "报修报事",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
 					"path": "views/reportAudit",
 					"style": {
 						"navigationBarTitleText": "报事报修处理",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "views/reportDetail",
+					"style": {
+						"navigationBarTitleText": "报事报修详情",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#fff",
 						"navigationBarTextStyle": "black"
@@ -505,6 +605,60 @@
 					"path": "views/patrol",
 					"style": {
 						"navigationBarTitleText": "网格员巡查",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "views/selectHandle",
+					"style": {
+						// "navigationBarTitleText": "网格员巡查",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "views/checkDetail",
+					"style": {
+						"navigationBarTitleText": "场所检查详情",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "views/checkReform",
+					"style": {
+						"navigationBarTitleText": "场所检查详情",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "views/reformList",
+					"style": {
+						"navigationBarTitleText": "场所整改",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "views/selfCheckDetail",
+					"style": {
+						"navigationBarTitleText": "消防自查",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+				{
+					"path": "views/tradingList",
+					"style": {
+						"navigationBarTitleText": "二手交易",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#fff",
 						"navigationBarTextStyle": "black"
@@ -594,6 +748,15 @@
 						"navigationBarTextStyle": "black",
 						"enablePullDownRefresh": false
 					}
+				},
+				{
+					"path": "views/danger",
+					"style": {
+						"navigationBarTitleText": "隐患上报",
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		},
@@ -655,9 +818,27 @@
 					}
 				},
 				{
+					"path": "member/add",
+					"style": {
+						"navigationBarTitleText": "人口采集",
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
 					"path": "roomControl/index",
 					"style": {
 						"navigationBarTitleText": "房屋管理",
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "roomControl/myHouse",
+					"style": {
+						"navigationBarTitleText": "我的房屋",
 						"navigationBarBackgroundColor": "#fff",
 						"navigationBarTextStyle": "black",
 						"enablePullDownRefresh": false
@@ -685,6 +866,16 @@
 					"path": "list/auditList",
 					"style": {
 						"navigationBarTitleText": "住户审核",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black"
+					}
+				},
+
+				{
+					"path": "houseNumber/siteInspect",
+					"style": {
+						"navigationBarTitleText": "场所检查",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#fff",
 						"navigationBarTextStyle": "black"
@@ -735,12 +926,12 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "饶城格格通",
+		"navigationBarTitleText": "饶城智理通",
 		"navigationBarBackgroundColor": "#fff",
 		"backgroundColor": "#4586FE"
 	},
 	"tabBar": {
-		// "custom": true,
+		"custom": true,
 		"color": "#AFB8C3",
 		"selectedColor": "#5086FA",
 		"borderStyle": "white",
@@ -751,12 +942,18 @@
 				"iconPath": "static/img/tabbar-01.png",
 				"text": "首页"
 			},
-			// {
-			// 	"pagePath": "pages/circle/index",
-			// 	"iconPath": "static/img/tabbar-02.png",
-			// 	"selectedIconPath": "static/img/tabbar-02-selected.png",
-			// 	"text": "圈子"
-			// },
+			{
+				"pagePath": "pages/circle/index",
+				"iconPath": "static/img/tabbar-02.png",
+				"selectedIconPath": "static/img/tabbar-02-selected.png",
+				"text": "圈子"
+			},
+			{
+				"pagePath": "pages/statistics/index",
+				"iconPath": "static/img/tabbar-02.png",
+				"selectedIconPath": "static/img/tabbar-02-selected.png",
+				"text": "驾驶舱"
+			},
 			{
 				"pagePath": "pages/user/center",
 				"iconPath": "static/img/tabbar-03.png",

--
Gitblit v1.9.3