Merge pull request #244 from Yanabada/develop

2차 배포
Yanabada · Jan 29, 2024 · 8419878 · 8419878
2 parents 553b1e5 + c06a5b1
commit 8419878
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/src/pages/charge/account.tsx b/src/pages/charge/account.tsx
@@ -73,6 +73,7 @@ const Account = () => {
         <CS.PayTitle>계좌번호를 입력해 주세요</CS.PayTitle>
         <CS.PaySpace />
         <TextInput
+          type="number"
           variant="move"
           label="계좌번호 입력"
           value={bankNumber}

diff --git a/src/pages/charge/success.tsx b/src/pages/charge/success.tsx
@@ -13,9 +13,13 @@ const ChargeSuccess = () => {
   const navigate = useNavigate();
   const nickname = Cookies.get("nickName");
 
+  const goToHome = () => {
+    navigate("/mypage");
+  };
+
   return (
     <>
-      <UpperNavBar title="비밀번호 등록" type="close" />
+      <UpperNavBar title="비밀번호 등록" type="close" customBack={goToHome} isCustom={true} />
       <LoadingAnimation />
       <S.SuccessWrap>
         <S.SuccessBox>
@@ -31,10 +35,10 @@ const ChargeSuccess = () => {
           <BaseButton
             buttonType="default"
             width="100%"
-            onClick={() => navigate("/charge?type=withdrawal")}
+            onClick={() => navigate("/charge?type=charging")}
           >
             <ContactIcon />
-            계좌 연결하기
+            페이 충전하기
           </BaseButton>
         </S.ButtonWrap>
       </S.SuccessWrap>

diff --git 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
@@ -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
@@ -47,7 +47,7 @@ const SellConfirm = () => {
 
   return (
     <>
-      <UpperNavBar title="상품 등록 완료" type="back" />
+      <UpperNavBar title="상품 등록 완료" type="none" />
       <CS.RegisterWrap>
         <CS.RegisterInner>
           <CS.RegisterTitle>상품 등록이 정상적으로 완료되었습니다.</CS.RegisterTitle>