From 9e0d2563ee3adc08b27f365e315855d776fd08f0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 10:00:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 pages.json |   73 +++++++++++++++++++++++++++++++-----
 1 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/pages.json b/pages.json
index a13330e..e04b985 100644
--- a/pages.json
+++ b/pages.json
@@ -816,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": "鎴戠殑鏀惰棌",
@@ -1504,17 +1551,23 @@
 					"navigationStyle": "custom"
 				}
 			}]
+		},
+		{
+			"root": "pages/supplier/suppler-order",
+			"pages": [{
+				"path": "suppler-order",
+				"style": {
+					"navigationBarTitleText": "渚涘簲鍟嗙"
+					// "navigationStyle": "custom"
+				}
+			},{
+				"path": "order-detail",
+				"style": {
+					"navigationBarTitleText": "璁㈠崟璇︽儏"
+					// "navigationStyle": "custom"
+				}
+			}]
 		}
-		// {
-		// 	"root": "pages/supplier/publish-goods",
-		// 	"pages": [{
-		// 		"path": "publishGoods",
-		// 		"style": {
-		// 			"navigationBarTitleText": "鍟嗗搧鍙戝竷"
-		// 			// "navigationStyle": "custom"
-		// 		}
-		// 	}]
-		// }
 		// ,
 		// {
 		// 	"root": "pages/commodity-square",

--
Gitblit v1.8.0