From f1cb856d66b72516ae8f10e89abfa81dadfeba19 Mon Sep 17 00:00:00 2001
From: Li1304553726 <1304553726@qq.com>
Date: Wed, 19 Nov 2025 22:03:10 +0800
Subject: [PATCH 1/3] 1

---
 .../news/body/FireNews/{fhrx.tsx => Hotline.tsx} | 10 +++++-----
 .../FireNews/{fhyw.tsx => ImportantNews.tsx}     |  2 +-
 .../body/FireNews/{fhjt.tsx => LectureHall.tsx}  | 10 +++++-----
 .../body/FireNews/{fhws.tsx => MicroVision.tsx}  | 10 +++++-----
 app/components/news/body/GrassrootsDynamics.tsx  |  8 ++++----
 app/components/news/body/ImageGridSection.tsx    |  8 ++++----
 app/components/news/list/NewsList.tsx            |  2 +-
 app/routes/news.tsx                              | 16 ++++++++--------
 8 files changed, 33 insertions(+), 33 deletions(-)
 rename app/components/news/body/FireNews/{fhrx.tsx => Hotline.tsx} (69%)
 rename app/components/news/body/FireNews/{fhyw.tsx => ImportantNews.tsx} (93%)
 rename app/components/news/body/FireNews/{fhjt.tsx => LectureHall.tsx} (69%)
 rename app/components/news/body/FireNews/{fhws.tsx => MicroVision.tsx} (70%)

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(
-    <div className=" w-full overflow-hidden flex justify-center h-148 mb-10">
-        <div className="relative">
+    <div className=" w-5/6 overflow-hidden flex justify-center h-148 mb-10 mx-auto">
+        <div className="relative left-0 top-0 w-full h-full">
 			{/* 轮播背景图 */}
-			<div className="w-200 absolute"  style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
+			<div className="w-full absolute"  style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
 				<CarouselDemo />
 			</div>
-			<div className='w-200 bg-white h-full'></div>
+			<div className='top-0 right-0 bg-white h-full'></div>
 		</div>
         
         <div className="w-120 h-full bg-white relative">
diff --git a/app/components/news/body/FireNews/fhyw.tsx b/app/components/news/body/FireNews/ImportantNews.tsx
similarity index 93%
rename from app/components/news/body/FireNews/fhyw.tsx
rename to app/components/news/body/FireNews/ImportantNews.tsx
index 331a4fc..e47b2b3 100644
--- a/app/components/news/body/FireNews/fhyw.tsx
+++ b/app/components/news/body/FireNews/ImportantNews.tsx
@@ -1,7 +1,7 @@
 import { CarouselDemo } from "@/components/Carousel";
 import {FireNewsList} from "./FireNewsList";
 
-export function FhywPage() {
+export function ImportantNews() {
     return(
     <div className="relative w-5/6 h-225 mx-auto overflow-hidden ">
         {/* 轮播背景图 - 确保有明确尺寸 */}
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(
-    <div className=" w-full overflow-hidden flex justify-center h-148 mb-10">
-        <div className="relative">
+    <div className="w-5/6 overflow-hidden flex justify-center h-148 mb-10 mx-auto">
+        <div className="relative left-0 top-0 w-full h-full">
 			{/* 轮播背景图 */}
-			<div className="w-200 absolute"  style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
+			<div className="w-full absolute"  style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
 				<CarouselDemo />
 			</div>
-			<div className='w-200 bg-white h-full'></div>
+			<div className='top-0 right-0 bg-white h-full'></div>
 		</div>
         <div className="w-120 h-full bg-white relative">
 			{/* 标题部分 */}
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(
-    <div className=" w-full overflow-hidden flex justify-center h-148 mb-10">
+    <div className=" w-5/6 overflow-hidden flex justify-center h-148 mb-10 mx-auto">
         <div className="w-120 h-full bg-white relative" >
 			{/* 标题部分 */}
 			<div className="relative pt-6 pl-8">
@@ -28,12 +28,12 @@ export function FhwsPage() {
 				</div>
 			</div>
 		</div>
-        <div className="relative">
+        <div className="relative w-full h-full">
 			{/* 轮播背景图 */}
-			<div className="w-200 absolute" style={{clipPath: 'polygon(150px 0, 100% 0, calc(100% - 0px) 100%, 30px 100%)'}} >
+			<div className="w-full absolute" style={{clipPath: 'polygon(150px 0, 100% 0, calc(100% - 0px) 100%, 30px 100%)'}} >
 				<CarouselDemo />
 			</div>
-			<div className='w-200 bg-white h-full'></div>
+			<div className='w-full bg-white h-full'></div>
 		</div>
     </div>
     )
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 (
-    <div className="flex  rounded-2xl  mx-auto w-4/5 h-140  pt-20 mb-20 ">
-      <div className="w-2/5 p-6 flex flex-col items-center justify-center relative">
-        <div className="w-140  ">
+    <div className="flex  rounded-2xl  mx-auto w-5/6 h-140  pt-20 mb-20 ">
+      <div className="w-full flex items-center justify-center relative">
+        <div className="w-full  ">
           <img
             src="/images/carousel-1.jpg"
             alt="基层动态"
@@ -17,7 +17,7 @@ export default function GrassrootsDynamics() {
       </div>
 
       {/* 右边列表 */}
-      <div className="w-3/5 p-6 flex flex-col bg-[#0e93df]  rounded-2xl h-130
+      <div className="w-full p-6 flex flex-col bg-[#0e93df]  rounded-2xl h-130
       ">
         <List />
       </div>
diff --git a/app/components/news/body/ImageGridSection.tsx b/app/components/news/body/ImageGridSection.tsx
index 8b92687..b9c79b2 100644
--- a/app/components/news/body/ImageGridSection.tsx
+++ b/app/components/news/body/ImageGridSection.tsx
@@ -15,7 +15,7 @@ const LearnPage = () => {
     ];
 
     return (
-        <div className="w-4/5 mx-auto px-4 py-6">
+        <div className="w-5/6 mx-auto px-4 py-6">
             {/* 顶部 Logo */}
             <div className="flex justify-start mb-4">
                 <h1 className="text-3xl font-bold text-red-600">学习进行时</h1>
@@ -69,7 +69,7 @@ const LearnPage = () => {
                     </ul>
                 </div>
                 </div>
-                <div className="w-[1514px] h-[285px]    flex relative">
+                <div className="w-[1560px] h-[285px]    flex relative">
 				<div className="w-[750px] h-[188px] left-0 mt-25 absolute" style={{ backgroundColor: '#DEDEDC' }}>
 					<div
 						className="w-[169px] h-[240px]  absolute left-0 bottom-0 bg-cover bg-center"
@@ -84,9 +84,9 @@ const LearnPage = () => {
 						</p>
 					</div>
 				</div>
-				<div className="w-[700px] h-[188px] mt-25 right-0 absolute" style={{ backgroundColor: '#DEDEDC' }}>
+				<div className="w-[750px] h-[188px] mt-25 right-0 absolute" style={{ backgroundColor: '#DEDEDC' }}>
 					<div
-						className="w-[140px] h-[240px] absolute left-0 bottom-0 bg-cover bg-center "
+						className="w-[169px] h-[240px] absolute left-0 bottom-0 bg-cover bg-center "
 						style={{ backgroundImage: "url('/public/images/book2.png')"}}
 					></div>
 					{/* 右边容器内容 */}
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 (
-    <div className=" p-18  rounded-2xl  w-4/5 mx-auto">
+    <div className=" p-18  rounded-2xl w-10/11 mx-auto">
       {/* 使用 Flexbox 将两个列表放在一行 */}
       <div className="flex gap-8">
         {/* 科技新闻 */}
diff --git a/app/routes/news.tsx b/app/routes/news.tsx
index 58fc702..8b64b0f 100755
--- a/app/routes/news.tsx
+++ b/app/routes/news.tsx
@@ -7,10 +7,10 @@ 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";
 
 export function meta( ) {
@@ -26,16 +26,16 @@ export default function Home() {
     <div>
       <Header />
       <TopNav />
-      <FhywPage />
+      <ImportantNews />
       <NewsList />
       <ImageGridSection />
       <div
         style={{backgroundImage: "url('/public/images/jcdt.png')"}}
       >
         <GrassrootsDynamics />
-        <FhjtPage/>
-        <FhwsPage/>
-        <FhrxPage />  
+        <LectureHall />
+        <MicroVision />
+        <Hotline />  
         <AutoCarouselDemo />
         <CultureBgPage />
         <Integrated />

From 3fd05e9bebdd60c75c93b3b7a7f97af38acb1555 Mon Sep 17 00:00:00 2001
From: Li1304553726 <1304553726@qq.com>
Date: Wed, 19 Nov 2025 22:08:03 +0800
Subject: [PATCH 2/3] 1

---
 app/components/news/body/ImageGridSection.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/components/news/body/ImageGridSection.tsx b/app/components/news/body/ImageGridSection.tsx
index b9c79b2..c2259d7 100644
--- a/app/components/news/body/ImageGridSection.tsx
+++ b/app/components/news/body/ImageGridSection.tsx
@@ -15,7 +15,7 @@ const LearnPage = () => {
     ];
 
     return (
-        <div className="w-5/6 mx-auto px-4 py-6">
+        <div className="w-5/6 mx-auto ">
             {/* 顶部 Logo */}
             <div className="flex justify-start mb-4">
                 <h1 className="text-3xl font-bold text-red-600">学习进行时</h1>
@@ -69,7 +69,7 @@ const LearnPage = () => {
                     </ul>
                 </div>
                 </div>
-                <div className="w-[1560px] h-[285px]    flex relative">
+                <div className="w-[1590px] h-[285px]    flex relative mb-10">
 				<div className="w-[750px] h-[188px] left-0 mt-25 absolute" style={{ backgroundColor: '#DEDEDC' }}>
 					<div
 						className="w-[169px] h-[240px]  absolute left-0 bottom-0 bg-cover bg-center"

From 33d1bd55d41c381d32745086c30c77719d447fe3 Mon Sep 17 00:00:00 2001
From: Li1304553726 <1304553726@qq.com>
Date: Wed, 19 Nov 2025 22:26:14 +0800
Subject: [PATCH 3/3] 1

---
 app/components/news/body/ImageGridSection.tsx | 12 ++++++++++--
 app/components/news/footer/footer.tsx         | 11 +++++++++++
 app/routes/news.tsx                           |  2 ++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 app/components/news/footer/footer.tsx

diff --git a/app/components/news/body/ImageGridSection.tsx b/app/components/news/body/ImageGridSection.tsx
index c2259d7..40690d9 100644
--- a/app/components/news/body/ImageGridSection.tsx
+++ b/app/components/news/body/ImageGridSection.tsx
@@ -15,7 +15,8 @@ const LearnPage = () => {
     ];
 
     return (
-        <div className="w-5/6 mx-auto ">
+        <div>
+            <div className="w-5/6 mx-auto ">
             {/* 顶部 Logo */}
             <div className="flex justify-start mb-4">
                 <h1 className="text-3xl font-bold text-red-600">学习进行时</h1>
@@ -69,7 +70,7 @@ const LearnPage = () => {
                     </ul>
                 </div>
                 </div>
-                <div className="w-[1590px] h-[285px]    flex relative mb-10">
+            <div className="w-[1590px] h-[285px]    flex relative mb-10">
 				<div className="w-[750px] h-[188px] left-0 mt-25 absolute" style={{ backgroundColor: '#DEDEDC' }}>
 					<div
 						className="w-[169px] h-[240px]  absolute left-0 bottom-0 bg-cover bg-center"
@@ -96,6 +97,13 @@ const LearnPage = () => {
 				</div>			                        
           </div>  
         </div>
+        <div className='flex'>
+            <div className='w-5/6 bg-[#0082e9] h-20' 
+                style={{clipPath: 'polygon(0 0, calc(100% - 150px) 0%, calc(100% - 20px) 100%, 0% 100%)'}}
+            ></div>
+            <div className='items-center justify-center flex font-bold text-sky-900 text-5xl'>烽火动态</div>
+        </div>
+    </div>
     );
 };
 
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 (
+        <div className='w-full h-190 bg-[#0082e9] flex items-center justify-center'
+            style={{backgroundImage: "url('/public/images/carousel-4.jpg')"}}
+        >
+            <div className='text-white text-2xl'>
+                春风拂面花开满园心情愉悦
+            </div>
+        </div>
+    )
+}
\ No newline at end of file
diff --git a/app/routes/news.tsx b/app/routes/news.tsx
index 8b64b0f..f1132ef 100755
--- a/app/routes/news.tsx
+++ b/app/routes/news.tsx
@@ -12,6 +12,7 @@ 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 [
@@ -40,6 +41,7 @@ export default function Home() {
         <CultureBgPage />
         <Integrated />
       </div>
+      <Footer />
     </div>
   );
 }