From 78685131317e9a08a05895c899ebea9970be52c8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 09 六月 2025 11:20:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-wx into dev

---
 pages.json |   80 +++++++++++++++++++++++++++++++++-------
 1 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/pages.json b/pages.json
index eb9d53e..aeed599 100644
--- a/pages.json
+++ b/pages.json
@@ -257,7 +257,10 @@
 					"u-input": "view",
 					"u-popup": "view",
 					"u-search": "view",
-					"u-loading": "view"
+					"u-loading": "view",
+					"u-checkbox": "view",
+					"u-checkbox-group": "view",
+					"u-navbar": "view"
 				}
 			}
 		},
@@ -281,8 +284,6 @@
 				}
 			}
 		}
-
-
 	],
 	"subPackages": [{
 			"root": "uview-components", // 蹇呴』涓巔reloadRule涓殑鍚嶇О瀹屽叏涓�鑷�
@@ -672,14 +673,8 @@
 				}, {
 					"path": "activity/detail",
 					"style": {
-						"navigationBarTitleText": "娲诲姩璇︽儏"
-					}
-				}, {
-					"path": "activity/myActivity",
-					"style": {
-						"navigationBarTitleText": "鎴戠殑娲诲姩",
+						"navigationBarTitleText": "娲诲姩璇︽儏",
 						"enablePullDownRefresh": true, //涓嬫媺鍒锋柊
-						"navigationStyle": "custom",
 						"componentPlaceholder": {
 							"u-form": "view",
 							"u-form-item": "view",
@@ -688,7 +683,27 @@
 							"u-action-sheet": "view",
 							"u-checkbox-group": "view",
 							"u-checkbox": "view",
-							"u-navbar": "view"
+							"u-navbar": "view",
+							"u-button": "view",
+							"u-image": "view"
+						}
+					}
+				}, {
+					"path": "activity/myActivity",
+					"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"
 						}
 					}
 				}, {
@@ -696,7 +711,6 @@
 					"style": {
 						"navigationBarTitleText": "娲诲姩",
 						"enablePullDownRefresh": true, //涓嬫媺鍒锋柊
-						"navigationStyle": "custom",
 						"componentPlaceholder": {
 							"u-form": "view",
 							"u-form-item": "view",
@@ -705,13 +719,17 @@
 							"u-action-sheet": "view",
 							"u-checkbox-group": "view",
 							"u-checkbox": "view",
-							"u-navbar": "view"
+							"u-navbar": "view",
+							"u-button": "view",
+							"u-image": "view",
+							"u-loadmore": "view"
 						}
 					}
 				}, {
 					"path": "myCollect/myCollect",
 					"style": {
 						"navigationBarTitleText": "鎴戠殑鏀惰棌",
+						"enablePullDownRefresh": true, //涓嬫媺鍒锋柊
 						"componentPlaceholder": {
 							"u-icon": "view",
 							"u-button": "view",
@@ -721,7 +739,10 @@
 							"u-popup": "view",
 							"u-search": "view",
 							"u-loading": "view",
-							"u-navbar": "view"
+							"u-navbar": "view",
+							"u-image": "view",
+							"u-loadmore": "view"
+							
 						}
 
 					}
@@ -902,6 +923,37 @@
 
 		},
 		{
+			"root": "pages/video",
+			"pages": [{
+					"path": "home-page",
+					"style": {
+						"navigationBarTitleText": "TA鐨勪富椤�"
+					}
+				},
+				{
+					"path" : "video-play",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
+					}
+				},
+				{
+					"path" : "home-page-edit",
+					"style" : 
+					{
+						"navigationBarTitleText" : "涓婚〉淇℃伅淇敼"
+					}
+				},
+				{
+					"path" : "video-edit",
+					"style" : 
+					{
+						"navigationBarTitleText" : "瑙嗛缂栬緫"
+					}
+				}
+			]
+		},
+		{
 			"root": "pages/passport",
 			"pages": [{
 					"path": "login",

--
Gitblit v1.8.0