From 3ea162d06401f1dad11fd5bb90a840fea4c80fb3 Mon Sep 17 00:00:00 2001 From: Park Nayoung <139189221+im-na0@users.noreply.github.com> Date: Sun, 28 Jan 2024 16:03:34 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=ED=8C=90=EB=A7=A4=EC=83=81=EC=84=B8,=20?= =?UTF-8?q?=EA=B5=AC=EB=A7=A4=EC=83=81=EC=84=B8=20=EB=82=A0=EC=A7=9C=20?= =?UTF-8?q?=ED=8F=AC=EB=A7=A4=ED=8C=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/purchaseDetailPage/PurchaseDetail.style.ts | 1 - src/pages/purchaseDetailPage/PurchaseDetail.tsx | 7 ++++--- src/pages/saleDetailPage/SaleDetail.tsx | 3 ++- src/pages/saleDetailPage/saleInfo/SaleInfo.tsx | 5 +++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/pages/purchaseDetailPage/PurchaseDetail.style.ts b/src/pages/purchaseDetailPage/PurchaseDetail.style.ts index 825eb8cf..57d63cc6 100644 --- a/src/pages/purchaseDetailPage/PurchaseDetail.style.ts +++ b/src/pages/purchaseDetailPage/PurchaseDetail.style.ts @@ -193,7 +193,6 @@ export const PayContainer = styled.div` padding: 1.5rem 1rem 3rem 1rem; box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.1); position: relative; - z-index: 10; `; export const PayInfo = styled.div` diff --git a/src/pages/purchaseDetailPage/PurchaseDetail.tsx b/src/pages/purchaseDetailPage/PurchaseDetail.tsx index e7e8ca74..37b7756a 100644 --- a/src/pages/purchaseDetailPage/PurchaseDetail.tsx +++ b/src/pages/purchaseDetailPage/PurchaseDetail.tsx @@ -5,6 +5,7 @@ import { useNavigate, useSearchParams } from "react-router-dom"; import * as S from "./PurchaseDetail.style"; import { PATH } from "@/constants/path"; import { AxiosError } from "axios"; +import { formatDateString } from "@/utils/dateFormatter"; const PurchaseDetail = () => { const [searchParams] = useSearchParams(); @@ -20,7 +21,7 @@ const PurchaseDetail = () => { - {data.paymentHistoryDate} + {formatDateString(data.paymentHistoryDate)} 예약번호 {data.paymentHistoryId} @@ -56,11 +57,11 @@ const PurchaseDetail = () => {
체크인
-
{data.checkIn}
+
{formatDateString(data.checkIn)}
체크아웃
-
{data.checkOut}
+
{formatDateString(data.checkOut)}
diff --git a/src/pages/saleDetailPage/SaleDetail.tsx b/src/pages/saleDetailPage/SaleDetail.tsx index 1e2df823..4e947da1 100644 --- a/src/pages/saleDetailPage/SaleDetail.tsx +++ b/src/pages/saleDetailPage/SaleDetail.tsx @@ -12,6 +12,7 @@ import SaleButton from "./saleButton/SaleButton"; import { calculateFee } from "@utils/calculator"; import { CaptionWrapper } from "@pages/paymentPage/Payment.style"; import Caption from "@components/caption/Caption"; +import { formatDateString } from "@/utils/dateFormatter"; const SaleDetail = () => { const { saleId } = useParams(); @@ -249,7 +250,7 @@ const SaleDetail = () => { 판매일시 - {data.checkIn} + {formatDateString(data.checkIn)}
diff --git a/src/pages/saleDetailPage/saleInfo/SaleInfo.tsx b/src/pages/saleDetailPage/saleInfo/SaleInfo.tsx index 1904dc65..710a5430 100644 --- a/src/pages/saleDetailPage/saleInfo/SaleInfo.tsx +++ b/src/pages/saleDetailPage/saleInfo/SaleInfo.tsx @@ -1,3 +1,4 @@ +import { formatDateString } from "@/utils/dateFormatter"; import * as S from "@pages/saleDetailPage/SaleDetail.style"; import type { ISaleData } from "@type/saleDetail"; @@ -25,13 +26,13 @@ const SaleInfo = ({ info }: SaleInfoProps) => { 체크인 - {info.checkIn} + {formatDateString(info.checkIn)} 체크아웃 - {info.checkOut} + {formatDateString(info.checkOut)}