Merge branch 'dev' of https://github.com/catchroom/FE_CatchRoom into …

…feature/#288
catchroom · Jan 27, 2024 · fd70f77 · fd70f77
2 parents d3155f3 + 422d0d8
commit fd70f77
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/components/home/review/reviewSwiper/index.tsx b/components/home/review/reviewSwiper/index.tsx
@@ -13,11 +13,11 @@ const ReviewSwiper = () => {
   if (isLoading) return <ReviewSkeletonUI />;
   return (
     <Swiper spaceBetween={12} slidesPerView={1.2} loop={true}>
-      {data?.list.map((item: ReviewItemType) => {
+      {data?.list.map((item: ReviewItemType, index: number) => {
         return (
-          <SwiperSlide key={item?.productName}>
+          <SwiperSlide key={item?.productName + index}>
             <ReviewItem
-              key={item?.productName}
+              key={item?.productName + index}
               productName={item?.productName}
               content={item?.content}
               date={item?.date}

diff --git a/components/mypage/items/sellingItems/index.tsx b/components/mypage/items/sellingItems/index.tsx
@@ -11,6 +11,7 @@ import { isProductState } from '@/atoms/sale/productAtom';
 import { getReviewState, getSellState } from '@/utils/mypage-utils';
 import ReEnrollButton from '../reEnrollButton';
 import { mypageRoutingAtom } from '@/atoms/mypage/mypageRoutingAtom';
+import { getDotDate } from '@/utils/get-dot-date';
 
 const MItem = ({ item }: { item: MypageSellingType }) => {
   const setIsProduct = useSetRecoilState(isProductState);
@@ -34,6 +35,25 @@ const MItem = ({ item }: { item: MypageSellingType }) => {
   // 게시만료일때만 => 판매완료, 기한만료, 판매불가 따지기
   const isNothing = item?.dealState ? true : false;
 
+  const renderDealState = (dealState: string) => {
+    switch (dealState) {
+      case 'EXPIRED':
+        return (
+          <>
+            <p>{getSellState(dealState)}</p>
+            <ReEnrollButton dealState={dealState} fn={handleEditDate} />
+          </>
+        );
+      case 'DONEDEAL':
+        return <p>판매일 : {getDotDate(item.endDate, true, true, true)}</p>;
+      case 'UNSOLD':
+      case 'UNABLESELL':
+        return <p>{getSellState(dealState)}</p>;
+      default:
+        return <p>게시만료일 ~ {getDotDate(item.endDate, true, true, true)}</p>;
+    }
+  };
+
   return (
     <div className="w-full px-5 py-3 flex flex-col gap-3">
       <div id="container" className="w-full flex flex-col ">
@@ -67,6 +87,7 @@ const MItem = ({ item }: { item: MypageSellingType }) => {
                 캐치특가
               </span>
             )}
+            s
           </div>
           {/* 호텔 이름과 가격 정보 */}
           <div className="flex flex-col justify-between grow">
@@ -93,16 +114,12 @@ const MItem = ({ item }: { item: MypageSellingType }) => {
               </div>
             </div>
             <div className="flex gap-2 text-sub text-t3 font-medium">
-              <p>{getSellState(item.dealState as string)}</p>
-              <ReEnrollButton
-                dealState={item?.dealState as string}
-                fn={handleEditDate}
-              />
+              {renderDealState(item.dealState as string)}
             </div>
           </div>
         </div>
       </div>
-      {item && item.dealState && (
+      {item && item.dealState === 'DONEDEAL' && (
         <ReviewButtons
           id={parseInt(item.productId)}
           type={listState}

diff --git a/components/review/InfiniteScrollWrapper/index.tsx b/components/review/InfiniteScrollWrapper/index.tsx
@@ -39,9 +39,9 @@ const InfiniteScrollWrapper = () => {
         {data ? (
           data.pages.map((page, pageIndex) => (
             <div key={pageIndex} className="flex flex-col gap-8">
-              {page.list.map((item: ReviewItemType) => (
+              {page.list.map((item: ReviewItemType, index: number) => (
                 <ReviewItem
-                  key={item?.productName}
+                  key={item?.productName + index}
                   productName={item?.productName}
                   userName={item?.userName}
                   date={item?.date}

diff --git a/utils/mypage-utils.ts b/utils/mypage-utils.ts
@@ -35,7 +35,7 @@ export const noMask = (value: string) => {
 export const getSellState = (state: string) => {
   switch (state) {
     case 'EXPIRED':
-      return '기한 만료';
+      return '게시 기한 만료';
     case 'UNSOLD':
       return '체크인 만료';
     case 'UNABLESELL':