qiuchenfan
/
news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改lunbotu冲突

This commit is contained in:
qiuchenfan 2025-11-18 17:26:45 +08:00
parent d1e4d1779d
commit 1ea4a91ec6
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/components/Carousel.tsx
View File

@ -1,4 +1,3 @@
// src/components/CarouselDemo.tsx
import * as React from "react"; import * as React from "react";
import Autoplay from "embla-carousel-autoplay"; import Autoplay from "embla-carousel-autoplay";
@ -11,11 +10,7 @@ import {
CarouselPrevious, CarouselPrevious,
type CarouselApi, type CarouselApi,
} from "@/ui/carousel"; } from "@/ui/carousel";
<<<<<<< HEAD:app/components/untils/Carousel.tsx
import FireNewsList from "./FireNewsList";
=======
const imageUrls = [ const imageUrls = [
>>>>>>> 1d49f000efd9f3e6ac13da4e459b8e1e600c3335:app/components/Carousel.tsx
"/images/carousel-1.jpg", "/images/carousel-1.jpg",
"/images/carousel-2.jpg", "/images/carousel-2.jpg",
@ -62,24 +57,12 @@ export function CarouselDemo() {
<CarouselItem key={index}> <CarouselItem key={index}>
<div className="p-1"> <div className="p-1">
<Card> <Card>
<<<<<<< HEAD:app/components/untils/Carousel.tsx
<CardContent className="flex aspect-square items-center justify-center ">
<div
className="w-full h-full"
style={{
backgroundImage: "url('/app/images/header.png')",
backgroundSize: '100% 100%',
}}
>
</div>
=======
<CardContent className="flex aspect-square items-center justify-center p-6"> <CardContent className="flex aspect-square items-center justify-center p-6">
<img <img
src={src} src={src}
alt={`Slide ${index + 1}`} alt={`Slide ${index + 1}`}
className="w-full h-full object-cover" className="w-full h-full object-cover"
/> />
>>>>>>> 1d49f000efd9f3e6ac13da4e459b8e1e600c3335:app/components/Carousel.tsx
</CardContent> </CardContent>
</Card> </Card>
</div> </div>
@ -90,15 +73,6 @@ export function CarouselDemo() {
<CarouselNext className="absolute right-2 top-1/2 -translate-y-1/2 z-10" /> <CarouselNext className="absolute right-2 top-1/2 -translate-y-1/2 z-10" />
</Carousel> </Carousel>
{/* 要闻列表 - 右上角 */}
<div className="absolute top-0 right-0 w-1/3 h-full">
<Card className="h-full">
<CardContent className="h-full p-0">
<FireNewsList />
</CardContent>
</Card>
</div>
{/* 分页指示器 - 右下角 */} {/* 分页指示器 - 右下角 */}
<div className="absolute bottom-4 right-4 flex gap-2 z-10"> <div className="absolute bottom-4 right-4 flex gap-2 z-10">
{Array.from({ length: count }).map((_, index) => ( {Array.from({ length: count }).map((_, index) => (