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 |   79 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/pages.json b/pages.json
index e03183c..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": "鏂板鍟嗗搧",
@@ -275,6 +275,42 @@
 			"path": "pages/userPermissions/userPermissions",
 			"style": {
 				"navigationBarTitleText": "鐢ㄦ埛鏉冮檺",
+				"componentPlaceholder": {
+					"u-icon": "view",
+					"u-button": "view",
+					"u-form": "view",
+					"u-form-item": "view",
+					"u-input": "view",
+					"u-popup": "view",
+					"u-search": "view",
+					"u-loading": "view",
+					"u-navbar": "view",
+					"u-loadmore":"view"
+				}
+			}
+		},
+		{
+			"path": "pages/news/news",
+			"style": {
+				"navigationBarTitleText": "鏂伴椈",
+				"componentPlaceholder": {
+					"u-icon": "view",
+					"u-button": "view",
+					"u-form": "view",
+					"u-form-item": "view",
+					"u-input": "view",
+					"u-popup": "view",
+					"u-search": "view",
+					"u-loading": "view",
+					"u-navbar": "view",
+					"u-loadmore":"view"
+				}
+			}
+		},
+		{
+			"path": "pages/news/detail",
+			"style": {
+				"navigationBarTitleText": "鏂伴椈璇︽儏",
 				"componentPlaceholder": {
 					"u-icon": "view",
 					"u-button": "view",
@@ -329,6 +365,13 @@
 					"u-loadmore":"view",
 					"u-switch": "view"
 				}
+			}
+		},
+		{
+			"path" : "pages/supplier/publish-goods/goodsInfo",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
 			}
 		}
 	],
@@ -791,6 +834,14 @@
 							"u-loadmore": "view"
 						}
 					}
+				},
+				{
+					"path" : "myAttention",
+					"style" : 
+					{
+						"navigationBarTitleText" : "鍏虫敞鍒楄〃",
+						"enablePullDownRefresh": true
+					}
 				}
 			]
 		},
@@ -800,8 +851,7 @@
 				{
 					"path": "shopPage",
 					"style": {
-						"navigationBarTitleText": "",
-						"navigationStyle": "custom"
+						"navigationBarTitleText": ""
 					}
 				},
 				{
@@ -1001,6 +1051,13 @@
 						"componentPlaceholder": {
 							"u-button": "view"
 						}
+					}
+				},
+				{
+					"path" : "video-search",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
 					}
 				}
 			]
@@ -1447,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