From c2e890aa31ba67fd6f1e3cba76b4cf3f3f737544 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Fri, 25 Feb 2022 09:45:07 +0800
Subject: [PATCH] 冲突

---
 pages.json | 1332 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 678 insertions(+), 654 deletions(-)

diff --git a/pages.json b/pages.json
index f7329b5..57b5f77 100644
--- a/pages.json
+++ b/pages.json
@@ -1,669 +1,693 @@
 {
-	"easycom": {
-		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
-	},
-	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/loging/loging",
-			"name": "loging",
-			"style": {
-				"navigationBarTitleText": "请登录",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/registerUser/registerUser",
-			"name": "loging",
-			"style": {
-				"navigationBarTitleText": "注册账号",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-				// "app-plus": {
-				// 	"animationType": "fade-in",
-				// 	"animationDuration": 300
-				// }
-			}
-		},
-		{
-			"path": "pages/registerUser/idphoto",
-			"style": {
-				"navigationBarTitleText": "人脸识别",
-				"navigationStyle": "custom",
-				"backgroundColor": "#000000"
-			}
+    "easycom": {
+        "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
+    },
+    "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+        {
+            "path": "pages/loging/loging",
+            "name": "loging",
+            "style": {
+                "navigationBarTitleText": "请登录",
+                "enablePullDownRefresh": false,
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/registerUser/registerUser",
+            "name": "loging",
+            "style": {
+                "navigationBarTitleText": "注册账号",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+                // "app-plus": {
+                // 	"animationType": "fade-in",
+                // 	"animationDuration": 300
+                // }
+            }
+        },
+        {
+            "path": "pages/registerUser/idphoto",
+            "style": {
+                "navigationBarTitleText": "人脸识别",
+                "navigationStyle": "custom",
+                "backgroundColor": "#000000"
+            }
 
-		},
-		{
-			"path": "pages/home/home",
-			"style": {
+        },
+        {
+            "path": "pages/home/home",
+            "style": {
 
-				"navigationBarTitleText": "首页",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/shengzs/index",
-			"style": {
-				"navigationBarTitleText": "能量树",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/myself/childen/collect",
-			"style": {
-				"navigationBarTitleText": "我的收藏",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/myself/myself",
-			"name": "myself",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/myself/childen/aboutUs",
-			"name": "aboutUs",
-			"style": {
-				"navigationBarTitleText": "关于我们",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/myself/childen/shezhi",
-			"name": "shezhi",
-			"style": {
-				"navigationBarTitleText": "系统设置",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/myself/childen/yijian",
-			"name": "yijian",
-			"style": {
-				"navigationBarTitleText": "意见反馈",
-				"navigationBarBackgroundColor": "#F56968"
-			}
-		},
-		{
-			"path": "pages/myself/childen/genxin",
-			"name": "genxin",
-			"style": {
-				"navigationBarTitleText": "隐私政策",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/business/business",
-			"style": {
-				"navigationBarTitleText": "工作台",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/myself/childen/xinxi",
-			"name": "xinxi",
-			"style": {
-				"navigationBarTitleText": "账户信息",
-				"navigationBarBackgroundColor": "#F56968"
-			}
-		},
-		{
-			"path": "pages/myself/childen/info/nickName",
-			"name": "nickName",
-			"style": {
-				"navigationBarTitleText": "修改昵称",
-				"navigationBarBackgroundColor": "#F56968"
-			}
-		},
-		{
-			"path": "pages/myself/childen/info/phone",
-			"name": "phone",
-			"style": {
-				"navigationBarTitleText": "修改电话",
-				"navigationBarBackgroundColor": "#F56968"
-			}
-		},
-		{
-			"path": "pages/myself/childen/info/email",
-			"name": "email",
-			"style": {
-				"navigationBarTitleText": "修改邮箱",
-				"navigationBarBackgroundColor": "#F56968"
-			}
-		},
-		{
-			"path": "pages/myself/childen/info/birthday",
-			"name": "birthday",
-			"style": {
-				"navigationBarTitleText": "修改生日",
-				"navigationBarBackgroundColor": "#F56968"
-			}
-		},
-		{
-			"path": "pages/reported/reported",
-			"name": "reported",
-			"style": {
-				"navigationBarTitleText": "我要报",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/groupChat/groupChat",
-			"name": "groupChat",
-			"style": {
-				"navigationBarTitleText": "我要说",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "components/submit/submit",
-			"style": {}
-		},
-		{
-			"path": "pages/groupChat/chating",
-			"name": "chating",
-			"style": {
-				"navigationBarTitleText": "聊天室2",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/groupChat/chatingQZ",
-			"name": "chatingQZ",
-			"style": {
-				"navigationBarTitleText": "聊天室2",
-				"navigationStyle": "custom",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/infoRegistration/infoRegistration",
-			"name": "infoRegistration",
-			"style": {
-				"navigationBarTitleText": "信息登记"
-			}
-		},
-		{
-			"path": "pages/infoRegistration/infoCheck",
-			"name": "infoCheck",
-			"style": {
-				"navigationBarTitleText": "信息核实"
-			}
-		},
-		{
-			"path": "pages/visitRecord/visitRecord",
-			"name": "visitRecord",
-			"style": {
-				"navigationBarTitleText": "拜访记录"
-			}
-		},
-		{
-			"path": "pages/riskReporting/riskReporting",
-			"name": "riskReporting",
-			"style": {
-				"navigationBarTitleText": "风险上报"
-			}
-		},
-		{
-			"path": "pages/equipment/equipment",
-			"name": "equipment",
-			"style": {
-				"navigationBarTitleText": "设备安装"
-			}
-		},
-		{
-			"path": "pages/article/article",
-			"style": {
-				"navigationBarTitleText": "资讯",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white",
-				"onReachBottomDistance": 0
-			}
-		},
-		{
-			"path": "pages/article/article_video",
-			"style": {
-				"navigationBarTitleText": "视频",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"titleNView": false,
-					"subNVues": [{
-						"id": "comment",
-						"path": "pages/subnvue/comment",
-						"style": {
-							"height": "100%",
-							"position": "absolute",
-							"bottom": "0",
-							"background": "transparent",
-							"zindex": 1
+                "navigationBarTitleText": "首页",
+                "enablePullDownRefresh": false,
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/shengzs/index",
+            "style": {
+                "navigationBarTitleText": "能量树",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/myself/childen/collect",
+            "style": {
+                "navigationBarTitleText": "我的收藏",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/myself/myself",
+            "name": "myself",
+            "style": {
+                "navigationBarTitleText": "",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/myself/childen/aboutUs",
+            "name": "aboutUs",
+            "style": {
+                "navigationBarTitleText": "关于我们",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/myself/childen/shezhi",
+            "name": "shezhi",
+            "style": {
+                "navigationBarTitleText": "系统设置",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/myself/childen/yijian",
+            "name": "yijian",
+            "style": {
+                "navigationBarTitleText": "意见反馈",
+                "navigationBarBackgroundColor": "#F56968"
+            }
+        },
+        {
+            "path": "pages/myself/childen/genxin",
+            "name": "genxin",
+            "style": {
+                "navigationBarTitleText": "隐私政策",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/business/business",
+            "style": {
+                "navigationBarTitleText": "工作台",
+                "enablePullDownRefresh": false,
+                "navigationStyle": "custom"
+            }
+        },
+        {
+            "path": "pages/myself/childen/xinxi",
+            "name": "xinxi",
+            "style": {
+                "navigationBarTitleText": "账户信息",
+                "navigationBarBackgroundColor": "#F56968"
+            }
+        },
+        {
+            "path": "pages/myself/childen/info/nickName",
+            "name": "nickName",
+            "style": {
+                "navigationBarTitleText": "修改昵称",
+                "navigationBarBackgroundColor": "#F56968"
+            }
+        },
+        {
+            "path": "pages/myself/childen/info/phone",
+            "name": "phone",
+            "style": {
+                "navigationBarTitleText": "修改电话",
+                "navigationBarBackgroundColor": "#F56968"
+            }
+        },
+        {
+            "path": "pages/myself/childen/info/email",
+            "name": "email",
+            "style": {
+                "navigationBarTitleText": "修改邮箱",
+                "navigationBarBackgroundColor": "#F56968"
+            }
+        },
+        {
+            "path": "pages/myself/childen/info/birthday",
+            "name": "birthday",
+            "style": {
+                "navigationBarTitleText": "修改生日",
+                "navigationBarBackgroundColor": "#F56968"
+            }
+        },
+        {
+            "path": "pages/reported/reported",
+            "name": "reported",
+            "style": {
+                "navigationBarTitleText": "我要报",
+                "app-plus": {
+                    "titleNView": false
+                }
+            }
+        },
+        {
+            "path": "pages/groupChat/groupChat",
+            "name": "groupChat",
+            "style": {
+                "navigationBarTitleText": "我要说",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "components/submit/submit",
+            "style": {}
+        },
+        {
+            "path": "pages/groupChat/chating",
+            "name": "chating",
+            "style": {
+                "navigationBarTitleText": "聊天室2",
+                "navigationStyle": "custom",
+                "app-plus": {
+                    "titleNView": false
+                }
+            }
+        },
+        {
+            "path": "pages/groupChat/chatingQZ",
+            "name": "chatingQZ",
+            "style": {
+                "navigationBarTitleText": "聊天室2",
+                "navigationStyle": "custom",
+                "app-plus": {
+                    "titleNView": false
+                }
+            }
+        },
+        {
+            "path": "pages/infoRegistration/infoRegistration",
+            "name": "infoRegistration",
+            "style": {
+                "navigationBarTitleText": "信息登记"
+            }
+        },
+        {
+            "path": "pages/infoRegistration/infoCheck",
+            "name": "infoCheck",
+            "style": {
+                "navigationBarTitleText": "信息核实"
+            }
+        },
+        {
+            "path": "pages/visitRecord/visitRecord",
+            "name": "visitRecord",
+            "style": {
+                "navigationBarTitleText": "拜访记录"
+            }
+        },
+        {
+            "path": "pages/riskReporting/riskReporting",
+            "name": "riskReporting",
+            "style": {
+                "navigationBarTitleText": "风险上报"
+            }
+        },
+        {
+            "path": "pages/equipment/equipment",
+            "name": "equipment",
+            "style": {
+                "navigationBarTitleText": "设备安装"
+            }
+        },
+        {
+            "path": "pages/article/article",
+            "style": {
+                "navigationBarTitleText": "资讯",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white",
+                "onReachBottomDistance": 0
+            }
+        },
+        {
+            "path": "pages/article/article_video",
+            "style": {
+                "navigationBarTitleText": "视频",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white",
+                "app-plus": {
+                    "titleNView": false,
+                    "subNVues": [{
+                        "id": "comment",
+                        "path": "pages/subnvue/comment",
+                        "style": {
+                            "height": "100%",
+                            "position": "absolute",
+                            "bottom": "0",
+                            "background": "transparent",
+                            "zindex": 1
 
-						}
-					}, {
-						"id": "input-box",
-						"path": "pages/subnvue/input-box",
-						"style": {
-							"height": "100%",
-							"position": "absolute",
-							"bottom": "0",
-							"background": "transparent",
-							"zindex": 2
-						}
-					}]
-				}
-			}
-		},
-		{
-			"path": "pages/article/article_detail",
-			"name": "equipment",
-			"style": {
-				"navigationBarTitleText": "详情",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/patrol/patrol",
-			"name": "equipment",
-			"style": {
-				"navigationBarTitleText": "巡逻任务",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/investigation/investigation",
-			"name": "investigation",
-			"style": {
-				"navigationBarTitleText": "地图",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/workbench/workbench",
-			"name": "workbench",
-			"style": {
-				"navigationBarTitleText": "我要巡",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/handle/handle",
-			"style": {
-				"navigationBarTitleText": "我要办",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/alarm_list/alarm_list",
-			"name": "alarm_list",
-			"style": {
-				"navigationBarTitleText": "我要查",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		// {
-		// 	"path": "pages/grabOrders/grabOrders备份/grabOrders",
-		// 	"name": "grabOrders",
-		// 	"style": {
-		// 		"navigationBarTitleText": "我参与",
-		// 		"navigationBarBackgroundColor": "#103289",
-		// 		"navigationBarTextStyle": "white"
-		// 	}
-		// },
-		{ //治安巡查
-			"path": "pages/grabOrders/grabOrdersZAXC/grabOrders",
-			"name": "grabOrdersZAXC",
-			"style": {
-				"navigationBarTitleText": "治安巡查",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/grabOrders/grabOrdersZAXC/map",
-			"name": "map",
-			"style": {
-				"navigationBarTitleText": "任务详情",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/grabOrders/grabOrdersZAXC/task",
-			"name": "task",
-			"style": {
-				"navigationBarTitleText": "任务详情",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/grabOrders/grabOrdersZAXC/feedback",
-			"name": "feedback",
-			"style": {
-				"navigationBarTitleText": "任务反馈",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{ //治安义务宣传
-			"path": "pages/grabOrders/grabOrdersZAYWXC/grabOrders",
-			"name": "grabOrdersZAYWXC",
-			"style": {
-				"navigationBarTitleText": "治安义务宣传",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/grabOrders/grabOrdersZAYWXC/map",
-			"name": "map",
-			"style": {
-				"navigationBarTitleText": "任务详情",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/grabOrders/grabOrdersZAYWXC/task",
-			"name": "task",
-			"style": {
-				"navigationBarTitleText": "任务详情",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/grabOrders/grabOrdersZAYWXC/feedback",
-			"name": "feedback",
-			"style": {
-				"navigationBarTitleText": "任务反馈",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{ //治安防范培训
-			"path": "pages/grabOrders/grabOrdersZAFFPX/grabOrders",
-			"name": "grabOrdersZAFFPX",
-			"style": {
-				"navigationBarTitleText": "治安防范培训",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/grabOrders/grabOrdersZAFFPX/map",
-			"name": "map",
-			"style": {
-				"navigationBarTitleText": "任务详情",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/grabOrders/grabOrdersZAFFPX/task",
-			"name": "task",
-			"style": {
-				"navigationBarTitleText": "任务详情",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/grabOrders/grabOrdersZAFFPX/feedback",
-			"name": "feedback",
-			"style": {
-				"navigationBarTitleText": "任务反馈",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
+                        }
+                    }, {
+                        "id": "input-box",
+                        "path": "pages/subnvue/input-box",
+                        "style": {
+                            "height": "100%",
+                            "position": "absolute",
+                            "bottom": "0",
+                            "background": "transparent",
+                            "zindex": 2
+                        }
+                    }]
+                }
+            }
+        },
+        {
+            "path": "pages/article/article_detail",
+            "name": "equipment",
+            "style": {
+                "navigationBarTitleText": "详情",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/patrol/patrol",
+            "name": "equipment",
+            "style": {
+                "navigationBarTitleText": "巡逻任务",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/investigation/investigation",
+            "name": "investigation",
+            "style": {
+                "navigationBarTitleText": "地图",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/workbench/workbench",
+            "name": "workbench",
+            "style": {
+                "navigationBarTitleText": "我要巡",
+                "app-plus": {
+                    "titleNView": false
+                }
+            }
+        },
+        {
+            "path": "pages/handle/handle",
+            "style": {
+                "navigationBarTitleText": "我要办",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/alarm_list/alarm_list",
+            "name": "alarm_list",
+            "style": {
+                "navigationBarTitleText": "我要查",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        // {
+        // 	"path": "pages/grabOrders/grabOrders备份/grabOrders",
+        // 	"name": "grabOrders",
+        // 	"style": {
+        // 		"navigationBarTitleText": "我参与",
+        // 		"navigationBarBackgroundColor": "#103289",
+        // 		"navigationBarTextStyle": "white"
+        // 	}
+        // },
+        { //治安巡查
+            "path": "pages/grabOrders/grabOrdersZAXC/grabOrders",
+            "name": "grabOrdersZAXC",
+            "style": {
+                "navigationBarTitleText": "治安巡查",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/grabOrders/grabOrdersZAXC/map",
+            "name": "map",
+            "style": {
+                "navigationBarTitleText": "任务详情",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/grabOrders/grabOrdersZAXC/task",
+            "name": "task",
+            "style": {
+                "navigationBarTitleText": "任务详情",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/grabOrders/grabOrdersZAXC/feedback",
+            "name": "feedback",
+            "style": {
+                "navigationBarTitleText": "任务反馈",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        { //治安义务宣传
+            "path": "pages/grabOrders/grabOrdersZAYWXC/grabOrders",
+            "name": "grabOrdersZAYWXC",
+            "style": {
+                "navigationBarTitleText": "治安义务宣传",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/grabOrders/grabOrdersZAYWXC/map",
+            "name": "map",
+            "style": {
+                "navigationBarTitleText": "任务详情",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/grabOrders/grabOrdersZAYWXC/task",
+            "name": "task",
+            "style": {
+                "navigationBarTitleText": "任务详情",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/grabOrders/grabOrdersZAYWXC/feedback",
+            "name": "feedback",
+            "style": {
+                "navigationBarTitleText": "任务反馈",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        { //治安防范培训
+            "path": "pages/grabOrders/grabOrdersZAFFPX/grabOrders",
+            "name": "grabOrdersZAFFPX",
+            "style": {
+                "navigationBarTitleText": "治安防范培训",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/grabOrders/grabOrdersZAFFPX/map",
+            "name": "map",
+            "style": {
+                "navigationBarTitleText": "任务详情",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/grabOrders/grabOrdersZAFFPX/task",
+            "name": "task",
+            "style": {
+                "navigationBarTitleText": "任务详情",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/grabOrders/grabOrdersZAFFPX/feedback",
+            "name": "feedback",
+            "style": {
+                "navigationBarTitleText": "任务反馈",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/issue/issue",
+            "name": "issue",
+            "style": {
+                "navigationBarTitleText": "发布",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/index/index",
+            "name": "index",
+            "style": {
+                "navigationBarTitleText": "首页"
+            }
+        },
+        {
+            "path": "pages/map/map",
+            "name": "map",
+            "style": {
+                "navigationBarTitleText": "群防任务",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/currentMap/currentMap",
+            "name": "currentMap",
+            "style": {
+                "navigationBarTitleText": "获取辖区",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/clockSignIn/clockSignIn",
+            "name": "clockSignIn",
+            "style": {
+                "navigationBarTitleText": "打卡签到",
+                "navigationBarBackgroundColor": "#25262E",
+                "app-plus": {
+                    "titleNView": false
+                }
+            }
+        },
+        {
+            "path": "pages/poput/workbench/policeDetails/policeDetails",
+            "name": "policeDetails",
+            "style": {
+                "navigationBarTitleText": "警情详情提交信息页面"
+            }
+        },
+        {
+            "path": "pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao",
+            "name": "mapJQtijiao",
+            "style": {
+                "navigationBarTitleText": "处理结果",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/poput/alarmOver/alarmOver",
+            "name": "alarmOver",
+            "style": {
+                "navigationBarTitleText": "任务详情",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        },
+        {
+            "path": "pages/error-page/403",
+            "style": {
+                "navigationBarTitleText": "403"
+            }
+        },
+        {
+            "path": "pages/error-page/404",
+            "style": {
+                "navigationBarTitleText": "404"
+            }
+        },
+        {
+            "path": "pages/error-page/500",
+            "style": {
+                "navigationBarTitleText": "500"
+            }
+        }, {
+            "path": "pages/alarm_list/integral/integral",
+            "style": {
+                "navigationBarTitleText": "查积分",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
 
-		{
-			"path": "pages/issue/issue",
-			"name": "issue",
-			"style": {
-				"navigationBarTitleText": "发布",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
+        }, {
+            "path": "pages/alarm_list/organ/organ",
+            "style": {
+                "navigationBarTitleText": "组织申请",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
 
-		{
-			"path": "pages/index/index",
-			"name": "index",
-			"style": {
-				"navigationBarTitleText": "首页"
-			}
-		},
-		{
-			"path": "pages/map/map",
-			"name": "map",
-			"style": {
-				"navigationBarTitleText": "群防任务",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/currentMap/currentMap",
-			"name": "currentMap",
-			"style": {
-				"navigationBarTitleText": "获取辖区",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/clockSignIn/clockSignIn",
-			"name": "clockSignIn",
-			"style": {
-				"navigationBarTitleText": "打卡签到",
-				"navigationBarBackgroundColor": "#25262E",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/poput/workbench/policeDetails/policeDetails",
-			"name": "policeDetails",
-			"style": {
-				"navigationBarTitleText": "警情详情提交信息页面"
-			}
-		},
-		{
-			"path": "pages/poput/mapJQtijiao/mapJQtijiao/mapJQtijiao",
-			"name": "mapJQtijiao",
-			"style": {
-				"navigationBarTitleText": "处理结果",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/poput/alarmOver/alarmOver",
-			"name": "alarmOver",
-			"style": {
-				"navigationBarTitleText": "任务详情",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/error-page/403",
-			"style": {
-				"navigationBarTitleText": "403"
-			}
-		},
-		{
-			"path": "pages/error-page/404",
-			"style": {
-				"navigationBarTitleText": "404"
-			}
-		},
-		{
-			"path": "pages/error-page/500",
-			"style": {
-				"navigationBarTitleText": "500"
-			}
-		}, {
-			"path": "pages/alarm_list/integral/integral",
-			"style": {
-				"navigationBarTitleText": "查积分",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
+        }, {
+            "path": "pages/alarm_list/industry/industry",
+            "style": {
+                "navigationBarTitleText": "行业政策",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
 
-		}, {
-			"path": "pages/alarm_list/organ/organ",
-			"style": {
-				"navigationBarTitleText": "组织申请",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
+        }, {
+            "path": "pages/alarm_list/industry/industry_detail",
+            "style": {
+                "navigationBarTitleText": "行业政策",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
 
-		}, {
-			"path": "pages/alarm_list/industry/industry",
-			"style": {
-				"navigationBarTitleText": "行业政策",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
+        }, {
+            "path": "pages/voting/vote",
+            "style": {
+                "navigationBarTitleText": "参与投票",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
 
-		}, {
-			"path": "pages/alarm_list/industry/industry_detail",
-			"style": {
-				"navigationBarTitleText": "行业政策",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
+        }, {
+            "path": "pages/voting/voteManage",
+            "style": {
+                "navigationBarTitleText": "我的投票",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
 
-		}, {
-			"path": "pages/voting/vote",
-			"style": {
-				"navigationBarTitleText": "参与投票",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
+        }, {
+            "path": "pages/voting/voteDetail",
+            "style": {
+                "navigationBarTitleText": "投票详情",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
 
-		}, {
-			"path": "pages/voting/voteManage",
-			"style": {
-				"navigationBarTitleText": "我的投票",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
+        }, {
+            "path": "pages/voting/votRanking",
+            "style": {
+                "navigationBarTitleText": "投票排名",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
 
-		}, {
-			"path": "pages/voting/voteDetail",
-			"style": {
-				"navigationBarTitleText": "投票详情",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
+        }, {
+            "path": "pages/registerUser/agreement",
+            "style": {
+                "navigationBarTitleText": "",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
 
-		}, {
-			"path": "pages/voting/votRanking",
-			"style": {
-				"navigationBarTitleText": "投票排名",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
+        },
+        {
+            "path": "pages/voting/information",
+            "style": {
+                "navigationBarTitleText": "电子证件",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
 
-		}, {
-			"path": "pages/registerUser/agreement",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
+        }, {
+            "path": "pages/exam/startexam",
+            "name": "startexam",
+            "style": {
+                "navigationBarTitleText": "开始考试",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+        }, {
+            "path": "pages/exam/examTextPage",
+            "name": "examTextPage",
+            "style": {
+                "navigationStyle": "custom",
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+        },
+        {
+            "path": "pages/exam/examReviewPage",
+            "name": "examReviewPage",
+            "style": {
+                "navigationStyle": "custom",
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
 
-		},
-		{
-			"path": "pages/voting/information",
-			"style": {
-				"navigationBarTitleText": "电子证件",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
-			}
-
-		}
-	],
-	"globalStyle": { //将组件安装在项目的components目录下,并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册,直接在页面中使用。
-		"autoscan": true
-	},
-	"tabBar": {
-		"color": "#7a7e83",
-		"selectedColor": "#0faeff",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/home/home",
-				"text": "首页",
-				"iconPath": "static/tabbar/index01.png",
-				"selectedIconPath": "static/tabbar/index02.png"
-			},
-			{
-				"pagePath": "pages/article/article",
-				"text": "资讯",
-				"iconPath": "static/tabbar/article.png",
-				"selectedIconPath": "static/tabbar/articleH.png"
-			},
-			{
-				"pagePath": "pages/issue/issue",
-				"iconPath": "static/tabbar/addIcon.png",
-				"selectedIconPath": "static/tabbar/addSelectedIcon.png",
-				"text": "发布"
-			},
-			{
-				"pagePath": "pages/business/business",
-				"text": "工作台",
-				"iconPath": "static/tabbar/workbench.png",
-				"selectedIconPath": "static/tabbar/workbenchH.png"
-			},
-			{
-				"pagePath": "pages/myself/myself",
-				"text": "我的",
-				"iconPath": "static/tabbar/my.png",
-				"selectedIconPath": "./static/tabbar/my-blue.png"
-			}
-		]
-	},
-	"globalStyle": { // 不能在globalStyle中设置隐藏头部导航栏,否则聊天页面的头部栏会不显示,在pages中设置titleNView为false就可以隐藏头部导航栏了
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "hello",
-		"navigationBarBackgroundColor": "#fff",
-		"backgroundColor": "#f7f7f7",
-		"backgroundTextStyle": "light",
-		"pageOrientation": "portrait", //横屏配置,屏幕旋转设置
-		"app-plus": {
-			"bounce": "none"
-		}
-	}
-}
+        }
+    ],
+    "globalStyle": { //将组件安装在项目的components目录下,并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册,直接在页面中使用。
+        "autoscan": true
+    },
+    "tabBar": {
+        "color": "#7a7e83",
+        "selectedColor": "#0faeff",
+        "backgroundColor": "#ffffff",
+        "list": [{
+                "pagePath": "pages/home/home",
+                "text": "首页",
+                "iconPath": "static/tabbar/index01.png",
+                "selectedIconPath": "static/tabbar/index02.png"
+            },
+            {
+                "pagePath": "pages/article/article",
+                "text": "资讯",
+                "iconPath": "static/tabbar/article.png",
+                "selectedIconPath": "static/tabbar/articleH.png"
+            },
+            {
+                "pagePath": "pages/issue/issue",
+                "iconPath": "static/tabbar/addIcon.png",
+                "selectedIconPath": "static/tabbar/addSelectedIcon.png",
+                "text": "发布"
+            },
+            {
+                "pagePath": "pages/business/business",
+                "text": "工作台",
+                "iconPath": "static/tabbar/workbench.png",
+                "selectedIconPath": "static/tabbar/workbenchH.png"
+            },
+            {
+                "pagePath": "pages/myself/myself",
+                "text": "我的",
+                "iconPath": "static/tabbar/my.png",
+                "selectedIconPath": "./static/tabbar/my-blue.png"
+            }
+        ]
+    },
+    "globalStyle": { // 不能在globalStyle中设置隐藏头部导航栏,否则聊天页面的头部栏会不显示,在pages中设置titleNView为false就可以隐藏头部导航栏了
+        "navigationBarTextStyle": "black",
+        "navigationBarTitleText": "hello",
+        "navigationBarBackgroundColor": "#fff",
+        "backgroundColor": "#f7f7f7",
+        "backgroundTextStyle": "light",
+        "pageOrientation": "portrait", //横屏配置,屏幕旋转设置
+        "app-plus": {
+            "bounce": "none"
+        }
+    }
+}
\ No newline at end of file

--
Gitblit v1.9.3