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 |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/pages.json b/pages.json
index 8fc61af..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": "鎴戠殑鏀惰棌",

--
Gitblit v1.8.0