diff --git a/src/components/Navbars/HomeNavbar.js b/src/components/Navbars/HomeNavbar.js index 4af73df8..b64990e7 100644 --- a/src/components/Navbars/HomeNavbar.js +++ b/src/components/Navbars/HomeNavbar.js @@ -167,20 +167,14 @@ export default function HomeNavbar() { {/* 中间导航区域 - 响应式 (Phase 4 优化) */} - {isMobile ? ( - // 移动端:汉堡菜单 - } - variant="ghost" - onClick={onOpen} - aria-label="Open menu" - /> - ) : isTablet ? ( - // 中屏(平板):"更多"下拉菜单 - - ) : ( - // 大屏(桌面):完整导航菜单 - + {!isMobile && ( + isTablet ? ( + // 中屏(平板):"更多"下拉菜单 + + ) : ( + // 大屏(桌面):完整导航菜单 + + ) )} {/* 右侧功能区 (Phase 7 优化) */} @@ -189,6 +183,8 @@ export default function HomeNavbar() { isAuthenticated={isAuthenticated} user={user} isDesktop={isDesktop} + isMobile={isMobile} + onMenuOpen={onOpen} handleLogout={handleLogout} watchlistQuotes={watchlistQuotes} followingEvents={followingEvents} diff --git a/src/components/Navbars/components/NavbarActions/index.js b/src/components/Navbars/components/NavbarActions/index.js index 8610708f..7ca5b3c0 100644 --- a/src/components/Navbars/components/NavbarActions/index.js +++ b/src/components/Navbars/components/NavbarActions/index.js @@ -2,7 +2,8 @@ // Navbar 右侧功能区组件 import React, { memo } from 'react'; -import { HStack, Spinner } from '@chakra-ui/react'; +import { HStack, Spinner, IconButton } from '@chakra-ui/react'; +import { HamburgerIcon } from '@chakra-ui/icons'; import ThemeToggleButton from '../ThemeToggleButton'; import LoginButton from '../LoginButton'; import CalendarButton from '../CalendarButton'; @@ -19,6 +20,8 @@ import { PersonalCenterMenu } from '../Navigation'; * @param {boolean} props.isAuthenticated - 是否已登录 * @param {Object} props.user - 用户对象 * @param {boolean} props.isDesktop - 是否为桌面端 + * @param {boolean} props.isMobile - 是否为移动端 + * @param {Function} props.onMenuOpen - 打开移动端菜单的回调 * @param {Function} props.handleLogout - 登出回调 * @param {Array} props.watchlistQuotes - 自选股数据(用于 TabletUserMenu) * @param {Array} props.followingEvents - 关注事件数据(用于 TabletUserMenu) @@ -28,6 +31,8 @@ const NavbarActions = memo(({ isAuthenticated, user, isDesktop, + isMobile, + onMenuOpen, handleLogout, watchlistQuotes, followingEvents @@ -64,14 +69,38 @@ const NavbarActions = memo(({ /> )} + {/* 移动端汉堡菜单 - 在头像右侧 */} + {isMobile && ( + } + variant="ghost" + onClick={onMenuOpen} + aria-label="打开菜单" + size="md" + /> + )} + {/* 个人中心下拉菜单 - 仅大屏显示 */} {isDesktop && ( )} ) : ( - // 未登录状态 - 单一按钮 - + // 未登录状态 - 登录按钮 + 汉堡菜单 + + + + {/* 移动端汉堡菜单 - 未登录时也显示 */} + {isMobile && ( + } + variant="ghost" + onClick={onMenuOpen} + aria-label="打开菜单" + size="md" + /> + )} + )} );