From 7a1d887982a784bb1dccd6e3c6903d4bc0ac2666 Mon Sep 17 00:00:00 2001 From: syddl0 <137189866+shroqkf@users.noreply.github.com> Date: Sat, 15 Feb 2025 15:28:59 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Fix:=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artBuyerPage/components/menuMyPage/Auction/index.tsx | 4 ++-- .../artBuyerPage/components/menuMyPage/Payment/index.tsx | 6 ++---- .../authorPage/components/menuMyPage/Auction/index.tsx | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/pages/artBuyerPage/components/menuMyPage/Auction/index.tsx b/src/pages/artBuyerPage/components/menuMyPage/Auction/index.tsx index c399fdf..87249cd 100644 --- a/src/pages/artBuyerPage/components/menuMyPage/Auction/index.tsx +++ b/src/pages/artBuyerPage/components/menuMyPage/Auction/index.tsx @@ -26,7 +26,7 @@ export const ArtBuyerAuction = () => { // status 값을 한글로 변환하는 함수 const getStatusText = (status: string) => { const statusMap: Record = { - BID: '응찰중', + BID: '경매완료', PARTICIPATE: '입찰중', }; return statusMap[status] || status; // 기본적으로 원래 상태값 유지 @@ -55,7 +55,7 @@ export const ArtBuyerAuction = () => { {`₩${auction.bid_price.toLocaleString()}`} {getStatusText(auction.status)} - {auction.status === '입찰중' && ( + {auction.status === 'PARTICIPATE' && ( handleBtnClick(auction.auction_id)} > diff --git a/src/pages/artBuyerPage/components/menuMyPage/Payment/index.tsx b/src/pages/artBuyerPage/components/menuMyPage/Payment/index.tsx index c3b82d8..dd494cd 100644 --- a/src/pages/artBuyerPage/components/menuMyPage/Payment/index.tsx +++ b/src/pages/artBuyerPage/components/menuMyPage/Payment/index.tsx @@ -53,10 +53,8 @@ export const Payment = () => { {getPaymentStatus(payment.payment_status)} - {payment.payment_status === '결제 대기중' && ( - handleBtnClick(payment.auction_id)} - > + {payment.payment_status === 'PENDING' && ( + handleBtnClick(payment.id)}> 결제하기 )} diff --git a/src/pages/authorPage/components/menuMyPage/Auction/index.tsx b/src/pages/authorPage/components/menuMyPage/Auction/index.tsx index f7018db..d95ba56 100644 --- a/src/pages/authorPage/components/menuMyPage/Auction/index.tsx +++ b/src/pages/authorPage/components/menuMyPage/Auction/index.tsx @@ -48,7 +48,7 @@ export const AuthorAuction = () => { {auction.status === 'BID' ? '경매완료' : auction.status === 'PARTICIPATE' - ? '참여중' + ? '입찰중' : auction.status} From 0a205a80093e2c31f6fcb95a908844d24733b9bc Mon Sep 17 00:00:00 2001 From: syddl0 <137189866+shroqkf@users.noreply.github.com> Date: Sat, 15 Feb 2025 15:38:56 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Chore:=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/artBuyerPage/components/menuMyPage/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/artBuyerPage/components/menuMyPage/index.tsx b/src/pages/artBuyerPage/components/menuMyPage/index.tsx index af300cf..4c1aed7 100644 --- a/src/pages/artBuyerPage/components/menuMyPage/index.tsx +++ b/src/pages/artBuyerPage/components/menuMyPage/index.tsx @@ -20,8 +20,8 @@ export const MenuMyPage = ({ setSelectedMenu }: MenuMyPageProps) => { - + ); From 28b962df3a32baed9977dbb66f9feb2d8b05c8eb Mon Sep 17 00:00:00 2001 From: syddl0 <137189866+shroqkf@users.noreply.github.com> Date: Sat, 15 Feb 2025 15:43:21 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Chore:=20=EC=9E=91=ED=92=88=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artBuyerPage/components/purchasedWorks/index.tsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/pages/artBuyerPage/components/purchasedWorks/index.tsx b/src/pages/artBuyerPage/components/purchasedWorks/index.tsx index 744ea2b..dc4cb0b 100644 --- a/src/pages/artBuyerPage/components/purchasedWorks/index.tsx +++ b/src/pages/artBuyerPage/components/purchasedWorks/index.tsx @@ -8,8 +8,15 @@ import { import { Artwork } from '@/components/common/ArtWork'; import { useGetBuyerMypage } from '../../hooks/useGetBuyerMypage'; +import { useNavigate } from 'react-router-dom'; const PurchasedWorks = () => { + const navigate = useNavigate(); + // 작품 클릭 시 작품 상세 페이지로 이동 + const handleArtworkClick = (artworkId: number) => { + navigate(`/artwork/${artworkId}`); + }; + const { userMypageData } = useGetBuyerMypage(); const artworks = userMypageData.myCollection.artworks; @@ -30,6 +37,7 @@ const PurchasedWorks = () => { artworkWidth={artwork.width} artworkHeight={artwork.height} artworkId={artwork.id} + onClick={() => handleArtworkClick(artwork.id)} /> ))}