Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: 매장 & 픽업 여부 수정 #181

Merged
merged 4 commits into from
Dec 11, 2023
+4 −4
Merged

Fix: 매장 & 픽업 여부 수정 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f302cb
Fix: 주석 해제
hhbb0081 Dec 11, 2023
f54112f
Fix: 매장 & 픽업 여부 수정
hhbb0081 Dec 11, 2023
3a7644e
Merge remote-tracking branch 'upstream/test' into test
hhbb0081 Dec 11, 2023
d23cc69
Merge pull request #180 from hhbb0081/test
hhbb0081 Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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 />} />
{/* 로그인*/}
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/PageComponent/OrderStatus.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && (
Expand Down
2 changes: 1 addition & 1 deletion src/pages/OrderDetail/OrderDetail.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down