From be80b22a4a0fcd33e1b17ebdb86eba91cc7de4d2 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 18:59:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

diff --git a/pages.json b/pages.json
index 553798b..99b0f4d 100644
--- a/pages.json
+++ b/pages.json
@@ -36,6 +36,13 @@
 			}
 		},
 		{
+			"path": "pages/kitchen/KitchenVideo",
+			"style": {
+				"navigationBarTitleText": "绁炲帹",
+				"navigationStyle": "custom" // 闅愯棌绯荤粺瀵艰埅鏍�
+			}
+		},
+		{
 			"path": "pages/tabbar/home/title",
 			"style": {
 				"navigationBarTitleText": "娑堟伅"
@@ -68,7 +75,7 @@
 		
 			"style": {
 				"navigationBarTitleText": "鍟嗗搧骞垮満",
-				// "navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
+				"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
 				"navigationBarTextStyle": "black",
 				// "disableScroll": true,
 				"bounce": "none",
@@ -268,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",
@@ -749,6 +792,7 @@
 					"style": {
 						"navigationBarTitleText": "娲诲姩",
 						"enablePullDownRefresh": true, //涓嬫媺鍒锋柊
+						"navigationStyle": "custom", // 闅愯棌椤堕儴瀵艰埅鏍�
 						"componentPlaceholder": {
 							"u-form": "view",
 							"u-form-item": "view",
@@ -993,6 +1037,13 @@
 						"componentPlaceholder": {
 							"u-button": "view"
 						}
+					}
+				},
+				{
+					"path" : "video-search",
+					"style" : 
+					{
+						"navigationBarTitleText" : ""
 					}
 				}
 			]
@@ -1435,16 +1486,8 @@
 			"pages": [{
 				"path": "healthVideo",
 				"style": {
-					"navigationBarTitleText": "澶у仴搴�"
-				}
-			}]
-		},
-		{
-			"root": "pages/kitchen",
-			"pages": [{
-				"path": "KitchenVideo",
-				"style": {
-					"navigationBarTitleText": "鍘ㄧ"
+					"navigationBarTitleText": "澶у仴搴�",
+					"navigationStyle": "custom"
 				}
 			}]
 		}
@@ -1487,10 +1530,10 @@
 			},
 			{
 				// "pagePath": "pages/tabbar/category/category",
-				"pagePath": "pages/commodity-square/commoditySquare",
+				"pagePath": "pages/kitchen/KitchenVideo",
 				"iconPath": "static/tabbar/category.png",
 				"selectedIconPath": "static/tabbar/category-s.png",
-				"text": "鍟嗗煄"
+				"text": "绁炲帹"
 			},
 			{
 				"pagePath": "pages/tabbar/video/video",

--
Gitblit v1.8.0