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

---
 components/custom-tabbar.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/custom-tabbar.vue b/components/custom-tabbar.vue
index 75aec2e..7d29bed 100644
--- a/components/custom-tabbar.vue
+++ b/components/custom-tabbar.vue
@@ -48,12 +48,12 @@
         	},
         	{
         		// "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": "鍟嗗煄",
-				"key": 'shop'
+        		"text": "绁炲帹",
+				"key": 'kitchen'
         	},
 			{
 				"pagePath": "/pages/tabbar/video/video",

--
Gitblit v1.8.0