Skip to content

Commit

Permalink
Merge pull request #173 from imi21123/test
Browse files Browse the repository at this point in the history
Feat: 바로주문에서 준비중 가게 처리
  • Loading branch information
marinesnow34 authored Dec 7, 2023
2 parents cc608f6 + cd4098b commit fc4da1e
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 3 deletions.
2 changes: 2 additions & 0 deletions src/pages/HomePage/Homepage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ function Homepage() {
</div>
</div>
</div>

{/* 사업자 정보 */}
<div className="business-info">
<div className="business-name">ReadyVery</div>
Expand All @@ -216,6 +217,7 @@ function Homepage() {
>
레디베리는 통신판매중개자이며, 통신판매의 당사자가 아닙니다.
</div>

<div
style={{
fontSize: "11px",
Expand Down
21 changes: 21 additions & 0 deletions src/pages/PaymentPage/PaymentPage.css
Original file line number Diff line number Diff line change
Expand Up @@ -286,3 +286,24 @@
margin-right: auto;
margin-bottom: 0.94rem;
}

.payment-page__store-close {
display: flex;
width: 23.4375rem;
height: 3.6875rem;
flex-shrink: 0;
border-radius: 0.625rem;
background: #838383;
color: #fff;
text-align: center;
font-family: "Pretendard Variable";
font-weight: 700;
font-size: 1.125rem;
line-height: 130%; /* 1.4625rem */
letter-spacing: -0.01125rem;
justify-content: center;
align-items: center;
margin-left: auto;
margin-right: auto;
margin-bottom: 0.94rem;
}
10 changes: 7 additions & 3 deletions src/pages/PaymentPage/PaymentPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,13 @@ const PaymentPage = () => {
</div>
</div>

<div className="payment-page__payment-btn" onClick={paymentRequest}>
결제하기
</div>
{paymentData?.isOpened ? (
<div className="payment-page__payment-btn" onClick={paymentRequest}>
결제하기
</div>
) : (
<div className="payment-page__store-close">지금은 준비중입니다.</div>
)}
</div>
);
};
Expand Down

0 comments on commit fc4da1e

Please sign in to comment.