Merge branch 'main' of http://113.45.67.59:3003/qiuchenfan/news

app/components/news/body/FireNews/FireNewsList.tsx

@@ -57,7 +57,7 @@ export function FireNewsList() {
   return (
     <div>
 				{/* 文章列表 */}
-				<div className=" bg-[rgba(0,0,0,0.51)] shadow-lg ml-4 mr-2 p-1 absolute right-0 ">
+			<div className=" bg-[rgba(0,0,0,0.51)] shadow-lg h-full top-0 absolute right-0 ">
 				{/* 标题栏 */}
 				<div className="flex justify-between items-center mb-6  border-b-3 border-white">
 					<h2 className="text-white text-3xl font-bold ml-6 mt-2 mb-2">烽火要闻</h2>
@@ -71,7 +71,7 @@ export function FireNewsList() {
 				{/* 文章列表 */}
 				<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 key={index} className="flex items-center space-x-3 pb-1">
 							{/* 左侧竖线和日期 */}
 							<div className="flex items-center space-x-3">
 								<div className="w-1 h-13 bg-white ml-3"></div>

app/components/news/body/FireNews/fhyw.tsx

@@ -3,14 +3,14 @@ import {FireNewsList} from "./FireNewsList";
 
 export function FhywPage() {
     return(
-    <div className="relative w-350 h-225 mx-auto overflow-hidden bg-sky-700">
+    <div className="relative w-5/6 h-225 mx-auto overflow-hidden ">
         {/* 轮播背景图 - 确保有明确尺寸 */}
-        <div className="absolute top-0 left-0 w-full h-200">
+        <div className="absolute top-0 left-0 w-full h-225">
             <CarouselDemo />
         </div>
         
         {/* 固定的烽火要闻 */}
-        <div className="absolute top-0 right-0 w-1/3 h-200 p-1">
+        <div className="absolute top-0 right-0 w-1/3 h-225 p-1">
             <FireNewsList />
         </div>
     </div>

app/components/news/header/TopNav.tsx

@@ -45,7 +45,7 @@ export function TopNav({
 
   return (
     // 将组件宽度调整为1514px，并保持居中
-    <div className="h-20 w-[1514px] mx-auto flex items-center px-8 bg-white border-t-16 border-b-16 border-[#1f79bf]">
+    <div className="h-20 w-5/6 mx-auto flex items-center px-8 bg-white border-t-16 border-b-16 border-[#1f79bf]">
       {/* 搜索框与导航菜单组合 */}
       <div className="flex items-center justify-start w-full gap-5">
         {/* 搜索框 */}