From fc6b0d3a7cd1bb26e55ff9424cc612aecb217c9d Mon Sep 17 00:00:00 2001 From: qiuchenfan <2035024011@qq.com> Date: Wed, 19 Nov 2025 15:53:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/news/header/TopNav.tsx | 62 +++++++++++++++------------ 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/app/components/news/header/TopNav.tsx b/app/components/news/header/TopNav.tsx index f5dfd1f..d9247a3 100644 --- a/app/components/news/header/TopNav.tsx +++ b/app/components/news/header/TopNav.tsx @@ -1,6 +1,6 @@ import { Search } from 'lucide-react'; import React, { useState } from 'react'; - +import { Button } from '@/ui/button'; interface MenuItem { label: string; key: string; @@ -60,46 +60,54 @@ export function TopNav({ }; return ( -
+ // 将组件宽度调整为1514px，并保持居中 +
{/* 搜索框与导航菜单组合 */} -
+
{/* 搜索框 */} -
-
- setSearchKeyword(e.target.value)} - placeholder="搜索..." - className="pl-10 pr-4 py-2 text-sm rounded-lg border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent w-64 transition-all duration-200 hover:shadow-sm" - /> - - - -
-
- {/* 导航菜单 */} -
    +
    + + + setSearchKeyword(e.target.value)} + className="pl-5 pr-4 py-2 text-sm h-full border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent w-64 transition-all duration-200 hover:shadow-sm" /> +
    + + + {/* 导航菜单 */} +
      {menuItems.map((item) => { - const isActive = currentActiveKey === item.key; // 判断当前项是否激活 + const isActive = currentActiveKey === item.key; return ( -
    • +
      • ); })}
    + + +
); -}; +}; \ No newline at end of file From fffc57ce8324ada7bd45dfd10c1059fe29df454b Mon Sep 17 00:00:00 2001 From: qiuchenfan <2035024011@qq.com> Date: Wed, 19 Nov 2025 16:01:05 +0800 Subject: [PATCH 2/6] =?UTF-8?q?s=E5=88=A0=E9=99=A4=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/news/header/TopNav.tsx | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/components/news/header/TopNav.tsx b/app/components/news/header/TopNav.tsx index d52002f..8eaf5ed 100644 --- a/app/components/news/header/TopNav.tsx +++ b/app/components/news/header/TopNav.tsx @@ -29,15 +29,7 @@ export function TopNav({ const [internalActiveKey, setInternalActiveKey] = useState('home'); const currentActiveKey = externalActiveKey !== undefined ? externalActiveKey : internalActiveKey; const [searchKeyword, setSearchKeyword] = useState(''); - // const [activeIndex, setActiveIndex] = useState(0); - // const [prevIndex, setPrevIndex] = useState(0); - - // 监听激活项变化，更新索引和动画方向 - // useEffect(() => { - // const currentIndex = menuItems.findIndex(item => item.key === currentActiveKey); - // setPrevIndex(activeIndex); - // setActiveIndex(currentIndex); - // }, [currentActiveKey, menuItems, activeIndex]); + const handleSearchSubmit = (e: React.FormEvent) => { e.preventDefault(); From 42730b0479782f0d7ad225a4340965323f428ad0 Mon Sep 17 00:00:00 2001 From: Li1304553726 <1304553726@qq.com> Date: Wed, 19 Nov 2025 16:03:12 +0800 Subject: [PATCH 3/6] 1 --- app/components/Carousel.tsx | 19 ++++++++++--------- app/components/news/body/FireNews/fhyw.tsx | 7 +++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/components/Carousel.tsx b/app/components/Carousel.tsx index ee00eb0..2a6d040 100755 --- a/app/components/Carousel.tsx +++ b/app/components/Carousel.tsx @@ -25,6 +25,7 @@ export function CarouselDemo() { const [current, setCurrent] = React.useState(0); const [count, setCount] = React.useState(0); const totalSlides = imageUrls.length; + React.useEffect(() => { if (!api) return; @@ -53,18 +54,18 @@ export function CarouselDemo() { {Array.from({ length: totalSlides }).map((_, index) => (
- - -
{/* 移除了 aspect-square */} +
-
- - + > +
+
))} diff --git a/app/components/news/body/FireNews/fhyw.tsx b/app/components/news/body/FireNews/fhyw.tsx index 45d7877..9239ae6 100644 --- a/app/components/news/body/FireNews/fhyw.tsx +++ b/app/components/news/body/FireNews/fhyw.tsx @@ -1,17 +1,16 @@ import { CarouselDemo } from "@/components/Carousel"; import {FireNewsList} from "./FireNewsList"; - export function FhywPage() { return( -
+
{/* 轮播背景图 */} -
+
{/* 固定的烽火要闻 */} -
+
From 10e859bd28e7641cac9e5e624ee9357b7c370bb2 Mon Sep 17 00:00:00 2001 From: Li1304553726 <1304553726@qq.com> Date: Wed, 19 Nov 2025 16:08:37 +0800 Subject: [PATCH 4/6] 1 --- app/components/Carousel.tsx | 19 +++++++++---------- app/components/news/body/FireNews/fhyw.tsx | 4 ++-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app/components/Carousel.tsx b/app/components/Carousel.tsx index 2a6d040..ee00eb0 100755 --- a/app/components/Carousel.tsx +++ b/app/components/Carousel.tsx @@ -25,7 +25,6 @@ export function CarouselDemo() { const [current, setCurrent] = React.useState(0); const [count, setCount] = React.useState(0); const totalSlides = imageUrls.length; - React.useEffect(() => { if (!api) return; @@ -54,18 +53,18 @@ export function CarouselDemo() { {Array.from({ length: totalSlides }).map((_, index) => (
- {/* 移除了 aspect-square */} -
+
-
- + > +
+ +
))} diff --git a/app/components/news/body/FireNews/fhyw.tsx b/app/components/news/body/FireNews/fhyw.tsx index 9239ae6..7244e31 100644 --- a/app/components/news/body/FireNews/fhyw.tsx +++ b/app/components/news/body/FireNews/fhyw.tsx @@ -4,8 +4,8 @@ import {FireNewsList} from "./FireNewsList"; export function FhywPage() { return(
- {/* 轮播背景图 */} -
+ {/* 轮播背景图 - 确保有明确尺寸 */} +
From 13407f8a3cf0efc208d7f268f7a344eb47623ab3 Mon Sep 17 00:00:00 2001 From: Li1304553726 <1304553726@qq.com> Date: Wed, 19 Nov 2025 16:13:11 +0800 Subject: [PATCH 5/6] 1 --- app/components/news/body/FireNews/fhjt.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/news/body/FireNews/fhjt.tsx b/app/components/news/body/FireNews/fhjt.tsx index 943221a..6d380ec 100644 --- a/app/components/news/body/FireNews/fhjt.tsx +++ b/app/components/news/body/FireNews/fhjt.tsx @@ -4,7 +4,7 @@ import {FireNewsList} from "./FireNewsList"; export function FhjtPage() { return( -
+
{/* 轮播背景图 */}
From 87751644114a00e02c449c1590cfa5c4983d9994 Mon Sep 17 00:00:00 2001 From: Li1304553726 <1304553726@qq.com> Date: Wed, 19 Nov 2025 16:13:18 +0800 Subject: [PATCH 6/6] 1 --- app/components/news/body/FireNews/fhrx.tsx | 2 +- app/components/news/body/FireNews/fhws.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/news/body/FireNews/fhrx.tsx b/app/components/news/body/FireNews/fhrx.tsx index 6192610..2834797 100644 --- a/app/components/news/body/FireNews/fhrx.tsx +++ b/app/components/news/body/FireNews/fhrx.tsx @@ -4,7 +4,7 @@ import {FireNewsList} from "./FireNewsList"; export function FhrxPage() { return( -
+
{/* 轮播背景图 */}
diff --git a/app/components/news/body/FireNews/fhws.tsx b/app/components/news/body/FireNews/fhws.tsx index 7c04f18..a3f0213 100644 --- a/app/components/news/body/FireNews/fhws.tsx +++ b/app/components/news/body/FireNews/fhws.tsx @@ -4,7 +4,7 @@ import {FireNewsList} from "./FireNewsList"; export function FhwsPage() { return( -
+
{/* 标题部分 */}