diff --git a/src/App.Layout.tsx b/src/App.Layout.tsx index f4876c94..f7e7dc04 100644 --- a/src/App.Layout.tsx +++ b/src/App.Layout.tsx @@ -118,11 +118,12 @@ const AppLayout = ({ children }: AppLayoutProps) => { onClick={() => { navigate('/service'); }} + style={{ cursor: 'pointer' }} /> -
{children}
+
{children}
diff --git a/src/Router.tsx b/src/Router.tsx index 2805c590..c5e407ba 100644 --- a/src/Router.tsx +++ b/src/Router.tsx @@ -35,7 +35,6 @@ import { BuyerConsultRequest } from 'pages/Buyer/BuyerConsultRequest'; import { BuyerPaymentDetail } from 'pages/Buyer/BuyerPaymentDetail'; import { BuyerPaymentComplete } from 'pages/Buyer/BuyerPaymentComplete'; import SellerAccountSetting from 'pages/Seller/SellerAccountSetting'; -import SellerRefundBankAccount from 'pages/Seller/SellerRefundBankAccount'; import { SellerPwChange } from 'pages/Seller/SellerPwChange'; import { SellerTerminate } from 'pages/Seller/SellerTerminate'; import { SellerLogout } from 'pages/Seller/SellerLogout'; @@ -53,6 +52,7 @@ import BuyerOpenConsultDetail from 'pages/Buyer/BuyerOpenConsultDetail'; import BuyerFinishPayment from 'pages/Buyer/BuyerFinishPayment'; import BuyerOpenConsultLikes from 'pages/Buyer/BuyerOpenConsultLikes'; import BuyerOpenConsultRecents from 'pages/Buyer/BuyerOpenConsultRecents'; +import SellerProfitBankAccount from 'pages/Seller/SellerProfitBankAccount'; const Router = () => { return ( @@ -117,8 +117,8 @@ const Router = () => { element={} /> } + path="/minder/profitBankAccount" + element={} /> } /> } /> diff --git a/src/assets/icons/graphic-noting.svg b/src/assets/icons/graphic-noting.svg index de1ace40..be7c6b25 100644 --- a/src/assets/icons/graphic-noting.svg +++ b/src/assets/icons/graphic-noting.svg @@ -1,42 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/icon-heart2.svg b/src/assets/icons/icon-heart2.svg index 7937e1e0..6acfda65 100644 --- a/src/assets/icons/icon-heart2.svg +++ b/src/assets/icons/icon-heart2.svg @@ -1,3 +1,3 @@ - - - + + + \ No newline at end of file diff --git a/src/assets/icons/icon-save1.svg b/src/assets/icons/icon-save1.svg index d0e18d03..675c15bc 100644 --- a/src/assets/icons/icon-save1.svg +++ b/src/assets/icons/icon-save1.svg @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/src/assets/icons/icon-save2.svg b/src/assets/icons/icon-save2.svg index 9849f5fa..19cd11c0 100644 --- a/src/assets/icons/icon-save2.svg +++ b/src/assets/icons/icon-save2.svg @@ -1,3 +1,3 @@ - + diff --git a/src/assets/icons/search.svg b/src/assets/icons/search.svg index 4d3609f6..28ad5e1a 100644 --- a/src/assets/icons/search.svg +++ b/src/assets/icons/search.svg @@ -1,4 +1,3 @@ - - - + + \ No newline at end of file diff --git a/src/components/Buyer/BuyerAvailCounselor/AvailCounselorSearchResult.tsx b/src/components/Buyer/BuyerAvailCounselor/AvailCounselorSearchResult.tsx index 35c1f5bf..db85bdcd 100644 --- a/src/components/Buyer/BuyerAvailCounselor/AvailCounselorSearchResult.tsx +++ b/src/components/Buyer/BuyerAvailCounselor/AvailCounselorSearchResult.tsx @@ -3,10 +3,14 @@ import { ReadyConsultCard } from '../Common/ReadyConsultCard'; import { SearchResultData } from 'utils/type'; import { AppendCategoryType } from 'utils/AppendCategoryType'; import { consultStyleToCharNum } from 'utils/convertStringToCharNum'; +// +// +// interface AvailCounselorSearchResultsProps { searchData: SearchResultData[]; } - +// +// //임의로 ConsultInReady 그대로 사용 export const AvailCounselorSearchResults = ({ searchData, @@ -29,6 +33,7 @@ export const AvailCounselorSearchResults = ({ nickname={value.nickname} level={value.level} isWishList={value.isWishList} + totalConsult={value.totalConsult} rating={value.ratingAverage} totalReview={value.totalReview} consultType={value.consultTypes} diff --git a/src/components/Buyer/BuyerCategoryResult/CategorySearchResult.tsx b/src/components/Buyer/BuyerCategoryResult/CategorySearchResult.tsx index a1497043..1ac85f97 100644 --- a/src/components/Buyer/BuyerCategoryResult/CategorySearchResult.tsx +++ b/src/components/Buyer/BuyerCategoryResult/CategorySearchResult.tsx @@ -33,6 +33,7 @@ export const CategorySearchResults = ({ consultType={value.consultTypes} letterPrice={value.consultCosts.편지} chattingPrice={value.consultCosts.채팅} + totalConsult={value.totalConsult} /> ); })} diff --git a/src/components/Buyer/BuyerConsult/BuyerOpenConsultSection.tsx b/src/components/Buyer/BuyerConsult/BuyerOpenConsultSection.tsx index 45e2ba4e..81db56e7 100644 --- a/src/components/Buyer/BuyerConsult/BuyerOpenConsultSection.tsx +++ b/src/components/Buyer/BuyerConsult/BuyerOpenConsultSection.tsx @@ -2,7 +2,7 @@ import { useMemo } from 'react'; import { useRecoilValue } from 'recoil'; import styled from 'styled-components'; import { Grey1, Grey2, Grey3, White } from 'styles/color'; -import { Body1, Body3, Caption1, Heading } from 'styles/font'; +import { Body1, Body2, Body3, Caption1, Heading } from 'styles/font'; import { LoadingSpinner } from 'utils/LoadingSpinner'; import { isBuyPopupOpenState } from 'utils/atom'; import { ReactComponent as LockIcon } from 'assets/icons/icon-lock.svg'; @@ -20,6 +20,7 @@ import { ReactComponent as Empty } from 'assets/icons/graphic-noting.svg'; import { getPostsCutsomers } from 'api/get'; import { useInfiniteQuery } from '@tanstack/react-query'; import useInfiniteObserver from 'hooks/useInfiniteObserver'; +import { Flex } from 'components/Common/Flex'; // // @@ -105,47 +106,54 @@ function BuyerOpenConsultSection({ isChecked }: BuyerOpenConsultSectionProps) { return ( <> - {isLoading ? ( -
- -
- ) : ( - - {/* 상담카드 부분 */} - {openConsultList.length === 0 ? ( - - - 아직 진행한 상담이 없어요 - - ) : ( - openConsultList?.map((item) => { + { + isLoading ? ( +
+ +
+ ) : // 상담카드 부분 + openConsultList.length === 0 ? ( + + + 아직 진행한 상담이 없어요 + + 상담은 공개상담 탭에서 신청할 수 있어요. + + ) : ( + + {openConsultList?.map((item) => { if (item.title === null) { return ( - - {item.isCompleted === null - ? '상담 글을 작성해주세요!' - : '임시저장된 글입니다.'} - - + + + {item.isCompleted === null + ? '상담 글을 작성해주세요!' + : '임시저장된 글입니다.'} + + {item.updatedAt} + + + {item.isCompleted === null - ? '결제 후 작성전' + ? '공개상담을 결제한 후 아직 글을 작성하지 않으셨어요. 구매 후 24시간이 지나면 자동으로 환불이 진행됩니다.' : '이어서 작성하기'}