From 8e304103a99f72164381b9575bbbe6f09d367bce Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 25 Feb 2022 09:54:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pages.json | 122 ++++++++++++++++++++++++++++++++--------
1 files changed, 97 insertions(+), 25 deletions(-)
diff --git a/pages.json b/pages.json
index d72ce79..57b5f77 100644
--- a/pages.json
+++ b/pages.json
@@ -327,17 +327,26 @@
"navigationBarTextStyle": "white"
}
},
- {
- "path": "pages/grabOrders/grabOrders",
- "name": "grabOrders",
+ // {
+ // "path": "pages/grabOrders/grabOrders备份/grabOrders",
+ // "name": "grabOrders",
+ // "style": {
+ // "navigationBarTitleText": "我参与",
+ // "navigationBarBackgroundColor": "#103289",
+ // "navigationBarTextStyle": "white"
+ // }
+ // },
+ { //治安巡查
+ "path": "pages/grabOrders/grabOrdersZAXC/grabOrders",
+ "name": "grabOrdersZAXC",
"style": {
- "navigationBarTitleText": "我参与",
+ "navigationBarTitleText": "治安巡查",
"navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
},
{
- "path": "pages/grabOrders/map",
+ "path": "pages/grabOrders/grabOrdersZAXC/map",
"name": "map",
"style": {
"navigationBarTitleText": "任务详情",
@@ -345,26 +354,8 @@
"navigationBarTextStyle": "white"
}
},
- // {
- // "path": "pages/grabOrders/xcxm",
- // "name": "map",
- // "style": {
- // "navigationBarTitleText": "任务详情",
- // "navigationBarBackgroundColor": "#103289",
- // "navigationBarTextStyle": "white"
- // }
- // },
{
- "path": "pages/issue/issue",
- "name": "issue",
- "style": {
- "navigationBarTitleText": "发布",
- "navigationBarBackgroundColor": "#103289",
- "navigationBarTextStyle": "white"
- }
- },
- {
- "path": "pages/grabOrders/task",
+ "path": "pages/grabOrders/grabOrdersZAXC/task",
"name": "task",
"style": {
"navigationBarTitleText": "任务详情",
@@ -373,7 +364,7 @@
}
},
{
- "path": "pages/grabOrders/feedback",
+ "path": "pages/grabOrders/grabOrdersZAXC/feedback",
"name": "feedback",
"style": {
"navigationBarTitleText": "任务反馈",
@@ -381,6 +372,87 @@
"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",
--
Gitblit v1.9.3