From 990657fe0d1758b4dad84bc0fed6cfc4992e2b40 Mon Sep 17 00:00:00 2001
From: 杨成强 <whycq@gitblit>
Date: 星期二, 17 一月 2023 11:21:49 +0800
Subject: [PATCH] Document update
---
Monitor-APP/pages.json | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/Monitor-APP/pages.json b/Monitor-APP/pages.json
index e59ea61..8b120df 100644
--- a/Monitor-APP/pages.json
+++ b/Monitor-APP/pages.json
@@ -1,26 +1,6 @@
{
"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
{
- "path": "pages/index/index",
- "style": {
-<<<<<<< HEAD
- "navigationStyle":"custom"
-=======
- "navigationStyle":"custom",
- // 鍘绘帀椤堕儴瀵艰埅鏍�
- "app-plus": {
- "titleNView": false
- }
->>>>>>> 2af3829f6276675ebe120cda94d628c49c429536
- }
- },
- {
- "path": "pages/index/monitor",
- "style": {
- "navigationStyle":"custom"
- }
- },
- {
"path": "pages/home/home",
"style": {
"navigationStyle":"home",
@@ -29,6 +9,22 @@
"titleNView": false
}
}
+ },
+ {
+ "path": "pages/index/index",
+ "style": {
+ "navigationStyle":"custom",
+ // 鍘绘帀椤堕儴瀵艰埅鏍�
+ "app-plus": {
+ "titleNView": false
+ }
+ }
+ },
+ {
+ "path": "pages/index/monitor",
+ "style": {
+ "navigationStyle":"custom"
+ }
}
--
Gitblit v1.9.1