From 6c7fd1bdc47dba996bffda416576b167321624a3 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 24 七月 2023 09:03:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pages.json |   64 ++++++++++++++++++++++++++++++++
 1 files changed, 64 insertions(+), 0 deletions(-)

diff --git a/pages.json b/pages.json
index 99edc45..a5e30f8 100644
--- a/pages.json
+++ b/pages.json
@@ -42,6 +42,30 @@
 			}
 		},
 		{
+		    "path" : "pages/tabBar/notice/measures",
+			"style" :
+			{
+				"navigationStyle": "custom",
+			    "navigationBarTitleText": "",
+			    "enablePullDownRefresh": false,
+				"app-plus": {
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+		    "path" : "pages/tabBar/firstPage/firstPage",
+			"style" :
+			{
+				"navigationStyle": "custom",
+			    "navigationBarTitleText": "",
+			    "enablePullDownRefresh": false,
+				"app-plus": {
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
             "path" : "pages/tabBar/response/response",
             "style" :                                                                                    
             {
@@ -108,6 +132,35 @@
 					}
 				}
 		    }
+		},
+		{
+		    "path" : "pages/tabBar/current/current",
+		    "style" :                                                                                    
+		    {
+				"navigationStyle": "custom",
+		        "navigationBarTitleText": "",
+		        "enablePullDownRefresh": true,
+				"app-plus": {
+					"scrollIndicator": "none",
+					"pullToRefresh": {
+						"support": true,
+						"color": "#000000",
+						"style": "circle"
+					}
+				}
+		    }
+		},
+		{
+		    "path" : "pages/tabBar/weather/weather",
+		    "style" :                                                                                    
+		    {
+				"navigationStyle": "custom",
+			    "navigationBarTitleText": "",
+			    "enablePullDownRefresh": false,
+				"app-plus": {
+					"scrollIndicator": "none"
+				}
+		    }
 		}
     ],
 	"globalStyle": {
@@ -126,6 +179,9 @@
 		"custom": true,
 		"list": [
 			{
+				"pagePath": "pages/tabBar/firstPage/firstPage"
+			},
+			{
 				"pagePath": "pages/tabBar/notice/notice"
 			},
 			{
@@ -139,8 +195,16 @@
 			},
 			{
 				"pagePath": "pages/tabBar/count/count"
+			},
+			{
+				"pagePath": "pages/tabBar/current/current"
+			},
+			{
+				"pagePath": "pages/tabBar/weather/weather"
 			}
 
+			
+
 		]
 	}
 }

--
Gitblit v1.9.2