diff --git a/app/components/news/body/FireNews/fhrx.tsx b/app/components/news/body/FireNews/Hotline.tsx similarity index 69% rename from app/components/news/body/FireNews/fhrx.tsx rename to app/components/news/body/FireNews/Hotline.tsx index 2834797..8c1e2ff 100644 --- a/app/components/news/body/FireNews/fhrx.tsx +++ b/app/components/news/body/FireNews/Hotline.tsx @@ -2,15 +2,15 @@ import { CarouselDemo } from "@/components/Carousel"; import {FireNewsList} from "./FireNewsList"; -export function FhrxPage() { +export function Hotline() { return( -
-
+
+
{/* 轮播背景图 */} -
+
-
+
diff --git a/app/components/news/body/FireNews/fhyw.tsx b/app/components/news/body/FireNews/ImportantNews.tsx similarity index 94% rename from app/components/news/body/FireNews/fhyw.tsx rename to app/components/news/body/FireNews/ImportantNews.tsx index 0a29978..9feff88 100644 --- a/app/components/news/body/FireNews/fhyw.tsx +++ b/app/components/news/body/FireNews/ImportantNews.tsx @@ -2,7 +2,7 @@ import { CarouselDemo } from "@/components/Carousel"; import {FireNewsList} from "./FireNewsList"; import { CarouselPreset } from "@/components/untils/CarouselPreset"; -export function FhywPage() { +export function ImportantNews() { return(
{/* 轮播背景图 - 确保有明确尺寸 */} diff --git a/app/components/news/body/FireNews/fhjt.tsx b/app/components/news/body/FireNews/LectureHall.tsx similarity index 69% rename from app/components/news/body/FireNews/fhjt.tsx rename to app/components/news/body/FireNews/LectureHall.tsx index 6d380ec..5c530d8 100644 --- a/app/components/news/body/FireNews/fhjt.tsx +++ b/app/components/news/body/FireNews/LectureHall.tsx @@ -2,15 +2,15 @@ import { CarouselDemo } from "@/components/Carousel"; import {FireNewsList} from "./FireNewsList"; -export function FhjtPage() { +export function LectureHall() { return( -
-
+
+
{/* 轮播背景图 */} -
+
-
+
{/* 标题部分 */} diff --git a/app/components/news/body/FireNews/fhws.tsx b/app/components/news/body/FireNews/MicroVision.tsx similarity index 70% rename from app/components/news/body/FireNews/fhws.tsx rename to app/components/news/body/FireNews/MicroVision.tsx index a3f0213..debd79b 100644 --- a/app/components/news/body/FireNews/fhws.tsx +++ b/app/components/news/body/FireNews/MicroVision.tsx @@ -2,9 +2,9 @@ import { CarouselDemo } from "@/components/Carousel"; import {FireNewsList} from "./FireNewsList"; -export function FhwsPage() { +export function MicroVision() { return( -
+
{/* 标题部分 */}
@@ -28,12 +28,12 @@ export function FhwsPage() {
-
+
{/* 轮播背景图 */} -
+
-
+
) diff --git a/app/components/news/body/GrassrootsDynamics.tsx b/app/components/news/body/GrassrootsDynamics.tsx index 79c5d45..6057022 100644 --- a/app/components/news/body/GrassrootsDynamics.tsx +++ b/app/components/news/body/GrassrootsDynamics.tsx @@ -5,9 +5,9 @@ import List from '@/components/news/list/List'; export default function GrassrootsDynamics() { return ( -
-
-
+
+
+
基层动态 {/* 右边列表 */} -
diff --git a/app/components/news/body/ImageGridSection.tsx b/app/components/news/body/ImageGridSection.tsx index 8b92687..40690d9 100644 --- a/app/components/news/body/ImageGridSection.tsx +++ b/app/components/news/body/ImageGridSection.tsx @@ -15,7 +15,8 @@ const LearnPage = () => { ]; return ( -
+
+
{/* 顶部 Logo */}

学习进行时

@@ -69,7 +70,7 @@ const LearnPage = () => {
-
+
{

-
+
{/* 右边容器内容 */} @@ -96,6 +97,13 @@ const LearnPage = () => {
+
+
+
烽火动态
+
+
); }; diff --git a/app/components/news/footer/footer.tsx b/app/components/news/footer/footer.tsx new file mode 100644 index 0000000..d009fb0 --- /dev/null +++ b/app/components/news/footer/footer.tsx @@ -0,0 +1,11 @@ +export function Footer() { + return ( +
+
+ 春风拂面花开满园心情愉悦 +
+
+ ) +} \ No newline at end of file diff --git a/app/components/news/list/NewsList.tsx b/app/components/news/list/NewsList.tsx index 361b0c4..0031a89 100644 --- a/app/components/news/list/NewsList.tsx +++ b/app/components/news/list/NewsList.tsx @@ -28,7 +28,7 @@ const NewsList: React.FC = () => { const educationNews = mockNewsData.filter((news) => news.type === "教育"); return ( -
+
{/* 使用 Flexbox 将两个列表放在一行 */}
{/* 科技新闻 */} diff --git a/app/routes/news.tsx b/app/routes/news.tsx index 58fc702..f1132ef 100755 --- a/app/routes/news.tsx +++ b/app/routes/news.tsx @@ -7,11 +7,12 @@ import {TopNav} from "@/components/news/header/TopNav"; import NewsList from "@/components/news/list/NewsList"; import ImageGridSection from "@/components/news/body/ImageGridSection"; import GrassrootsDynamics from "@/components/news/body/GrassrootsDynamics"; -import { FhywPage } from "@/components/news/body/FireNews/fhyw"; -import { FhjtPage } from "@/components/news/body/FireNews/fhjt"; -import { FhwsPage } from "@/components/news/body/FireNews/fhws"; -import { FhrxPage } from "@/components/news/body/FireNews/fhrx"; +import { ImportantNews } from "@/components/news/body/FireNews/ImportantNews"; +import { LectureHall } from "@/components/news/body/FireNews/LectureHall"; +import { MicroVision } from "@/components/news/body/FireNews/MicroVision"; +import { Hotline } from "@/components/news/body/FireNews/Hotline"; import { AutoCarouselDemo } from "@/components/AutoCarousel"; +import { Footer } from "@/components/news/footer/footer"; export function meta( ) { return [ @@ -26,20 +27,21 @@ export default function Home() {
- +
- - - + + +
+
); }