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

app/components/Carousel.tsx

@@ -87,27 +87,29 @@ export function CarouselDemo({
           }),
         ]}
         setApi={setApi} // 将 Embla 实例保存到 state 中
-        className="w-full h-full" // 占满容器
+        className="w-full" // 占满容器
       >
         {/* 轮播内容区域 */}
-        <CarouselContent className="h-full w-full -ml-0">
+        <CarouselContent className=" w-full -ml-0">
           {/* 遍历图片数组，为每张图创建一个轮播项 */}
           {imageUrls.map((src, index) => (
             <CarouselItem
               key={index}
-              className="w-full h-full pl-0" // 移除默认内边距
+              className="w-full  pl-0" // 移除默认内边距
             >
               {/* 内部包裹层：无内边距，占满 */}
-              <div className="p-0 w-full h-full">
+              <div className="p-0 w-full">
                 {/* 使用 CardContent 包裹图片，移除默认间距 */}
-                <CardContent className="flex items-center justify-center p-0 w-full h-full m-0">
+                <CardContent className=" p-0 w-full  m-0">
                   {/* 图片元素：自动填充容器，保持比例裁剪 */}
-                  <img
+                  <div className="relative w-full aspect-video"> {/* 可选：设置固定宽高比 */}
-                    src={src}
+                    <img
-                    alt={`Slide ${index + 1}`} // 无障碍访问描述
+                      src={src}
-                    className="w-full h-full object-fill" // 关键：使图片覆盖整个区域
+                      alt={`Slide ${index + 1}`} // 无障碍访问描述
-                    loading="lazy" // 懒加载优化性能
+                      className="absolute inset-0 w-full h-full object-fill" // 使用 object-fill 拉伸填充
-                  />
+                      loading="lazy" // 懒加载优化性能
+                    />
+                  </div>
                 </CardContent>
               </div>
             </CarouselItem>

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

@@ -31,7 +31,7 @@ export function ImportantNews() {
     }));
 
     return(
-    <div className="relative w-5/6 h-225 mx-auto overflow-hidden ">
+    <div className="relative w-5/6 h-220 mx-auto overflow-hidden ">
         {/* 轮播背景图 - 确保有明确尺寸 */}
         <div className="absolute top-0 left-0 w-full h-full">
             <CarouselDemo 
@@ -41,7 +41,7 @@ export function ImportantNews() {
         </div>
         
         {/* 固定的烽火要闻 */}
-        <div className="absolute top-0 right-0 w-1/3 h-225 p-1">
+        <div className="absolute top-0 right-0 w-1/3 h-220 p-1">
             <FireNewsList />
         </div>
     </div>

app/components/news/header/TopNav.tsx

@@ -1,5 +1,5 @@
 import { Search } from 'lucide-react';
-import React, { useState,useEffect} from 'react';
+import React, { useState, useEffect } from 'react';
 import { Button } from '@/ui/button';
 interface MenuItem {
   label: string;
@@ -25,7 +25,7 @@ export function TopNav({
   activeKey: externalActiveKey,
   onSearch,
   onItemClick,
-}: TopNavProps){
+}: TopNavProps) {
   const [internalActiveKey, setInternalActiveKey] = useState('home');
   const currentActiveKey = externalActiveKey !== undefined ? externalActiveKey : internalActiveKey;
   const [searchKeyword, setSearchKeyword] = useState('');
@@ -52,21 +52,21 @@ export function TopNav({
 
         <div className="relative overflow-hidden bg-gray-100 ">
           <Button variant="default" className="absolute rounded-none right-0 top-1/2 transform -translate-y-1/2 bg-[#1f79bf] hover:bg-[#1a68a0] text-white border-0 "
-                 onClick={handleSearchSubmit}
+            onClick={handleSearchSubmit}
 
-                 >
+          >
             <Search className="w-5 h-5" />
           </Button>
 
           <input type="text"
-                 placeholder='请输入关键词'
+            placeholder='请输入关键词'
-                 value={searchKeyword}
+            value={searchKeyword}
-                 onChange={(e) => setSearchKeyword(e.target.value)}
+            onChange={(e) => setSearchKeyword(e.target.value)}
-                className="pl-5 pr-4 py-2 text-sm h-full border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent w-64 transition-all duration-200 hover:shadow-sm" />
+            className="pl-5 pr-4 py-2 text-sm h-full border border-gray-300 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent w-64 transition-all duration-200 hover:shadow-sm" />
         </div>
 
 
-          {/* 导航菜单 */}
+        {/* 导航菜单 */}
         <ul className="flex space-x-20 relative">
           {menuItems.map((item) => {
             const isActive = currentActiveKey === item.key;
@@ -74,9 +74,8 @@ export function TopNav({
               <li key={item.key} className="relative">
                 <button
                   onClick={() => handleItemClick(item)}
-                  className={`px-4 py-2 text-2xl font-extralight transition-all duration-500 relative z-10 ${
+                  className={`px-4 py-2 text-2xl transition-all duration-500 relative z-10 ${isActive ? 'text-white font-bold' : 'text-gray-600 hover:font-bold cursor-pointer'
-                    isActive ? 'text-white' : 'text-gray-600 hover:font-bold'
+                    }`}
-                  }`}
                 >
                   {/* 激活状态背景层 */}
                   {isActive && (