From 7673b8272cfd9fc21161b70e35c263e455b59966 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 27 六月 2025 10:57:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 components/custom-tabbar.vue |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/custom-tabbar.vue b/components/custom-tabbar.vue
index a483f52..7d29bed 100644
--- a/components/custom-tabbar.vue
+++ b/components/custom-tabbar.vue
@@ -47,16 +47,18 @@
 				"key": 'index'
         	},
         	{
-        		"pagePath": "/pages/tabbar/category/category",
+        		// "pagePath": "/pages/tabbar/category/category",
+				"pagePath": "/pages/kitchen/KitchenVideo",
+				
         		"iconPath": "/static/tabbar/category.png",
         		"selectedIconPath": "/static/tabbar/category-s.png",
-        		"text": "鍟嗗煄",
-				"key": 'shop'
+        		"text": "绁炲帹",
+				"key": 'kitchen'
         	},
 			{
 				"pagePath": "/pages/tabbar/video/video",
-				"iconPath": "/static/tabbar/video.png",
-				"selectedIconPath": "/static/tabbar/video-selected.png",
+				"iconPath": "/static/tabbar/video1.png",
+				"selectedIconPath": "/static/tabbar/video1-selected.png",
 				"key": 'video'
 			},
         	{

--
Gitblit v1.8.0