Merge branch 'main' into develop

Gaoridang · Jan 29, 2024 · 2d5a1fa · 2d5a1fa
2 parents 3a55308 + c854343
commit 2d5a1fa
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/pages/myPage/hooks/usePurchaseHistory2.ts b/src/pages/myPage/hooks/usePurchaseHistory2.ts
@@ -1,11 +1,10 @@
-import { useQuery } from "@tanstack/react-query";
+import { useSuspenseQuery } from "@tanstack/react-query";
 import getPurchaseHistory2 from "../apis/getPurchaseHistory2";
 
 const usePurchaseHistory2 = () => {
-  return useQuery({
+  return useSuspenseQuery({
     queryKey: ["purchaseHistory2"],
-    queryFn: () => getPurchaseHistory2(),
-    enabled: false
+    queryFn: () => getPurchaseHistory2()
   });
 };
 

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 } from "./utils/convertString";
+import { convertString, convertStringToKR } from "./utils/convertString";
 import { onClickTossPayment, onClickPGPayment } from "./utils/onClickPayment";
 import BankIcoLogo from "@assets/bankIcon.png";
 import Cookies from "js-cookie";

diff --git a/src/pages/purchase/utils/onClickPayment.ts b/src/pages/purchase/utils/onClickPayment.ts
@@ -23,7 +23,7 @@ export const onClickTossPayment = (
       amount: amount,
       buyer_name: name,
       buyer_tel: phoneNumber,
-      m_redirect_url: `${redirectUrl}&isMobile=true` // 모바일에서 결제시, 페이지 주소가 바뀜, 따라서 결제 끝나고 돌아갈 주소 입력해야됨
+      m_redirect_url: redirectUrl // 모바일에서 결제시, 페이지 주소가 바뀜, 따라서 결제 끝나고 돌아갈 주소 입력해야됨
     },
     (rsp: any) => {
       // callback
@@ -62,7 +62,7 @@ export const onClickPGPayment = (
       amount: amount,
       buyer_name: name,
       buyer_tel: phoneNumber,
-      m_redirect_url: `${redirectUrl}&isMobile=true` // 모바일에서 결제시, 페이지 주소가 바뀜, 따라서 결제 끝나고 돌아갈 주소 입력해야됨
+      m_redirect_url: redirectUrl // 모바일에서 결제시, 페이지 주소가 바뀜, 따라서 결제 끝나고 돌아갈 주소 입력해야됨
     },
     (rsp: any) => {
       // callback

diff --git a/src/pages/speicialProducts/index.tsx b/src/pages/speicialProducts/index.tsx
@@ -1,6 +1,6 @@
 import UpperNavBar from "@components/navBar/upperNavBar";
 import useProducts from "@pages/products/api/queries";
-import Order from "@pages/products/components/Order";
+// import Order from "@pages/products/components/Order";
 import ProductCard from "@pages/products/components/ProductCard";
 import logo from "@assets/2024_dragon.png";
 import { ScrollRestoration } from "react-router-dom";
@@ -22,7 +22,7 @@ const SpecialProducts = () => {
           <p>2024년을 시작하는 신년 파티룸</p>
         </div>
       </S.Wrapper>
-      <Order />
+      {/* <Order /> */}
       {products.map((product) => (
         <ProductCard key={product.id} product={product} />
       ))}