diff --git a/src/pages/charge/account.tsx b/src/pages/charge/account.tsx index 1561a353..173bc6f6 100644 --- a/src/pages/charge/account.tsx +++ b/src/pages/charge/account.tsx @@ -73,6 +73,7 @@ const Account = () => { 계좌번호를 입력해 주세요 { const navigate = useNavigate(); const nickname = Cookies.get("nickName"); + const goToHome = () => { + navigate("/mypage"); + }; + return ( <> - + @@ -31,10 +35,10 @@ const ChargeSuccess = () => { navigate("/charge?type=withdrawal")} + onClick={() => navigate("/charge?type=charging")} > - 계좌 연결하기 + 페이 충전하기 diff --git a/src/pages/purchase/index.tsx b/src/pages/purchase/index.tsx index da1bbb5f..6ac2c1e6 100644 --- a/src/pages/purchase/index.tsx +++ b/src/pages/purchase/index.tsx @@ -32,7 +32,7 @@ import formatNumberWithCommas from "@pages/myPage/utils/formatNumberWithCommas"; import calculateDiscountRate from "@pages/myPage/utils/calculateDiscountRate"; import useProfileDetail from "@pages/myPage/hooks/useProfileDetail"; import useBuyProduct from "./hooks/useBuyProduct"; -import { convertString, convertStringToKR } from "./utils/convertString"; +import { convertString } from "./utils/convertString"; import { onClickTossPayment, onClickPGPayment } from "./utils/onClickPayment"; import BankIcoLogo from "@assets/bankIcon.png"; import Cookies from "js-cookie"; @@ -200,7 +200,7 @@ const Purchase = ({ width, divType }: PurchaseProps) => { fee: (productData?.sellingPrice * 0.05).toString(), point: pointToUse, totalPrice: formatNumberWithCommas(totalPrice), - paymentType: convertStringToKR(paymentMethod), + paymentType: paymentMethod, productId: productId, image: productData?.accommodationInfo.image }; diff --git a/src/pages/purchase/reservationComplete.tsx b/src/pages/purchase/reservationComplete.tsx index 8291e356..7ddbc375 100644 --- a/src/pages/purchase/reservationComplete.tsx +++ b/src/pages/purchase/reservationComplete.tsx @@ -12,7 +12,7 @@ import { useLocation } from "react-router-dom"; import queryString from "query-string"; import formatNumberWithCommas from "@pages/myPage/utils/formatNumberWithCommas"; import useBuyProduct from "@pages/purchase/hooks/useBuyProduct"; -import { convertStringToKR } from "./utils/convertString"; +import { convertString, convertStringToKR } from "./utils/convertString"; interface TradeData { tradeId: number; @@ -59,7 +59,7 @@ const ReservationComplete = () => { userPersonName: purchaseInfo?.userPersonName as string, userPersonPhoneNumber: purchaseInfo?.userPersonPhoneNumber as string, point: Number(purchaseInfo.point), - paymentType: purchaseInfo.paymentType as string + paymentType: convertString(purchaseInfo.paymentType as string) }); } else { refetch(); diff --git a/src/pages/sell/confirm.tsx b/src/pages/sell/confirm.tsx index 16fe72c3..c626afd5 100644 --- a/src/pages/sell/confirm.tsx +++ b/src/pages/sell/confirm.tsx @@ -47,7 +47,7 @@ const SellConfirm = () => { return ( <> - + 상품 등록이 정상적으로 완료되었습니다.