From d8d184a00d3581b3a77aa26864a153f0515524e0 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 29 八月 2023 18:30:03 +0800
Subject: [PATCH] 小程序

---
 minipro_standard/pages.json |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 5c6f7ad..ebebaeb 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -54,7 +54,25 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/plannedProgress/plannedProgress",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "璁″垝杩涘害",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/planDetails/planDetails",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "璁″垝璇︽儏",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"subPackages": [
 		{
 			"root": "pages_adjust",
@@ -74,11 +92,6 @@
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#ffffff",
 		"backgroundColor": "#ffffff"
-<<<<<<< HEAD
-=======
-	
-
->>>>>>> 9e4d7b06a15aabe0141a991fe9358802a0590378
 	},
 	"tabBar": {
 		"color": "#666666",

--
Gitblit v1.9.3