From 3c738f4fe2762bba8087e5a22fc0dc06560eab0e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 08 Aug 2024 10:01:17 +0800
Subject: [PATCH] 三色任务与自查任务

---
 pages.json |  174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 168 insertions(+), 6 deletions(-)

diff --git a/pages.json b/pages.json
index 05af079..4fcd1a3 100644
--- a/pages.json
+++ b/pages.json
@@ -17,7 +17,8 @@
 			"path": "pages/statistics/index",
 			"style": {
 				"navigationBarTitleText": "驾驶舱",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 		},
 
@@ -74,6 +75,21 @@
 				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#fff",
 				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/home/selectSiteTwo",
+			"style": {
+				"navigationBarTitleText": "区域选择",
+				"navigationBarBackgroundColor": "#fff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
+			"path": "pages/myMap/myMap",
+			"style": {
+				"navigationBarTitleText": "周边",
+				"enablePullDownRefresh": false
 			}
 		}
 	],
@@ -321,7 +337,12 @@
 						"navigationBarTitleText": "二手交易",
 						"enablePullDownRefresh": false,
 						"navigationBarBackgroundColor": "#fff",
-						"navigationBarTextStyle": "black"
+						"navigationBarTextStyle": "black",
+						"usingComponents": {
+							// #ifdef MP-WEIXIN
+							"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+							// #endif
+						}
 					}
 				},
 				{
@@ -427,6 +448,14 @@
 						"navigationBarBackgroundColor": "#fff",
 						"navigationBarTextStyle": "black"
 					}
+				},
+				{
+					"path" : "gridWord",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+						"enablePullDownRefresh" : false
+					}
 				}
 			]
 		},
@@ -441,7 +470,9 @@
 						"navigationBarBackgroundColor": "#fff",
 						"navigationBarTextStyle": "black",
 						"usingComponents": {
+							// #ifdef MP-WEIXIN
 							"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+							// #endif
 						}
 					}
 				},
@@ -453,7 +484,9 @@
 						"navigationBarBackgroundColor": "#fff",
 						"navigationBarTextStyle": "black",
 						"usingComponents": {
+							// #ifdef MP-WEIXIN
 							"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+							// #endif
 						}
 					}
 				},
@@ -533,7 +566,9 @@
 						"navigationBarBackgroundColor": "#fff",
 						"navigationBarTextStyle": "black",
 						"usingComponents": {
+							// #ifdef MP-WEIXIN
 							"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+							// #endif
 						}
 					}
 				},
@@ -756,7 +791,9 @@
 						"navigationBarTextStyle": "black",
 						"enablePullDownRefresh": false,
 						"usingComponents": {
+							// #ifdef MP-WEIXIN
 							"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+							// #endif
 						}
 					}
 				},
@@ -855,7 +892,9 @@
 						"navigationBarTextStyle": "black",
 						"enablePullDownRefresh": false,
 						"usingComponents": {
+							// #ifdef MP-WEIXIN
 							"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+							// #endif
 						}
 					}
 				},
@@ -876,7 +915,9 @@
 						"navigationBarTextStyle": "black",
 						"enablePullDownRefresh": false,
 						"usingComponents": {
+							// #ifdef MP-WEIXIN
 							"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+							// #endif
 						}
 					}
 				},
@@ -978,7 +1019,7 @@
 			]
 		},
 
-		//居住证 
+		//居住证
 		{
 			"root": "subPackage/reside",
 			"pages": [{
@@ -1075,7 +1116,9 @@
 						"navigationBarTextStyle": "black",
 						"enablePullDownRefresh": false,
 						"usingComponents": {
+							// #ifdef MP-WEIXIN
 							"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+							// #endif
 						}
 
 					}
@@ -1173,7 +1216,9 @@
 						"navigationBarTextStyle": "black",
 						"enablePullDownRefresh": false,
 						"usingComponents": {
+							// #ifdef MP-WEIXIN
 							"ocr-navigator": "plugin://ocr-plugin/ocr-navigator"
+							// #endif
 						}
 					}
 				}
@@ -1228,9 +1273,120 @@
 					"enablePullDownRefresh": false
 				}
 			}]
+		},
+		{
+			"root": "subPackage/school",
+			"pages": [{
+					"path": "clockIn",
+					"style": {
+						"navigationBarTitleText": "护学打卡 ",
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
+					}
+				},
+
+				{
+					"path": "trouble",
+					"style": {
+						"navigationBarTitleText": "隐患排查",
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "troubleList",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "troubleDetail",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "troubleAuditList",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "security",
+					"style": {
+						"navigationBarTitleText": "校园安全检查",
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "securityRecord",
+					"style": {
+						"navigationBarTitleText": "校园安保检查",
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "securityDetail",
+					"style": {
+						"navigationBarTitleText": "校园安全检查详情",
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "securityReform",
+					"style": {
+						"navigationBarTitleText": "校园安全检查整改",
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "troubleTaskList",
+					"style": {
+						"navigationBarTitleText": "问题处理与反馈",
+						"navigationBarBackgroundColor": "#fff",
+						"navigationBarTextStyle": "black",
+						"enablePullDownRefresh": false
+					}
+				}
+			]
+		},
+		{
+			"root": "subPackage/ecall",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "E呼即办",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "detail",
+					"style": {
+						"navigationBarTitleText": "E呼即办详情",
+						"enablePullDownRefresh": false
+					}
+				}
+			]
 		}
-
-
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -1251,9 +1407,15 @@
 				"text": "首页"
 			},
 			{
-				"pagePath": "pages/circle/index",
+				"pagePath": "pages/myMap/myMap",
 				"iconPath": "static/img/tabbar-02.png",
 				"selectedIconPath": "static/img/tabbar-02-selected.png",
+				"text": "周边"
+			},
+			{
+				"pagePath": "pages/circle/index",
+				"iconPath": "static/img/tabbar-09.png",
+				"selectedIconPath": "static/img/tabbar-09-selected.png",
 				"text": "圈子"
 			},
 			{

--
Gitblit v1.9.3