From 46cc7a29dc1f9b3dffee5cdcb9b7f9dfdac3b16d Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 05 九月 2025 20:44:14 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages.json |   47 +++++++++++++++++++++++++++++++++++++----------
 1 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/pages.json b/pages.json
index 57fb142..30fa352 100644
--- a/pages.json
+++ b/pages.json
@@ -1,8 +1,7 @@
 {
-	"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/index/login",
-
+    "pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
+        {
+            "path": "pages/index/login",
 			"style": {
 				"navigationBarTitleText": "鐧诲綍",
 				"navigationStyle": "custom"
@@ -18,13 +17,13 @@
 		{
 			"path": "pages/index/tab1",
 			"style": {
-				"navigationBarTitleText": "妯″潡鍔熻兘"
+				"navigationBarTitleText": "杞﹂棿宸ュ簭"
 			}
 		},
 		{
 			"path": "pages/index/tab2",
 			"style": {
-				"navigationBarTitleText": "鎶ヨ〃涓績"
+				"navigationBarTitleText": "鍗曟嵁鍒楄〃"
 			}
 		},
 		{
@@ -410,6 +409,12 @@
 			}
 		},
 		{
+			"path": "pages/tiaomachaima/tiaomachaima2",
+			"style": {
+				"navigationBarTitleText": "鏉$爜鎷嗙爜2"
+			}
+		},
+		{
 			"path": "pages/wuliaosaoma/wuliaosaoma",
 			"style": {
 				"navigationBarTitleText": "鐗╂枡娓呭崟"
@@ -502,7 +507,7 @@
 		{
 			"path": "pages/tiaomadaying/tiaomadaying",
 			"style": {
-				"navigationBarTitleText": "鏉ユ枡鏉$爜鎵撳嵃"
+				"navigationBarTitleText": "閲囪喘鏉$爜鎵撳嵃"
 			}
 		},
 		{
@@ -710,6 +715,28 @@
 			{
 				"navigationBarTitleText" : "鍏朵粬鍑哄簱鍗�"
 			}
+		},
+		{
+			"path" : "pages/zhijiediaobo/table",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鐩存帴璋冩嫧",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path" : "pages/zhijiediaobo/form",
+			"style" : 
+			{
+				"navigationBarTitleText" : "鐩存帴璋冩嫧鍗�"
+			}
+		},
+		{
+			"path" : "pages/xiugaimima/index",
+			"style" : 
+			{
+				"navigationBarTitleText" : "淇敼瀵嗙爜"
+			}
 		}
 	],
 	"tabBar": {
@@ -721,19 +748,19 @@
 				"pagePath": "pages/index/index",
 				"iconPath": "static/tabBar/home.png",
 				"selectedIconPath": "static/tabBar/home-default.png",
-				"text": "棣栭〉"
+				"text": "浠撳偍绠$悊"
 			},
 			{
 				"pagePath": "pages/index/tab1",
 				"iconPath": "static/tabBar/icon1.png",
 				"selectedIconPath": "static/tabBar/icon1-default.png",
-				"text": "妯″潡鍔熻兘"
+				"text": "杞﹂棿宸ュ簭"
 			},
 			{
 				"pagePath": "pages/index/tab2",
 				"iconPath": "static/tabBar/icon2.png",
 				"selectedIconPath": "static/tabBar/icon2-default.png",
-				"text": "鎶ヨ〃涓績"
+				"text": "鍗曟嵁鍒楄〃"
 			},
 			{
 				"pagePath": "pages/index/mine",

--
Gitblit v1.9.1