Merge pull request #309 from sharemindteam/dev

[0624 배포]
sharemindteam · Jun 24, 2024 · 48f20d2 · 48f20d2
2 parents 35fb101 + 0e3f439
commit 48f20d2
Show file tree

Hide file tree

Showing 24 changed files with 282 additions and 357 deletions.
diff --git a/src/App.Layout.tsx b/src/App.Layout.tsx
@@ -118,11 +118,12 @@ const AppLayout = ({ children }: AppLayoutProps) => {
               onClick={() => {
                 navigate('/service');
               }}
+              style={{ cursor: 'pointer' }}
             />
           </ButtonWrapper>
         </BottomGreenBox>
       </LeftSection>
-      <div style={{ flex: 1 }}>{children}</div>
+      <div>{children}</div>
       <RightSection>
         <BottomGreenBox />
       </RightSection>

diff --git 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={<SellerPwChange />}
       />
       <Route
-        path="/minder/refundBankAccount"
-        element={<SellerRefundBankAccount />}
+        path="/minder/profitBankAccount"
+        element={<SellerProfitBankAccount />}
       />
       <Route path="/minder/setting/terminate" element={<SellerTerminate />} />
       <Route path="/minder/setting/logout" element={<SellerLogout />} />

diff --git a/src/assets/icons/graphic-noting.svg b/src/assets/icons/graphic-noting.svg
diff --git a/src/assets/icons/icon-heart2.svg b/src/assets/icons/icon-heart2.svg
diff --git a/src/assets/icons/icon-save1.svg b/src/assets/icons/icon-save1.svg
diff --git a/src/assets/icons/icon-save2.svg b/src/assets/icons/icon-save2.svg
diff --git a/src/assets/icons/search.svg b/src/assets/icons/search.svg
diff --git 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
@@ -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
@@ -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 ? (
-        <div
-          style={{
-            height: 'calc(70vh)',
-            display: 'flex',
-            alignItems: 'center',
-          }}
-        >
-          <LoadingSpinner />
-        </div>
-      ) : (
-        <BuyerOpenConsultCardList>
-          {/* 상담카드 부분 */}
-          {openConsultList.length === 0 ? (
-            <EmptyWrapper>
-              <EmptyIcon />
-              <Heading>아직 진행한 상담이 없어요</Heading>
-            </EmptyWrapper>
-          ) : (
-            openConsultList?.map((item) => {
+      {
+        isLoading ? (
+          <div
+            style={{
+              height: 'calc(70vh)',
+              display: 'flex',
+              alignItems: 'center',
+            }}
+          >
+            <LoadingSpinner />
+          </div>
+        ) : // 상담카드 부분
+        openConsultList.length === 0 ? (
+          <EmptyWrapper>
+            <EmptyIcon />
+            <Heading>아직 진행한 상담이 없어요</Heading>
+            <Space height="1rem" />
+            <Body2>상담은 공개상담 탭에서 신청할 수 있어요.</Body2>
+          </EmptyWrapper>
+        ) : (
+          <BuyerOpenConsultCardList>
+            {openConsultList?.map((item) => {
               if (item.title === null) {
                 return (
                   <BuyerPendingOpenConsultCard key={item.postId}>
-                    <Body1>
-                      {item.isCompleted === null
-                        ? '상담 글을 작성해주세요!'
-                        : '임시저장된 글입니다.'}
-                    </Body1>
-                    <Body3>
+                    <Flex className="row-1" justify="space-between">
+                      <Body1>
+                        {item.isCompleted === null
+                          ? '상담 글을 작성해주세요!'
+                          : '임시저장된 글입니다.'}
+                      </Body1>
+                      <Caption1 color={Grey3}>{item.updatedAt}</Caption1>
+                    </Flex>
+
+                    <Body3 color={Grey2}>
                       {item.isCompleted === null
-                        ? '결제 후 작성전'
+                        ? '공개상담을 결제한 후 아직 글을 작성하지 않으셨어요. 구매 후 24시간이 지나면 자동으로 환불이 진행됩니다.'
                         : '이어서 작성하기'}
                     </Body3>
                     <Button
                       text={
                         item.isCompleted === null
-                          ? '상담 글 작성하기'
+                          ? '작성하기'
                           : '이어서 작성하기'
                       }
                       width="100%"
-                      height="4rem"
+                      height="4.4rem"
+                      buttonTextType={2}
                       onClick={() => {
                         navigate(`/writeOpenConsult/${item.postId}`);
                       }}
@@ -178,12 +186,10 @@ function BuyerOpenConsultSection({ isChecked }: BuyerOpenConsultSectionProps) {
                         ) : (
                           <HeartEmptyIcon />
                         )}
-
                         <Caption1 color={Grey2}>{item?.totalLike}</Caption1>
                       </IconItem>
                       <IconItem>
                         {item?.isScrapped ? <SaveIcon /> : <SaveEmptyIcon />}
-
                         <Caption1 color={Grey2}>{item?.totalScrap}</Caption1>
                       </IconItem>
                       <IconItem>
@@ -195,13 +201,13 @@ function BuyerOpenConsultSection({ isChecked }: BuyerOpenConsultSectionProps) {
                   </BuyerOpenConsultCard>
                 );
               }
-            })
-          )}
-          {/* 상담카드 부분 */}
-          {/* 마지막 요소가 가려지지 않도록 마진 영역을 추가 */}
-          <Space height="4rem" />
-        </BuyerOpenConsultCardList>
-      )}
+            })}
+          </BuyerOpenConsultCardList>
+        )
+        // 상담카드 부분 끝
+      }
+      {/* 마지막 요소가 가려지지 않도록 마진 영역을 추가 */}
+      <Space height="4rem" />
 
       <div ref={observerElem} />
 
