From 4f288aa535ff708b25047c480c7c80ed7f8b4206 Mon Sep 17 00:00:00 2001
From: Li1304553726 <1304553726@qq.com>
Date: Wed, 19 Nov 2025 11:05:26 +0800
Subject: [PATCH] 1

---
 .../news/body/FireNews/FireNewsList.tsx       | 11 +++++-----
 app/components/news/body/FireNews/fhjt.tsx    | 20 ++++++++-----------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/components/news/body/FireNews/FireNewsList.tsx b/app/components/news/body/FireNews/FireNewsList.tsx
index e9b7109..5c29c71 100644
--- a/app/components/news/body/FireNews/FireNewsList.tsx
+++ b/app/components/news/body/FireNews/FireNewsList.tsx
@@ -57,25 +57,24 @@ export function FireNewsList() {
   return (
     <div>
 				{/* 文章列表 */}
-				<div className=" bg-[rgba(0,0,0,0.5)] shadow-lg ml-4 mr-2 p-1 absolute right-0 ">
+				<div className=" bg-[rgba(0,0,0,0.51)] shadow-lg ml-4 mr-2 p-1 absolute right-0 ">
 				{/* 标题栏 */}
 				<div className="flex justify-between items-center mb-6  border-b-3 border-white">
-					<h2 className="text-white text-3xl font-extrabold ml-6 mt-2 mb-2">烽火要闻</h2>
+					<h2 className="text-white text-3xl font-bold ml-6 mt-2 mb-2">烽火要闻</h2>
 					<button className="">
 						<a href="#" className="text-white text-sm flex items-center mt-2 hover:text-blue-500">
 							查看更多
-							<span className="ml-1 w-0 h-0 border-l-6 border-l-red-500 border-t-6 border-t-transparent border-r-6 border-r-transparent border-b-6 border-b-transparent"></span>
 						</a>
 					</button>
 				</div>
 
 				{/* 文章列表 */}
-				<div className="space-y-1  h-[750px] overflow-hidden hover:overflow-auto scroll-container">
+				<div className="space-y-1  h-200 overflow-hidden hover:overflow-auto scroll-container">
 					{articles.map((article, index) => (
 						<div key={index} className="flex items-center space-x-3 pb-4">
 							{/* 左侧竖线和日期 */}
 							<div className="flex items-center space-x-3">
-								<div className="w-[0.7px] h-13 bg-white ml-3"></div>
+								<div className="w-1 h-13 bg-white ml-3"></div>
 								<div className="text-center">
 									<div className="text-white text-3xl font-bold">{article.date.month}</div>
 									<div className="text-gray-300 text-sm">{article.date.day}</div>
@@ -83,7 +82,7 @@ export function FireNewsList() {
 							</div>
 							{/* 右侧文章内容 */}
 							<div className="flex-1">
-								<p className="text-[13px]  text-white ">
+								<p className="  text-white ">
 									{article.title}
 									<a href="#" className="text-red-600 text-sm hover:font-bold">
 										【MORE】
diff --git a/app/components/news/body/FireNews/fhjt.tsx b/app/components/news/body/FireNews/fhjt.tsx
index 057fd69..0a2c55a 100644
--- a/app/components/news/body/FireNews/fhjt.tsx
+++ b/app/components/news/body/FireNews/fhjt.tsx
@@ -1,22 +1,18 @@
-<<<<<<< HEAD:app/components/FireNews/fhjt.tsx
-import { CarouselDemo } from "../Carousel";
-
-=======
 import { CarouselDemo } from "@/components/Carousel";
 import {FireNewsList} from "./FireNewsList";
->>>>>>> 3d40e0842bfbc0f98f28bff855cbd548b078cc8f:app/components/news/body/FireNews/fhjt.tsx
 
 
 export function FhjtPage() {
     return(
     <div className=" w-full overflow-hidden flex justify-center h-200">
-        {/* 轮播背景图 */}
-        <div className="w-200" style={{clipPath: 'polygon(0 0, calc(100% - 150px)-0.9%, calc(100% - 30px) 100%, 0 100%)',}}>
-            <CarouselDemo />
-        </div>
-		{/* 白色遮罩层 - 覆盖被裁剪的部分 */}
-
-        <div className="w-100 h-full bg-white relative" style={{}}>
+        <div className="relative">
+			{/* 轮播背景图 */}
+			<div className="w-200 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>
+        <div className="w-100 h-full bg-white relative">
 			{/* 标题部分 */}
 			<div className="relative pt-6 pr-8">
 				<h2 className="text-right text-4xl font-bold text-[#005d93] mb-2">烽火讲堂</h2>