|
@@ -143,6 +143,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = () => {
|
|
|
{/* 品牌区域 */}
|
|
{/* 品牌区域 */}
|
|
|
<Col xl={4} lg={4} md={5} sm={0} xs={0} className="h-full">
|
|
<Col xl={4} lg={4} md={5} sm={0} xs={0} className="h-full">
|
|
|
<img
|
|
<img
|
|
|
|
|
+ data-testid="logo-image"
|
|
|
src={logo}
|
|
src={logo}
|
|
|
alt="Logo"
|
|
alt="Logo"
|
|
|
className="h-full w-auto object-contain"
|
|
className="h-full w-auto object-contain"
|
|
@@ -186,13 +187,13 @@ const BasicLayout: React.FC<BasicLayoutProps> = () => {
|
|
|
className="xxl:h-[90vh] xl:h-[90vh] lg:h-[90vh] md:h-[90vh] sm:h-[90vh] xs:h-[90vh] pt-2"
|
|
className="xxl:h-[90vh] xl:h-[90vh] lg:h-[90vh] md:h-[90vh] sm:h-[90vh] xs:h-[90vh] pt-2"
|
|
|
>
|
|
>
|
|
|
{/* 导航区域 */}
|
|
{/* 导航区域 */}
|
|
|
- <Col xl={2} lg={2} md={0} sm={0} xs={0} className="h-full">
|
|
|
|
|
|
|
+ <Col xl={2} lg={0} md={0} sm={0} xs={0} className="h-full">
|
|
|
<NavMenu onMenuClick={handleMenuClick} />
|
|
<NavMenu onMenuClick={handleMenuClick} />
|
|
|
</Col>
|
|
</Col>
|
|
|
{/* 内容区域 */}
|
|
{/* 内容区域 */}
|
|
|
<Col
|
|
<Col
|
|
|
xl={22}
|
|
xl={22}
|
|
|
- lg={22}
|
|
|
|
|
|
|
+ lg={24}
|
|
|
xs={24}
|
|
xs={24}
|
|
|
md={24}
|
|
md={24}
|
|
|
sm={24}
|
|
sm={24}
|
|
@@ -210,15 +211,13 @@ const BasicLayout: React.FC<BasicLayoutProps> = () => {
|
|
|
{/* 第一行:品牌和状态区域 */}
|
|
{/* 第一行:品牌和状态区域 */}
|
|
|
{pageLayoutConfig.brandAndStatusPosition === 'bottom' && (
|
|
{pageLayoutConfig.brandAndStatusPosition === 'bottom' && (
|
|
|
<Row
|
|
<Row
|
|
|
- className="xl:h-[9vh] text-[100%]"
|
|
|
|
|
|
|
+ className="xl:h-[9vh] md:h-[9vh] text-[100%]"
|
|
|
style={{ borderBottom: '1px solid #e5e7eb' }}
|
|
style={{ borderBottom: '1px solid #e5e7eb' }}
|
|
|
>
|
|
>
|
|
|
{/* 品牌区域 */}
|
|
{/* 品牌区域 */}
|
|
|
<Col xl={8} lg={8} md={5} sm={0} xs={0} className="h-full">
|
|
<Col xl={8} lg={8} md={5} sm={0} xs={0} className="h-full">
|
|
|
{/* 底部通栏:仅在桌面端显示 */}
|
|
{/* 底部通栏:仅在桌面端显示 */}
|
|
|
- <div className="xl:block lg:block md:hidden sm:hidden xs:hidden h-full">
|
|
|
|
|
- <BottomBar />
|
|
|
|
|
- </div>
|
|
|
|
|
|
|
+ <BottomBar />
|
|
|
</Col>
|
|
</Col>
|
|
|
{/* 状态区域 */}
|
|
{/* 状态区域 */}
|
|
|
<Col
|
|
<Col
|
|
@@ -300,8 +299,8 @@ const BasicLayout: React.FC<BasicLayoutProps> = () => {
|
|
|
</TabBar>
|
|
</TabBar>
|
|
|
</div>
|
|
</div>
|
|
|
<NavbarFloat
|
|
<NavbarFloat
|
|
|
- className="fixed hidden sm:hidden xs:hidden md:block lg:hidden xl:hidden"
|
|
|
|
|
- position="right"
|
|
|
|
|
|
|
+ className="fixed hidden sm:hidden xs:hidden md:block lg:block xl:hidden"
|
|
|
|
|
+ position="left"
|
|
|
onMenuClick={handleMenuClick}
|
|
onMenuClick={handleMenuClick}
|
|
|
/>
|
|
/>
|
|
|
</Layout>
|
|
</Layout>
|