From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 small-program/pages.json |  159 +++++++++++-----------------------------------------
 1 files changed, 35 insertions(+), 124 deletions(-)

diff --git a/small-program/pages.json b/small-program/pages.json
index 6b9adf1..408dfb2 100644
--- a/small-program/pages.json
+++ b/small-program/pages.json
@@ -11,13 +11,6 @@
 			}
 		},
 		{
-			"path": "pages/demand-hall/demand-hall",
-			"style": {
-				"navigationBarTitleText": "鎴戠殑璁㈠崟",
-				"navigationStyle": "custom"
-			}
-		},
-		{
 			"path": "pages/mine/mine",
 			"style": {
 				"navigationBarTitleText": "鎴戠殑",
@@ -25,137 +18,49 @@
 			}
 		},
 		{
-			"path": "pages/seleCity/seleCity",
+			"path": "pages/itinerary/itinerary",
 			"style": {
-				"navigationBarTitleText": "鍩庡競閫夋嫨"
+				"navigationBarTitleText": "琛岀▼",
+				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/using-workers/using-workers",
-			"style" : 
-			{
-				"navigationBarTitleText" : "閲囨憳宸�"
+			"path": "pages/message/message",
+			"style": {
+				"navigationBarTitleText": "娑堟伅"
 			}
 		},
 		{
-			"path" : "pages/sorting/sorting",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍒嗘嫞宸�"
+			"path": "pages/storage-point/storage-point",
+			"style": {
+				"navigationBarTitleText": "瀵勫瓨鐐�"
 			}
 		},
 		{
-			"path" : "pages/packaging-worker/packaging-worker",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍖呰宸�"
+			"path": "pages/luggage-storage/luggage-storage",
+			"style": {
+				"navigationBarTitleText": "琛屾潕瀵勫瓨"
 			}
 		},
 		{
-			"path" : "pages/success/success",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍙戝崟鎴愬姛"
+			"path": "pages/payment-success/payment-success",
+			"style": {
+				"navigationBarTitleText": "鏀粯鎴愬姛"
 			}
 		},
 		{
-			"path" : "pages/freight/freight",
-			"style" : 
-			{
-				"navigationBarTitleText" : "杩愯揣"
+			"path": "pages/settings/settings",
+			"style": {
+				"navigationBarTitleText": "璁剧疆"
 			}
 		},
 		{
-			"path" : "pages/order-details/order-details",
-			"style" : 
-			{
-				"navigationBarTitleText" : "璁㈠崟璇︽儏"
-			}
-		},
-		{
-			"path" : "pages/freight-order/freight-order",
-			"style" : 
-			{
-				"navigationBarTitleText" : "璁㈠崟璇︽儏"
-			}
-		},
-		{
-			"path" : "pages/order-food/order-food",
-			"style" : 
-			{
-				"navigationBarTitleText" : "璁㈠崟璇︽儏"
-			}
-		},
-		{
-			"path" : "pages/login/login",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鐧诲綍椤�"
-			}
-		},
-		{
-			"path" : "pages/balance-details/balance-details",
-			"style" : 
-			{
-				"navigationBarTitleText" : "浣欓鏄庣粏"
-			}
-		}, 
-		
-		{
-			"path" : "pages/rich-text-page/rich-text-page",
-			"style" : 
-			{
-				"navigationBarTitleText" : "瀵屾枃鏈〉闈�"
+			"path": "pages/storage-order-detail/storage-order-detail",
+			"style": {
+				"navigationBarTitleText": "瀵勫瓨璁㈠崟璇︽儏"
 			}
 		}
-	], 
-	"subPackages": [{ 
-		"root": "packageA", // 鍒嗗寘鐨勬牴鐩綍
-		"name": "packageA", // 鍒嗗寘鐨勬牴鐩綍
-	    "pages":[
-			{
-				"path" : "pages/withdrawal/withdrawal",
-				"style" : 
-				{
-					"navigationBarTitleText" : "鎻愮幇"
-				}
-			},
-			{
-				"path" : "pages/withdrawal-successful/withdrawal-successful",
-				"style" : 
-				{
-					"navigationBarTitleText" : "鎻愮幇鎴愬姛"
-				}
-			},  
-			{
-				"path" : "pages/set-up/set-up",
-				"style" : 
-				{
-					"navigationBarTitleText" : "璁剧疆"
-				}
-			},
-			 {
-				"path" : "pages/employment-certification/employment-certification",
-				"style" : 
-				{
-					"navigationBarTitleText" : "鐢ㄥ伐璁よ瘉"
-				}
-			},
-			{
-				"path" : "pages/certification-results/certification-results",
-				"style" : 
-				{
-					"navigationBarTitleText" : "璁よ瘉缁撴灉"
-				}
-			}
-		]
-	}],
-	"preloadRule":{
-		"pages/mine/mine":{
-			"network": "all",
-			"packages": ["packageA"]
-		}
-	},
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "",
@@ -170,20 +75,26 @@
 		"list": [
 			{
 				"pagePath": "pages/index/index",
-				"iconPath": "static/icon/nav_home_sel@2x (1).png",
+				"iconPath": "static/icon/nav_home@2x.png",
 				"selectedIconPath": "static/icon/nav_home_sel@2x.png",
 				"text": "棣栭〉"
 			},
 			{
-				"pagePath": "pages/demand-hall/demand-hall",
-				"iconPath": "static/icon/nav_order@2x.png",
-				"selectedIconPath": "static/icon/nav_order_sel@2x.png",
-				"text": "璁㈠崟"
+				"pagePath": "pages/itinerary/itinerary",
+				"iconPath": "static/icon/nav_xingcheng@2x.png",
+				"selectedIconPath": "static/icon/nav_xingcheng_sel@2x.png",
+				"text": "琛岀▼"
+			},
+			{
+				"pagePath": "pages/message/message",
+				"iconPath": "static/icon/nav_xiaoxi@2x.png",
+				"selectedIconPath": "static/icon/nav_xiaoxi_sel@2x.png",
+				"text": "娑堟伅"
 			},
 			{
 				"pagePath": "pages/mine/mine",
-				"iconPath": "static/icon/nav_mine@2x.png",
-				"selectedIconPath": "static/icon/nav_mine_sel@2x.png",
+				"iconPath": "static/icon/nav_wode@2x.png",
+				"selectedIconPath": "static/icon/nav_wode_sel@2x.png",
 				"text": "鎴戠殑"
 			}
 		]

--
Gitblit v1.9.3