From a1c289e7dfc5d9a3b8dc7ca9b05857f276c05f8d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 09 七月 2025 18:03:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 pages.json |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/pages.json b/pages.json
index fb8f8b7..8fc61af 100644
--- a/pages.json
+++ b/pages.json
@@ -240,7 +240,7 @@
 			}
 		},
 		{
-			"path": "pages/goods-manager/addGoods/addGoods",
+			"path": "pages/supplier/publish-goods/publishGoods",
 			"style": {
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "鏂板鍟嗗搧",
@@ -365,6 +365,13 @@
 					"u-loadmore":"view",
 					"u-switch": "view"
 				}
+			}
+		},
+		{
+			"path" : "pages/supplier/publish-goods/goodsInfo",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
 			}
 		}
 	],
@@ -1497,6 +1504,22 @@
 					"navigationStyle": "custom"
 				}
 			}]
+		},
+		{
+			"root": "pages/supplier/suppler-order",
+			"pages": [{
+				"path": "suppler-order",
+				"style": {
+					"navigationBarTitleText": "渚涘簲鍟嗙"
+					// "navigationStyle": "custom"
+				}
+			},{
+				"path": "order-detail",
+				"style": {
+					"navigationBarTitleText": "璁㈠崟璇︽儏"
+					// "navigationStyle": "custom"
+				}
+			}]
 		}
 		// ,
 		// {

--
Gitblit v1.8.0