From f3eebd2f83cd6d12e3b714ac464f8717e0272e0f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 24 Jun 2021 10:30:10 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

---
 pages.json |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pages.json b/pages.json
index 714f77e..2db6ef3 100644
--- a/pages.json
+++ b/pages.json
@@ -206,7 +206,10 @@
 			"path": "pages/alarm_list/alarm_list",
 			"name": "alarm_list",
 			"style": {
-				"navigationBarTitleText": "我要查"
+				"navigationBarTitleText": "我要查",
+				"app-plus":{
+					"titleNView":"false"
+				}
 			}
 		},
 		{
@@ -257,8 +260,7 @@
 		}
 	],
 	"globalStyle": {//将组件安装在项目的components目录下,并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册,直接在页面中使用。
-		"autoscan": true,
-		"onReachBottomDistance":160
+		"autoscan": true
 	},
 	"tabBar": {
 		"color": "#7a7e83",
@@ -291,12 +293,13 @@
 				"text": "我要巡",
 				"iconPath": "static/img/bar/patrol.png",
 				"selectedIconPath": "static/img/bar/patrol-blue.png"
-			},{
-				"pagePath": "pages/myself/myself",
-				"text": "我的",
-				"iconPath": "static/tabbar/userHL.png",
-				"selectedIconPath": "static/workbench/user01.png"
 			}
+			// ,{
+			// 	"pagePath": "pages/myself/myself",
+			// 	"text": "我的",
+			// 	"iconPath": "static/tabbar/userHL.png",
+			// 	"selectedIconPath": "static/workbench/user01.png"
+			// }
 
 		]
 	},

--
Gitblit v1.9.3