From bfdc0c10759de8b72f8659f9b75536647a1eecae Mon Sep 17 00:00:00 2001
From: peak <hdzx418@gmail.com>
Date: Mon, 9 Jun 2025 13:49:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/components/s-menu-button/s-menu-button.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sheep/components/s-menu-button/s-menu-button.vue b/sheep/components/s-menu-button/s-menu-button.vue
index cc7c104..98098e3 100644
--- a/sheep/components/s-menu-button/s-menu-button.vue
+++ b/sheep/components/s-menu-button/s-menu-button.vue
@@ -211,11 +211,7 @@
 
 	// 生成数据
 	const menuList = computed(() => splitData(props.data.list, props.data.row * props.data.column));
-<<<<<<< Updated upstream
 	console.log('这是菜单', menuList)
-=======
-	console.log("menulist",props.data.list);
->>>>>>> Stashed changes
 	const swiperHeight = computed(
 		() => props.data.row * (props.data.layout === 'iconText' ? 200 : 180),
 	);