diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 48bd5ed..0a9fc77 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,15 +1,7 @@ - - - - - - - - - + diff --git a/src/components/views/Home/ReciptBox.jsx b/src/components/views/Home/ReciptBox.jsx index b5cd275..1b2e941 100644 --- a/src/components/views/Home/ReciptBox.jsx +++ b/src/components/views/Home/ReciptBox.jsx @@ -109,13 +109,14 @@ export default function ReceiptBox ({children, modalIdx, setModalIdx}) {
할인금액 - {selectedInfo[0]?.couponUsed ? "(-) 500원" : "0원"} + {/* {selectedInfo[0]?.couponUsed ? "(-) 500원" : "0원"} */} + {(selectedInfo[0]?.price - selectedInfo[0]?.salePrice).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}원
총 결제금액 - {selectedInfo[0]?.price.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}원 + {selectedInfo[0]?.salePrice.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}원
diff --git a/src/hooks/Mypage/useMypageLogout.jsx b/src/hooks/Mypage/useMypageLogout.jsx index 98098e5..5ddc61d 100644 --- a/src/hooks/Mypage/useMypageLogout.jsx +++ b/src/hooks/Mypage/useMypageLogout.jsx @@ -25,7 +25,7 @@ const useMypageLogout = () => { }; try { const response = await axios.get(apiUrl, config); - if(response.status === 200){ + if(response.status === 200 && response.data.success){ console.log(response); setIsAuthenticated(false); localStorage.clear(); @@ -33,8 +33,8 @@ const useMypageLogout = () => { removeCookie("accessToken"); removeCookie("refreshToken"); message.success("로그아웃에 성공하셨습니다."); + navigate("/login"); } - navigate("/"); } catch (error) { message.info("관리자에게 문의하세요."); // navigate("/");