From 2f8c4f50119833d8f0d7935b257bcfc7846e7ae1 Mon Sep 17 00:00:00 2001
From: Li1304553726 <1304553726@qq.com>
Date: Thu, 20 Nov 2025 08:08:29 +0800
Subject: [PATCH 1/2] 1

---
 app/components/news/body/FireNews/Hotline.tsx       | 5 ++++-
 app/components/news/body/FireNews/ImportantNews.tsx | 5 ++++-
 app/components/news/body/FireNews/LectureHall.tsx   | 5 ++++-
 app/components/news/body/FireNews/MicroVision.tsx   | 5 ++++-
 app/components/news/body/ImageGridSection.tsx       | 5 ++++-
 app/routes/news.tsx                                 | 3 ++-
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/components/news/body/FireNews/Hotline.tsx b/app/components/news/body/FireNews/Hotline.tsx
index 8c1e2ff..220905c 100644
--- a/app/components/news/body/FireNews/Hotline.tsx
+++ b/app/components/news/body/FireNews/Hotline.tsx
@@ -8,7 +8,10 @@ export function Hotline() {
         <div className="relative left-0 top-0 w-full h-full">
 			{/* 轮播背景图 */}
 			<div className="w-full absolute"  style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
-				<CarouselDemo />
+				<CarouselDemo 
+						paginationPosition="left"
+						paginationStyle="dot"
+				/>
 			</div>
 			<div className='top-0 right-0 bg-white h-full'></div>
 		</div>
diff --git a/app/components/news/body/FireNews/ImportantNews.tsx b/app/components/news/body/FireNews/ImportantNews.tsx
index 9feff88..ae2d2d7 100644
--- a/app/components/news/body/FireNews/ImportantNews.tsx
+++ b/app/components/news/body/FireNews/ImportantNews.tsx
@@ -7,7 +7,10 @@ export function ImportantNews() {
     <div className="relative w-5/6 h-225 mx-auto overflow-hidden ">
         {/* 轮播背景图 - 确保有明确尺寸 */}
         <div className="absolute top-0 left-0 w-full h-225">
-            <CarouselDemo />
+            <CarouselDemo 
+                paginationPosition="left"
+                paginationStyle="dot"
+            />
         </div>
         
         {/* 固定的烽火要闻 */}
diff --git a/app/components/news/body/FireNews/LectureHall.tsx b/app/components/news/body/FireNews/LectureHall.tsx
index 5c530d8..437bc68 100644
--- a/app/components/news/body/FireNews/LectureHall.tsx
+++ b/app/components/news/body/FireNews/LectureHall.tsx
@@ -8,7 +8,10 @@ export function LectureHall() {
         <div className="relative left-0 top-0 w-full h-full">
 			{/* 轮播背景图 */}
 			<div className="w-full absolute"  style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
-				<CarouselDemo />
+				<CarouselDemo 
+						paginationPosition="left"
+						paginationStyle="dot"
+				/>
 			</div>
 			<div className='top-0 right-0 bg-white h-full'></div>
 		</div>
diff --git a/app/components/news/body/FireNews/MicroVision.tsx b/app/components/news/body/FireNews/MicroVision.tsx
index debd79b..2c78de9 100644
--- a/app/components/news/body/FireNews/MicroVision.tsx
+++ b/app/components/news/body/FireNews/MicroVision.tsx
@@ -31,7 +31,10 @@ export function MicroVision() {
         <div className="relative w-full h-full">
 			{/* 轮播背景图 */}
 			<div className="w-full absolute" style={{clipPath: 'polygon(150px 0, 100% 0, calc(100% - 0px) 100%, 30px 100%)'}} >
-				<CarouselDemo />
+				<CarouselDemo 
+						paginationPosition="right"
+						paginationStyle="dot"
+				/>
 			</div>
 			<div className='w-full bg-white h-full'></div>
 		</div>
diff --git a/app/components/news/body/ImageGridSection.tsx b/app/components/news/body/ImageGridSection.tsx
index 6ba4265..a3f8d51 100644
--- a/app/components/news/body/ImageGridSection.tsx
+++ b/app/components/news/body/ImageGridSection.tsx
@@ -38,7 +38,10 @@ const LearnPage = () => {
 
                         {/* 上右：轮播图 */}
                         <div className="col-span-2 row-span-1 rounded-lg shadow-sm overflow-hidden">
-                            <CarouselDemo />
+                            <CarouselDemo 
+                                paginationPosition="right"
+                                paginationStyle="bar"
+                            />
                         </div>
 
                         {/* 下三图 */}
diff --git a/app/routes/news.tsx b/app/routes/news.tsx
index 88ec529..c5de7be 100755
--- a/app/routes/news.tsx
+++ b/app/routes/news.tsx
@@ -13,6 +13,8 @@ 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";
+import { CarouselDemo } from "@/components/Carousel";
+
 
 export function meta( ) {
   return [
@@ -40,7 +42,6 @@ export default function Home() {
         <AutoCarouselDemo />
         <CultureBgPage />
         <Integrated />
-        <CarouselDemo />
       </div>
       <Footer />
     </div>

From c14daff3c048d7b97f1a2e62ab201d234aaf0e77 Mon Sep 17 00:00:00 2001
From: Li1304553726 <1304553726@qq.com>
Date: Thu, 20 Nov 2025 08:12:13 +0800
Subject: [PATCH 2/2] 1

---
 app/components/news/body/FireNews/Hotline.tsx       | 2 +-
 app/components/news/body/FireNews/ImportantNews.tsx | 2 +-
 app/components/news/body/FireNews/LectureHall.tsx   | 2 +-
 app/components/news/body/FireNews/MicroVision.tsx   | 2 +-
 app/components/news/footer/footer.tsx               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/components/news/body/FireNews/Hotline.tsx b/app/components/news/body/FireNews/Hotline.tsx
index 220905c..1c8c46f 100644
--- a/app/components/news/body/FireNews/Hotline.tsx
+++ b/app/components/news/body/FireNews/Hotline.tsx
@@ -7,7 +7,7 @@ export function Hotline() {
     <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-full absolute"  style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
+			<div className="w-full h-full absolute"  style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
 				<CarouselDemo 
 						paginationPosition="left"
 						paginationStyle="dot"
diff --git a/app/components/news/body/FireNews/ImportantNews.tsx b/app/components/news/body/FireNews/ImportantNews.tsx
index ae2d2d7..6403c63 100644
--- a/app/components/news/body/FireNews/ImportantNews.tsx
+++ b/app/components/news/body/FireNews/ImportantNews.tsx
@@ -6,7 +6,7 @@ export function ImportantNews() {
     return(
     <div className="relative w-5/6 h-225 mx-auto overflow-hidden ">
         {/* 轮播背景图 - 确保有明确尺寸 */}
-        <div className="absolute top-0 left-0 w-full h-225">
+        <div className="absolute top-0 left-0 w-full h-full">
             <CarouselDemo 
                 paginationPosition="left"
                 paginationStyle="dot"
diff --git a/app/components/news/body/FireNews/LectureHall.tsx b/app/components/news/body/FireNews/LectureHall.tsx
index 437bc68..f9ae809 100644
--- a/app/components/news/body/FireNews/LectureHall.tsx
+++ b/app/components/news/body/FireNews/LectureHall.tsx
@@ -7,7 +7,7 @@ export function LectureHall() {
     <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-full absolute"  style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
+			<div className="w-full h-full absolute"  style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
 				<CarouselDemo 
 						paginationPosition="left"
 						paginationStyle="dot"
diff --git a/app/components/news/body/FireNews/MicroVision.tsx b/app/components/news/body/FireNews/MicroVision.tsx
index 2c78de9..ed5eb87 100644
--- a/app/components/news/body/FireNews/MicroVision.tsx
+++ b/app/components/news/body/FireNews/MicroVision.tsx
@@ -30,7 +30,7 @@ export function MicroVision() {
 		</div>
         <div className="relative w-full h-full">
 			{/* 轮播背景图 */}
-			<div className="w-full absolute" style={{clipPath: 'polygon(150px 0, 100% 0, calc(100% - 0px) 100%, 30px 100%)'}} >
+			<div className="w-full h-full absolute" style={{clipPath: 'polygon(150px 0, 100% 0, calc(100% - 0px) 100%, 30px 100%)'}} >
 				<CarouselDemo 
 						paginationPosition="right"
 						paginationStyle="dot"
diff --git a/app/components/news/footer/footer.tsx b/app/components/news/footer/footer.tsx
index d009fb0..5358b64 100644
--- a/app/components/news/footer/footer.tsx
+++ b/app/components/news/footer/footer.tsx
@@ -1,7 +1,7 @@
 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')"}}
+            style={{}}
         >
             <div className='text-white text-2xl'>
                 春风拂面花开满园心情愉悦