@@ -211,16 +217,6 @@ function BuyerOpenConsultSection({ isChecked }: BuyerOpenConsultSectionProps) {
           <IsBuyPopup />
         </>
       )}
-      <CreateConsultButtonWrapper>
-        <Button
-          text="공개상담 신청하기"
-          width="100%"
-          height="5.2rem"
-          onClick={() => {
-            navigate('/openConsultRequest');
-          }}
-        />
-      </CreateConsultButtonWrapper>
     </>
   );
 }
@@ -243,7 +239,7 @@ const BuyerPendingOpenConsultCard = styled.div`
   flex-direction: column;
   box-sizing: border-box;
   padding: 1.6rem;
-  gap: 0.8rem;
+  gap: 1.4rem;
   position: relative;
   background-color: ${White};
   border-radius: 1.2rem;
@@ -314,24 +310,11 @@ const TimeLeft = styled.div`
   right: 1.6rem;
 `;
 
-const CreateConsultButtonWrapper = styled.div`
-  width: 100%;
-  padding: 0 2rem;
-  box-sizing: border-box;
-  display: flex;
-  position: fixed;
-  bottom: 1.5rem;
-  flex-direction: column;
-  @media (min-width: 768px) {
-    width: 375px;
-  }
-`;
-
 const EmptyIcon = styled(Empty)`
   padding: 4.7rem 4.41rem 4.603rem 4.5rem;
 `;
 const EmptyWrapper = styled.div`
-  margin: 10vh auto 0px;
+  margin: calc(10vh - 1px) auto 0px;
   display: flex;
   flex-direction: column;
   align-items: center;

diff --git a/src/components/Buyer/BuyerCounselorProfile/CounselorFooter.tsx b/src/components/Buyer/BuyerCounselorProfile/CounselorFooter.tsx
@@ -102,22 +102,22 @@ const Wrapper = styled.div`
   }
   display: flex;
   justify-content: center;
+  align-items: center;
   gap: 2rem;
   background-color: ${White};
   padding: 0.8rem 2rem 1.2rem 2rem;
   position: fixed;
   bottom: 0;
   z-index: 999;
+  box-shadow: 0px -2px 10px 0px rgba(0, 0, 0, 0.1);
 `;
 const NoneBookMarkIcon = styled(NoneBookMark)`
-  width: 4.2rem;
-  height: 3.9rem;
+  width: 2.8rem;
+  height: 2.8rem;
   cursor: pointer;
-  margin-top: 0.5rem;
 `;
 const BookMarkIcon = styled(BookMark)`
-  width: 4.2rem;
-  height: 3.9rem;
+  width: 2.8rem;
+  height: 2.8rem;
   cursor: pointer;
-  margin-top: 0.5rem;
 `;