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 |  103 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/pages.json b/pages.json
index 2015f65..d4c1245 100644
--- a/pages.json
+++ b/pages.json
@@ -257,7 +257,7 @@
 							"bottom": "0",
 							"background": "transparent",
 							"zindex": 1
-				
+
 						}
 					}, {
 						"id": "input-box",
@@ -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": {
@@ -450,42 +461,68 @@
 			"style": {
 				"navigationBarTitleText": "500"
 			}
+		}, {
+			"path": "pages/alarm_list/integral/integral",
+			"style": {
+				"navigationBarTitleText": "查积分",
+				"navigationBarBackgroundColor": "#103289",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/alarm_list/organ/organ",
+			"style": {
+				"navigationBarTitleText": "组织申请",
+				"navigationBarBackgroundColor": "#103289",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/alarm_list/industry/industry",
+			"style": {
+				"navigationBarTitleText": "行业政策",
+				"navigationBarBackgroundColor": "#103289",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/alarm_list/industry/industry_detail",
+			"style": {
+				"navigationBarTitleText": "行业政策",
+				"navigationBarBackgroundColor": "#103289",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/voting/vote",
+			"style": {
+				"navigationBarTitleText": "参与投票",
+				"navigationBarBackgroundColor": "#103289",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/voting/voteManage",
+			"style": {
+				"navigationBarTitleText": "我的投票",
+				"navigationBarBackgroundColor": "#103289",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/voting/voteDetail",
+			"style": {
+				"navigationBarTitleText": "投票详情",
+				"navigationBarBackgroundColor": "#103289",
+				"navigationBarTextStyle": "white"
+			}
+
 		}
 	    ,{
-            "path" : "pages/alarm_list/integral/integral",
+            "path" : "pages/voting/votRanking",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "查积分",
-                "navigationBarBackgroundColor": "#103289",
-                "navigationBarTextStyle": "white"
-            }
-            
-        }
-        ,{
-            "path" : "pages/alarm_list/organ/organ",
-            "style" :                                                                                    
-            {
-               "navigationBarTitleText": "组织申请",
-               "navigationBarBackgroundColor": "#103289",
-               "navigationBarTextStyle": "white"
-            }
-            
-        }
-        ,{
-            "path" : "pages/alarm_list/industry/industry",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "行业政策",
-                "navigationBarBackgroundColor": "#103289",
-                "navigationBarTextStyle": "white"
-            }
-            
-        }
-        ,{
-            "path" : "pages/alarm_list/industry/industry_detail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "行业政策",
+                "navigationBarTitleText": "投票排名",
                 "navigationBarBackgroundColor": "#103289",
                 "navigationBarTextStyle": "white"
             }

--
Gitblit v1.9.3