From 59c7675be2de33bc08ddfde6c4ddcc80c65f22f2 Mon Sep 17 00:00:00 2001 From: imddoy Date: Sun, 15 Dec 2024 20:10:23 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EC=98=88=EB=A7=A4=ED=99=95=EC=9D=B8?= =?UTF-8?q?=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=98=88=EB=A7=A4=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=20=EC=9B=8C=EB=94=A9=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants/bookingStatus.ts | 6 +++--- src/pages/cancel/Cancel.styled.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/constants/bookingStatus.ts b/src/constants/bookingStatus.ts index e1dcf9a6..18561617 100644 --- a/src/constants/bookingStatus.ts +++ b/src/constants/bookingStatus.ts @@ -1,9 +1,9 @@ export const bookingStatusText = { - CHECKING_PAYMENT: "입금 확인 예정", + CHECKING_PAYMENT: "입금 확인 중", BOOKING_CONFIRMED: "입금 완료", BOOKING_CANCELLED: "취소 완료", - BOOKING_DELETED: "예매 삭제", - REFUND_REQUESTED: "취소 요청", + BOOKING_DELETED: "취소 완료", + REFUND_REQUESTED: "환불 요청", }; export type bookingStatusTypes = keyof typeof bookingStatusText; diff --git a/src/pages/cancel/Cancel.styled.ts b/src/pages/cancel/Cancel.styled.ts index 052c83b8..ad534b84 100644 --- a/src/pages/cancel/Cancel.styled.ts +++ b/src/pages/cancel/Cancel.styled.ts @@ -5,7 +5,7 @@ export const CancelLayout = styled.main` display: flex; flex-direction: column; width: 100%; - padding: 1.6rem 2.4rem; + padding: 1.6rem 2.4rem calc(1.6rem + 5.6rem + 1.2rem); `; export const PerformWrapper = styled.section` From 3c729e65d391a87d3e12f53d8987c97fc5e9e005 Mon Sep 17 00:00:00 2001 From: imddoy Date: Sun, 15 Dec 2024 20:43:59 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EC=BA=94=EC=8A=AC=20=EC=BA=90?= =?UTF-8?q?=EC=8B=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=95=8C=EB=A7=9E?= =?UTF-8?q?=EA=B2=8C=20=EA=B0=80=EC=A0=B8=EC=98=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/cancel/Cancel.tsx | 6 +----- src/pages/lookup/Lookup.tsx | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/pages/cancel/Cancel.tsx b/src/pages/cancel/Cancel.tsx index 7801dd14..f5707daa 100644 --- a/src/pages/cancel/Cancel.tsx +++ b/src/pages/cancel/Cancel.tsx @@ -22,11 +22,7 @@ const Cancel = () => { const { setHeader } = useHeader(); const { openAlert } = useModal(); const { state } = useLocation(); - const { confirmCancelAction } = useCancelBooking( - state?.bookerName, - state?.number, - state?.password - ); + const { confirmCancelAction } = useCancelBooking(state?.name, state?.phone, state?.password); const navigate = useNavigate(); const [isDeposit, setIsDeposit] = useState(null); const [bankOpen, setBankOpen] = useState(false); diff --git a/src/pages/lookup/Lookup.tsx b/src/pages/lookup/Lookup.tsx index 0e17cdd9..9d5afad4 100644 --- a/src/pages/lookup/Lookup.tsx +++ b/src/pages/lookup/Lookup.tsx @@ -68,8 +68,8 @@ const Lookup = () => { }; useEffect(() => { - if (state?.name && state?.phone && state?.password && !cachedData && !isFetching) { - // 비회원 데이터가 캐시에 없을 경우 새로 가져옴 + if (state?.name && state?.phone && state?.password && !isFetching) { + // 비회원 데이터 새로 가져옴 fetchBookingList(state).finally(() => { setIsFetching(false); setCachedData(getCachedBookingList(state.name, state.phone, state.password));