From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 small-program/pages.json |  313 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 210 insertions(+), 103 deletions(-)

diff --git a/small-program/pages.json b/small-program/pages.json
index 6b9adf1..6f65ae5 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,136 +18,243 @@
 			}
 		},
 		{
-			"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": "娑堟伅",
+				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/sorting/sorting",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍒嗘嫞宸�"
+			"path": "pages/storage-point/storage-point",
+			"style": {
+				"navigationBarTitleText": "瀵勫瓨鐐�"
 			}
 		},
 		{
-			"path" : "pages/packaging-worker/packaging-worker",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍖呰宸�"
+			"path": "pages/storage-point-detail/storage-point-detail",
+			"style": {
+				"navigationBarTitleText": "瀵勫瓨鐐硅鎯�"
 			}
 		},
 		{
-			"path" : "pages/success/success",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍙戝崟鎴愬姛"
+			"path": "pages/luggage-storage/luggage-storage",
+			"style": {
+				"navigationBarTitleText": "琛屾潕瀵勫瓨"
 			}
 		},
 		{
-			"path" : "pages/freight/freight",
-			"style" : 
-			{
-				"navigationBarTitleText" : "杩愯揣"
+			"path": "pages/payment-success/payment-success",
+			"style": {
+				"navigationBarTitleText": "鏀粯鎴愬姛"
 			}
 		},
 		{
-			"path" : "pages/order-details/order-details",
-			"style" : 
-			{
-				"navigationBarTitleText" : "璁㈠崟璇︽儏"
+			"path": "pages/settings/settings",
+			"style": {
+				"navigationBarTitleText": "璁剧疆"
 			}
 		},
 		{
-			"path" : "pages/freight-order/freight-order",
-			"style" : 
-			{
-				"navigationBarTitleText" : "璁㈠崟璇︽儏"
+			"path": "pages/storage-order-detail/storage-order-detail",
+			"style": {
+				"navigationBarTitleText": "瀵勫瓨璁㈠崟璇︽儏",
+				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/order-food/order-food",
-			"style" : 
-			{
-				"navigationBarTitleText" : "璁㈠崟璇︽儏"
+			"path": "pages/all-orders/all-orders",
+			"style": {
+				"navigationBarTitleText": "鍏ㄩ儴璁㈠崟"
 			}
 		},
 		{
-			"path" : "pages/login/login",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鐧诲綍椤�"
+			"path": "pages/store-apply/store-apply",
+			"style": {
+				"navigationBarTitleText": "闂ㄥ簵鍏ラ┗"
 			}
 		},
 		{
-			"path" : "pages/balance-details/balance-details",
-			"style" : 
-			{
-				"navigationBarTitleText" : "浣欓鏄庣粏"
+			"path": "pages/delivery-order-detail/delivery-order-detail",
+			"style": {
+				"navigationBarTitleText": "瀵勯�佽鍗曡鎯�",
+				"navigationStyle": "custom"
 			}
-		}, 
-		
+		},
 		{
-			"path" : "pages/rich-text-page/rich-text-page",
-			"style" : 
-			{
-				"navigationBarTitleText" : "瀵屾枃鏈〉闈�"
+			"path": "pages/orders/orders",
+			"style": {
+				"navigationBarTitleText": "鍏ㄩ儴璁㈠崟"
+			}
+		},
+		{
+			"path": "pages/address/address",
+			"style": {
+				"navigationBarTitleText": "鍦板潃"
+			}
+		},
+		{
+			"path": "pages/new-address/new-address",
+			"style": {
+				"navigationBarTitleText": "鏂板鍦板潃"
+			}
+		},
+		{
+			"path": "pages/rich-text/rich-text",
+			"style": {
+				"navigationBarTitleText": "鍗忚"
+			}
+		},
+		{
+			"path": "pages/details-entry/details-entry",
+			"style": {
+				"navigationBarTitleText": "闂ㄥ簵鍏ラ┗"
+			}
+		},
+		{
+			"path": "pages/select-city/select-city",
+			"style": {
+				"navigationBarTitleText": "閫夋嫨鍩庡競"
+			}
+		},
+		{
+			"path": "pages/evaluate/evaluate",
+			"style": {
+				"navigationBarTitleText": "璇勪环"
 			}
 		}
-	], 
-	"subPackages": [{ 
-		"root": "packageA", // 鍒嗗寘鐨勬牴鐩綍
-		"name": "packageA", // 鍒嗗寘鐨勬牴鐩綍
-	    "pages":[
-			{
-				"path" : "pages/withdrawal/withdrawal",
-				"style" : 
+	],
+	"subPackages": [
+		{
+			"root": "shop",
+			"pages": [
 				{
-					"navigationBarTitleText" : "鎻愮幇"
-				}
-			},
-			{
-				"path" : "pages/withdrawal-successful/withdrawal-successful",
-				"style" : 
+					"path": "pages/login/login",
+					"style": {
+						"navigationBarTitleText": "鐧诲綍"
+					}
+				},
 				{
-					"navigationBarTitleText" : "鎻愮幇鎴愬姛"
-				}
-			},  
-			{
-				"path" : "pages/set-up/set-up",
-				"style" : 
+					"path": "pages/store-home/store-home",
+					"style": {
+						"navigationBarTitleText": "闂ㄥ簵棣栭〉",
+						"navigationStyle": "custom"
+					}
+				},
 				{
-					"navigationBarTitleText" : "璁剧疆"
-				}
-			},
-			 {
-				"path" : "pages/employment-certification/employment-certification",
-				"style" : 
+					"path": "pages/mine/mine",
+					"style": {
+						"navigationBarTitleText": "鎴戠殑",
+						"navigationStyle": "custom"
+					}
+				},
 				{
-					"navigationBarTitleText" : "鐢ㄥ伐璁よ瘉"
-				}
-			},
-			{
-				"path" : "pages/certification-results/certification-results",
-				"style" : 
+					"path": "pages/wallet/wallet",
+					"style": {
+						"navigationBarTitleText": "闂ㄥ簵閽卞寘",
+						"navigationStyle": "custom"
+					}
+				},
 				{
-					"navigationBarTitleText" : "璁よ瘉缁撴灉"
+					"path": "pages/write-off/write-off",
+					"style": {
+						"navigationBarTitleText": "璁㈠崟鏍搁獙"
+					}
+				},
+				{
+					"path": "pages/write-off-a/write-off-a",
+					"style": {
+						"navigationBarTitleText": "璁㈠崟鏍搁獙"
+					}
+				},
+				{
+					"path": "pages/qualification/qualification",
+					"style": {
+						"navigationBarTitleText": "鎴戠殑璧勮川"
+					}
+				},
+				{
+					"path": "pages/store-info/store-info",
+					"style": {
+						"navigationBarTitleText": "闂ㄥ簵淇℃伅"
+					}
+				},
+				{
+					"path": "pages/message/message",
+					"style": {
+						"navigationBarTitleText": "娑堟伅",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/orders/orders",
+					"style": {
+						"navigationBarTitleText": "闂ㄥ簵璁㈠崟"
+					}
+				},
+				{
+					"path": "pages/order-details/order-details",
+					"style": {
+						"navigationBarTitleText": "闂ㄥ簵璁㈠崟璇︽儏",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/withdraw/withdraw",
+					"style": {
+						"navigationBarTitleText": "鎻愮幇"
+					}
+				},
+				{
+					"path": "pages/withdraw-success/withdraw-success",
+					"style": {
+						"navigationBarTitleText": "鎻愮幇"
+					}
+				},
+				{
+					"path": "pages/settings/settings",
+					"style": {
+						"navigationBarTitleText": "璁剧疆"
+					}
+				},
+				{
+					"path": "pages/change-password/change-password",
+					"style": {
+						"navigationBarTitleText": "淇敼瀵嗙爜"
+					}
+				},
+				{
+					"path": "pages/select/select",
+					"style": {
+						"navigationBarTitleText": "瀹佺晠琛�"
+					}
+				},
+				{
+					"path": "pages/webview/webview",
+					"style": {
+						"navigationBarTitleText": "杞挱鍥捐鎯�"
+					}
+				},
+				{
+					"path": "pages/article-details/article-details",
+					"style": {
+						"navigationBarTitleText": "杞挱鍥捐鎯�"
+					}
 				}
-			}
-		]
-	}],
-	"preloadRule":{
-		"pages/mine/mine":{
+			]
+		}
+	],
+	"preloadRule": {
+	    "pages/index/index": {
 			"network": "all",
-			"packages": ["packageA"]
-		}
+			"packages": ["shop"]
+	    }
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -164,26 +264,33 @@
 	},
 	"tabBar": {
 		"color": "#999999",
-		"selectedColor": "#222222",
+		"selectedColor": "#10B2FA",
 		"borderStyle": "black",
 		"backgroundColor": "#fff",
+		"custom": true,
 		"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