From 16edf86b6d026ea3955b6d954b784b970292013a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 10 Feb 2022 09:31:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

---
 pages.json |   46 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/pages.json b/pages.json
index f80c7bd..2015f65 100644
--- a/pages.json
+++ b/pages.json
@@ -107,8 +107,8 @@
 			"path": "pages/business/business",
 			"style": {
 				"navigationBarTitleText": "工作台",
-				"navigationBarBackgroundColor": "#103289",
-				"navigationBarTextStyle": "white"
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -451,7 +451,47 @@
 				"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"
+            }
+            
+        }
+    ],
 	"globalStyle": { //将组件安装在项目的components目录下,并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册,直接在页面中使用。
 		"autoscan": true
 	},

--
Gitblit v1.9.3