From 25100ec3d663fdab00f6dacb9f427b772c2f806f Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 14 七月 2025 12:27:54 +0800
Subject: [PATCH] 合并开发文件

---
 pages.json |  313 +++++++++++++++++++++++++++++++---------------------
 1 files changed, 186 insertions(+), 127 deletions(-)

diff --git a/pages.json b/pages.json
index b57a5df..7b3defa 100644
--- a/pages.json
+++ b/pages.json
@@ -1,8 +1,8 @@
 {
-	"pages": [
-		//pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
+	"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/index/login",
+			
 			"style": {
 				"navigationBarTitleText": "鐧诲綍",
 				"navigationStyle": "custom"
@@ -164,8 +164,7 @@
 				"navigationBarTitleText": "棣栦欢妫�楠屽崟",
 				"enablePullDownRefresh": true
 			}
-		},
-		{
+		},{
 			"path": "pages/gongxuIn/form",
 			"style": {
 				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�"
@@ -177,8 +176,7 @@
 				"navigationBarTitleText": "宸ュ簭杩涚珯鎺ユ敹鍗�",
 				"enablePullDownRefresh": true
 			}
-		},
-		{
+		},{
 			"path": "pages/gongxuOut/form",
 			"style": {
 				"navigationBarTitleText": "宸ュ簭鍑虹珯姹囨姤鍗�"
@@ -262,171 +260,240 @@
 			}
 		},
 		{
-			"path": "pages/labelPrinter/index",
-			"style": {
-				"navigationBarTitleText": "鏍囩鎵撳嵃"
-			}
-		},
-		{
-			"path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
-			"style": {
-				"navigationBarTitleText": "璁惧杩愯鐘舵��",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/shebeiyunxingzhuangtai/detail",
-			"style": {
-				"navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
-			}
-		},
-		{
-			"path": "pages/mujvzhuangtai/mujvzhuangtai",
-			"style": {
-				"navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/mujvzhuangtai/detail",
-			"style": {
-				"navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
-			}
-		},
-		{
-			"path": "pages/tiaomachaima/tiaomachaima",
-			"style": {
-				"navigationBarTitleText": "鏉$爜鎷嗙爜"
-			}
-		},
-		{
-			"path": "pages/wuliaosaoma/wuliaosaoma",
-			"style": {
-				"navigationBarTitleText": "鐗╂枡娓呭崟"
-			}
-		},
-		{
-			"path": "pages/wuliaosaoma/detail",
-			"style": {
-				"navigationBarTitleText": "鏉$爜妗f"
-			}
-		},
-		{
 			"path": "pages/caigouruku/table",
 			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱",
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鍒楄〃",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/caigouruku/form",
 			"style": {
-				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
+				"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/caigoutuiliao/table",
 			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂�",
+				"navigationBarTitleText": "閲囪喘閫�鏂欏垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/caigoutuiliao/form",
 			"style": {
-				"navigationBarTitleText": "閲囪喘閫�鏂欏崟"
+				"navigationBarTitleText": "閲囪喘閫�鏂欏崟",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/xiaoshouchuku/table",
 			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴�",
+				"navigationBarTitleText": "閿�鍞嚭搴撳垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/xiaoshouchuku/form",
 			"style": {
-				"navigationBarTitleText": "閿�鍞嚭搴撳崟"
+				"navigationBarTitleText": "閿�鍞嚭搴撳崟",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/xiaoshoutuihuo/table",
 			"style": {
-				"navigationBarTitleText": "閿�鍞��璐�",
+				"navigationBarTitleText": "閿�鍞��璐у垪琛�",
 				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/xiaoshoutuihuo/form",
 			"style": {
-				"navigationBarTitleText": "閿�鍞��璐у崟"
+				"navigationBarTitleText": "閿�鍞��璐у崟",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "pages/qitachuku/qitachuku",
+			"path": "pages/shouliaotongzhi/table",
 			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "鏀舵枡閫氱煡鍗�",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "pages/qitachuku/form",
+			"path": "pages/shouliaotongzhi/table_son",
 			"style": {
-				"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+				"navigationBarTitleText": "鏉$爜鐢熸垚",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "pages/qitaruku/qitaruku",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/qitaruku/form",
-			"style": {
-				"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
-			}
-		}, 
-		{
-			"path": "pages/tiaomadaying/tiaomadaying",
-			"style": {
-				"navigationBarTitleText": "鏉ユ枡鏉$爜鎵撳嵃"
-			}
-		}
+					"path": "pages/labelPrinter/index",
+					"style": {
+						"navigationBarTitleText": "鏍囩鎵撳嵃"
+					}
+				},
+				{
+					"path": "pages/shebeiyunxingzhuangtai/shebeiyunxingzhuangtai",
+					"style": {
+						"navigationBarTitleText": "璁惧杩愯鐘舵��",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/shebeiyunxingzhuangtai/detail",
+					"style": {
+						"navigationBarTitleText": "璁惧杩愯鐘舵�佽鎯�"
+					}
+				},
+				{
+					"path": "pages/mujvzhuangtai/mujvzhuangtai",
+					"style": {
+						"navigationBarTitleText": "妯″叿鐘舵�佸垎甯�",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/mujvzhuangtai/detail",
+					"style": {
+						"navigationBarTitleText": "妯″叿鐘舵�佽鎯�"
+					}
+				},
+				{
+					"path": "pages/tiaomachaima/tiaomachaima",
+					"style": {
+						"navigationBarTitleText": "鏉$爜鎷嗙爜"
+					}
+				},
+				{
+					"path": "pages/wuliaosaoma/wuliaosaoma",
+					"style": {
+						"navigationBarTitleText": "鐗╂枡娓呭崟"
+					}
+				},
+				{
+					"path": "pages/wuliaosaoma/detail",
+					"style": {
+						"navigationBarTitleText": "鏉$爜妗f"
+					}
+				},
+				{
+					"path": "pages/caigouruku/table",
+					"style": {
+						"navigationBarTitleText": "閲囪喘鍏ュ簱",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/caigouruku/form",
+					"style": {
+						"navigationBarTitleText": "閲囪喘鍏ュ簱鍗�"
+					}
+				},
+				{
+					"path": "pages/caigoutuiliao/table",
+					"style": {
+						"navigationBarTitleText": "閲囪喘閫�鏂�",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/caigoutuiliao/form",
+					"style": {
+						"navigationBarTitleText": "閲囪喘閫�鏂欏崟"
+					}
+				},
+				{
+					"path": "pages/xiaoshouchuku/table",
+					"style": {
+						"navigationBarTitleText": "閿�鍞嚭搴�",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/xiaoshouchuku/form",
+					"style": {
+						"navigationBarTitleText": "閿�鍞嚭搴撳崟"
+					}
+				},
+				{
+					"path": "pages/xiaoshoutuihuo/table",
+					"style": {
+						"navigationBarTitleText": "閿�鍞��璐�",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/xiaoshoutuihuo/form",
+					"style": {
+						"navigationBarTitleText": "閿�鍞��璐у崟"
+					}
+				},
+				{
+					"path": "pages/qitachuku/qitachuku",
+					"style": {
+						"navigationBarTitleText": "鍏朵粬鍑哄簱",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/qitachuku/form",
+					"style": {
+						"navigationBarTitleText": "鍏朵粬鍑哄簱鍗�"
+					}
+				},
+				{
+					"path": "pages/qitaruku/qitaruku",
+					"style": {
+						"navigationBarTitleText": "鍏朵粬鍏ュ簱",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/qitaruku/form",
+					"style": {
+						"navigationBarTitleText": "鍏朵粬鍏ュ簱鍗�"
+					}
+				}, 
+				{
+					"path": "pages/tiaomadaying/tiaomadaying",
+					"style": {
+						"navigationBarTitleText": "鏉ユ枡鏉$爜鎵撳嵃"
+					}
+				}
 	],
 	"tabBar": {
-		"color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		"selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		"borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
-		"backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
-		"list": [{
-				"pagePath": "pages/index/index",
-				"iconPath": "static/tabBar/home.png",
-				"selectedIconPath": "static/tabBar/home-default.png",
-				"text": "棣栭〉"
-			},
-			{
-				"pagePath": "pages/index/tab1",
-				"iconPath": "static/tabBar/icon1.png",
-				"selectedIconPath": "static/tabBar/icon1-default.png",
-				"text": "妯″潡鍔熻兘"
-			},
-			{
-				"pagePath": "pages/index/tab2",
-				"iconPath": "static/tabBar/icon2.png",
-				"selectedIconPath": "static/tabBar/icon2-default.png",
-				"text": "鎶ヨ〃涓績"
-			},
-			{
-				"pagePath": "pages/index/mine",
-				"iconPath": "static/tabBar/user.png",
-				"selectedIconPath": "static/tabBar/user-default.png",
-				"text": "鎴戠殑"
-			}
-		]
-	},
+		 "color": "#888888", //tab 涓婄殑鏂囧瓧榛樿棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+		 "selectedColor": "#2d7dee", //tab 涓婄殑鏂囧瓧閫変腑鏃剁殑棰滆壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+		 "borderStyle": "black", //tabbar涓婅竟妗嗙殑棰滆壊锛� 浠呮敮鎸� black / white
+		 "backgroundColor": "#ffffff", //tab 鐨勮儗鏅壊锛屼粎鏀寔鍗佸叚杩涘埗棰滆壊
+		 "list": [{
+			 "pagePath": "pages/index/index",
+			 "iconPath":"static/tabBar/home.png",
+			 "selectedIconPath":"static/tabBar/home-default.png",
+			 "text": "棣栭〉"
+		 },
+		 {
+			 "pagePath": "pages/index/tab1",
+			 "iconPath":"static/tabBar/icon1.png",
+			 "selectedIconPath":"static/tabBar/icon1-default.png",
+			 "text": "妯″潡鍔熻兘"
+		 },
+		 {
+			 "pagePath": "pages/index/tab2",
+			 "iconPath":"static/tabBar/icon2.png",
+			 "selectedIconPath":"static/tabBar/icon2-default.png",
+			 "text": "鎶ヨ〃涓績"
+		 },
+		 {
+			"pagePath": "pages/index/mine",
+			"iconPath":"static/tabBar/user.png",
+			"selectedIconPath":"static/tabBar/user-default.png",
+			"text": "鎴戠殑"
+		 }]
+	 },
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "璁惧绠$悊",
@@ -434,13 +501,5 @@
 		"backgroundColor": "#F8F8F8",
 		"pageOrientation": "default"
 	},
-	"uniIdRouter": {},
-	"condition": { //妯″紡閰嶇疆锛屼粎寮�鍙戞湡闂寸敓鏁�
-		"current": 0, //褰撳墠婵�娲荤殑妯″紡(list 鐨勭储寮曢」)
-		"list": [{
-			"name": "", //妯″紡鍚嶇О
-			"path": "", //鍚姩椤甸潰锛屽繀閫�
-			"query": "" //鍚姩鍙傛暟锛屽湪椤甸潰鐨刼nLoad鍑芥暟閲岄潰寰楀埌
-		}]
-	}
-}
\ No newline at end of file
+	"uniIdRouter": {}
+}

--
Gitblit v1.9.1