From 2f302cb8cfc352a7d6ea84bf0dd1a5d0964ae677 Mon Sep 17 00:00:00 2001
From: happppi <102276917+hhbb0081@users.noreply.github.com>
Date: Mon, 11 Dec 2023 16:58:24 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Fix:=20=EC=A3=BC=EC=84=9D=20=ED=95=B4?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App.js b/src/App.js
index efb9fa4..e9de4a8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -2,7 +2,7 @@ import { message } from "antd";
 import axios from "axios";
 import React, { Suspense } from "react";
 import { useCookies } from "react-cookie";
-import { Route, Routes, useNavigate } from "react-router-dom";
+import { Navigate, Route, Routes, useNavigate } from "react-router-dom";
 import { RecoilRoot } from "recoil";
 import MyPage from "../src/pages/MyPage/MyPage";
 import StoreDetailPage from "../src/pages/StoreDetailPage/StoreDetailPage";
@@ -110,7 +110,7 @@ function App() {
             {/* 메인페이지 */}
             <Route path="/" element={<NewHomePage />} />
             {/* 없는 경로로 갈 경우 메인페이지로 강제 이동 */}
-            {/* <Route path="/*" element={<Navigate to="/"></Navigate>}></Route> */}
+            <Route path="/*" element={<Navigate to="/"></Navigate>}></Route>
             {/* 카페검색*/}
             <Route path="/search" element={<CafeSearchPage />} />
             {/* 로그인*/}

From f54112f4a6d791daad5874f7dc9c4aa8e53af329 Mon Sep 17 00:00:00 2001
From: happppi <102276917+hhbb0081@users.noreply.github.com>
Date: Mon, 11 Dec 2023 16:58:39 +0900
Subject: [PATCH 2/2] =?UTF-8?q?Fix:=20=EB=A7=A4=EC=9E=A5=20&=20=ED=94=BD?=
 =?UTF-8?q?=EC=97=85=20=EC=97=AC=EB=B6=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/views/PageComponent/OrderStatus.jsx | 2 +-
 src/pages/OrderDetail/OrderDetail.jsx              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/PageComponent/OrderStatus.jsx b/src/components/views/PageComponent/OrderStatus.jsx
index 8c612cb..fb780d4 100644
--- a/src/components/views/PageComponent/OrderStatus.jsx
+++ b/src/components/views/PageComponent/OrderStatus.jsx
@@ -187,7 +187,7 @@ function OrderStatus() {
             <div className="status-content-wrapper">
               <span className="status-content-subtitle">수령방식</span>
               <div className="status-content">
-                <span className="status-history">{statusList?.inout ? "매장" : "픽업"}</span>
+                <span className="status-history">{statusList?.inout === 1 ? "매장" : "픽업"}</span>
               </div>
             </div>
             {degree === 4 && (
diff --git a/src/pages/OrderDetail/OrderDetail.jsx b/src/pages/OrderDetail/OrderDetail.jsx
index 7a4f6b5..0d92521 100644
--- a/src/pages/OrderDetail/OrderDetail.jsx
+++ b/src/pages/OrderDetail/OrderDetail.jsx
@@ -54,7 +54,7 @@ const OrderDetail = () => {
                 <span>주문일시: {detailData?.orderTime}</span>
                 <span>주문번호: {detailData?.orderId}</span>
                 <span>가게전화: {detailData?.storePhone}</span>
-                <span>수령방식: {detailData?.inout ? "매장" : "픽업"}</span>
+                <span>수령방식: {detailData?.inout === 1 ? "매장" : "픽업"}</span>
               </div>
             </div>
             <div className="detail-line"></div>