diff --git a/app/components/Carousel.tsx b/app/components/Carousel.tsx index 0ea29e9..eb036a4 100755 --- a/app/components/Carousel.tsx +++ b/app/components/Carousel.tsx @@ -11,7 +11,11 @@ import { CarouselPrevious, type CarouselApi, } from "@/ui/carousel"; +<<<<<<< HEAD:app/components/untils/Carousel.tsx +import FireNewsList from "./FireNewsList"; +======= const imageUrls = [ +>>>>>>> 1d49f000efd9f3e6ac13da4e459b8e1e600c3335:app/components/Carousel.tsx "/images/carousel-1.jpg", "/images/carousel-2.jpg", @@ -58,12 +62,24 @@ export function CarouselDemo() {
+<<<<<<< HEAD:app/components/untils/Carousel.tsx + +
+
+======= {`Slide +>>>>>>> 1d49f000efd9f3e6ac13da4e459b8e1e600c3335:app/components/Carousel.tsx
@@ -74,6 +90,15 @@ export function CarouselDemo() { + {/* 要闻列表 - 右上角 */} +
+ + + + + +
+ {/* 分页指示器 - 右下角 */}
{Array.from({ length: count }).map((_, index) => ( diff --git a/app/components/FireNewsList.tsx b/app/components/FireNewsList.tsx new file mode 100644 index 0000000..a4712ca --- /dev/null +++ b/app/components/FireNewsList.tsx @@ -0,0 +1,63 @@ +import React from 'react'; + +interface NewsItem { + content: string; +} + +const FireNewsList: React.FC = () => { + const newsItems: NewsItem[] = [ + { + content: "记者从16日召开的海南省政府新闻发布会上获悉,2018年,海南旅游总收入达1,262万人次,支出达399.7亿元...", + }, + { + content: "记者从16日召开的海南省政府新闻发布会上获悉,2018年,海南旅游总收入达1,262万人次,支出达399.7亿元...", + }, + { + content: "记者从16日召开的海南省政府新闻发布会上获悉,2018年,海南旅游总收入达1,262万人次,支出达399.7亿元...", + }, + { + content: "记者从16日召开的海南省政府新闻发布会上获悉,2018年,海南旅游总收入达1,262万人次,支出达399.7亿元...", + }, + { + content: "记者从16日召开的海南省政府新闻发布会上获悉,2018年,海南旅游总收入达1,262万人次,支出达399.7亿元...", + }, + + ]; + + return ( +
+ {/* 标题栏 */} +
+

烽火要闻

+ + 查看更多 {'>'} + +
+ + {/* 新闻列表 */} +
+ {newsItems.map((item, index) => ( +
+ + {/* 内容部分 */} +
+

+ {item.content} + + [MORE] + +

+
+
+ ))} +
+
+ ); +}; + +export default FireNewsList; \ No newline at end of file