From 723389702b9ce28e8fb282f265fbf2e8e4faf13a Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 15 七月 2025 13:52:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 pages.json |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 55 insertions(+), 1 deletions(-)

diff --git a/pages.json b/pages.json
index ea225f5..e04b985 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" : ""
 			}
 		}
 	],
@@ -809,6 +816,53 @@
 					}
 				},
 				{
+					"path" : "activity/applayActivityList",
+					"style" : 
+					{
+						"navigationBarTitleText": "鐢宠娲诲姩鍒楄〃",
+						"enablePullDownRefresh": true, //涓嬫媺鍒锋柊
+						"componentPlaceholder": {
+							"u-form": "view",
+							"u-form-item": "view",
+							"u-input": "view",
+							"u-icon": "view",
+							"u-action-sheet": "view",
+							"u-checkbox-group": "view",
+							"u-checkbox": "view",
+							"u-navbar": "view",
+							"u-button": "view",
+							"u-image": "view",
+							"u-loadmore": "view",
+							"u-empty":"view"
+						}
+					}
+				},
+				{
+					"path" : "activity/addActivity",
+					"style" : 
+					{
+						"navigationBarTitleText": "鐢宠娲诲姩",
+						"componentPlaceholder": {
+							"u-form": "view",
+							"u-form-item": "view",
+							"u-input": "view",
+							"u-icon": "view",
+							"u-action-sheet": "view",
+							"u-checkbox-group": "view",
+							"u-checkbox": "view",
+							"u-navbar": "view",
+							"u-button": "view",
+							"u-image": "view",
+							"u-loadmore": "view",
+							"u-empty":"view",
+							"u-datetime-picker":"view",
+							"u-radio-group":"view",
+							"u-radio":"view",
+							"u-cell":"view"
+						}
+					}
+				},
+				{
 					"path": "myCollect/myCollect",
 					"style": {
 						"navigationBarTitleText": "鎴戠殑鏀惰棌",

--
Gitblit v1.8.0