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 |  237 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 232 insertions(+), 5 deletions(-)

diff --git a/small-program/pages.json b/small-program/pages.json
index aa1d901..6f65ae5 100644
--- a/small-program/pages.json
+++ b/small-program/pages.json
@@ -20,16 +20,242 @@
 		{
 			"path": "pages/itinerary/itinerary",
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "琛岀▼",
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/message/message",
 			"style": {
-				"navigationBarTitleText": "娑堟伅"
+				"navigationBarTitleText": "娑堟伅",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/storage-point/storage-point",
+			"style": {
+				"navigationBarTitleText": "瀵勫瓨鐐�"
+			}
+		},
+		{
+			"path": "pages/storage-point-detail/storage-point-detail",
+			"style": {
+				"navigationBarTitleText": "瀵勫瓨鐐硅鎯�"
+			}
+		},
+		{
+			"path": "pages/luggage-storage/luggage-storage",
+			"style": {
+				"navigationBarTitleText": "琛屾潕瀵勫瓨"
+			}
+		},
+		{
+			"path": "pages/payment-success/payment-success",
+			"style": {
+				"navigationBarTitleText": "鏀粯鎴愬姛"
+			}
+		},
+		{
+			"path": "pages/settings/settings",
+			"style": {
+				"navigationBarTitleText": "璁剧疆"
+			}
+		},
+		{
+			"path": "pages/storage-order-detail/storage-order-detail",
+			"style": {
+				"navigationBarTitleText": "瀵勫瓨璁㈠崟璇︽儏",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/all-orders/all-orders",
+			"style": {
+				"navigationBarTitleText": "鍏ㄩ儴璁㈠崟"
+			}
+		},
+		{
+			"path": "pages/store-apply/store-apply",
+			"style": {
+				"navigationBarTitleText": "闂ㄥ簵鍏ラ┗"
+			}
+		},
+		{
+			"path": "pages/delivery-order-detail/delivery-order-detail",
+			"style": {
+				"navigationBarTitleText": "瀵勯�佽鍗曡鎯�",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"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": "shop",
+			"pages": [
+				{
+					"path": "pages/login/login",
+					"style": {
+						"navigationBarTitleText": "鐧诲綍"
+					}
+				},
+				{
+					"path": "pages/store-home/store-home",
+					"style": {
+						"navigationBarTitleText": "闂ㄥ簵棣栭〉",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/mine/mine",
+					"style": {
+						"navigationBarTitleText": "鎴戠殑",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "pages/wallet/wallet",
+					"style": {
+						"navigationBarTitleText": "闂ㄥ簵閽卞寘",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"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/index/index": {
+			"network": "all",
+			"packages": ["shop"]
+	    }
+	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "",
@@ -38,9 +264,10 @@
 	},
 	"tabBar": {
 		"color": "#999999",
-		"selectedColor": "#222222",
+		"selectedColor": "#10B2FA",
 		"borderStyle": "black",
 		"backgroundColor": "#fff",
+		"custom": true,
 		"list": [
 			{
 				"pagePath": "pages/index/index",
@@ -62,8 +289,8 @@
 			},
 			{
 				"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