From e3dcaeb0180a4e37347ac9ceb44c8a59ae7af37f Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Mon, 21 Feb 2022 19:40:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

---
 pages.json |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/pages.json b/pages.json
index ebafdd3..d4c1245 100644
--- a/pages.json
+++ b/pages.json
@@ -398,6 +398,17 @@
 			}
 		},
 		{
+			"path": "pages/currentMap/currentMap",
+			"name": "currentMap",
+			"style": {
+				"navigationBarTitleText": "获取辖区",
+				"navigationBarBackgroundColor": "#103289",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
 			"path": "pages/clockSignIn/clockSignIn",
 			"name": "clockSignIn",
 			"style": {
@@ -485,7 +496,7 @@
 		}, {
 			"path": "pages/voting/vote",
 			"style": {
-				"navigationBarTitleText": "投票发起",
+				"navigationBarTitleText": "参与投票",
 				"navigationBarBackgroundColor": "#103289",
 				"navigationBarTextStyle": "white"
 			}
@@ -507,7 +518,17 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/voting/votRanking",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "投票排名",
+                "navigationBarBackgroundColor": "#103289",
+                "navigationBarTextStyle": "white"
+            }
+            
+        }
+    ],
 	"globalStyle": { //将组件安装在项目的components目录下,并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册,直接在页面中使用。
 		"autoscan": true
 	},

--
Gitblit v1.9.3