feats

src/pages/index/activityDetail/index.jsx

@@ -16,40 +16,6 @@ import { useSelector } from 'react-redux';
 import {
   signupActivity,
   queryActivityDetail,
-<<<<<<< HEAD
-} from '@/services/activity';
-import { getImgURL } from '@/utils/image';
-import getDateFormat from '@/utils/chatDate';
-import useParams from '@/utils/hooks/useParams';
-import useShare from '@/utils/hooks/useShare';
-import useFavor from '@/utils/hooks/useFavor';
-import { times } from '@/utils/tools';
-import './index.scss';
-
-const activityStatusDict = {
-  0: {
-    text: '立即参与',
-    text1: '立即参团',
-    className: 'yellow',
-  },
-  1: {
-    text: '未开始',
-    text1: '未开始',
-    className: 'blue',
-  },
-  2: {
-    text: '已结束',
-    text1: '已结束',
-    className: 'grey',
-  },
-  3: {
-    text: '已参与',
-    text1: '已结束',
-    className: 'yellow',
-  },
-};
-
-=======
 } from "@/services/activity";
 import { getImgURL } from "@/utils/image";
 import getDateFormat from "@/utils/chatDate";
@@ -61,7 +27,6 @@ import useStatus from './useStatus'
 import { getDownloadURL, times, transferImage } from "@/utils/tools";
 import "./index.scss";
 
->>>>>>> 9b71da79c5db94acce0d9ed188d5664b36c36c8c
 export default withLayout((props) => {
   const { router, shareContent, trackData, person, page } = props;
   const { id } = router.params;
@@ -315,87 +280,10 @@ export default withLayout((props) => {
         <view className='flex-item'>
           <text>{detail.enlisted || 0}人已报名</text>
         </view>
-        <text className='Btn' onClick={handleSignup}>{activityStatusDict[detail.activityStatus]?.text1}</text>
+        <button className='Btn' disabled={btnDisabled} onClick={handleSignup}>{btnText}</button>
       </view>
 
     </view>
-    // <view className='houseInfo'>
-    //   {/* <view> */}
-    //   <view className='flex-h'>
-    //     <view className='left'>
-    //       <view className='Title'>
-    //         <view className='flex-item'>
-    //           <text>{detail.title}</text>
-    //         </view>
-    //       </view>
-    //       <view className='flex-h Address'>
-    //         <text className='iconfont icon-dingwei'></text>
-    //         <view className='flex-item'>
-    //           <text>{detail.address}</text>
-    //         </view>
-    //         <text className='price'>价格待定</text>
-    //       </view>
-    //       <text className='flex-h Time'>
-    //         时间：
-    //         {getDateFormat(
-    //           new Date(detail.startDate).valueOf(),
-    //           true,
-    //           'yyyy/M/d'
-    //         )}{' '}
-    //         -{' '}
-    //         {getDateFormat(
-    //           new Date(detail.endDate).valueOf(),
-    //           true,
-    //           'yyyy/M/d'
-    //         )}
-    //       </text>
-    //     </view>
-    //     <view className='right'>
-    //       <view>
-    //         {/* <Button open-type='share'>
-    //           <text className='iconfont icon-fenxiang'></text>
-    //           <text>分享</text>
-    //         </Button> */}
-    //         <text className='iconfont icon-fenxiang'></text>
-    //         <text>分享</text>
-    //       </view>
-    //       <view>
-    //         <text className='iconfont icon-dingwei'></text>
-    //         <text>海报</text>
-    //       </view>
-    //     </view>
-    //   </view>
-
-    //   <view className='lastdate'>
-    //     <text className='text'>距离结束还有</text>
-    //     <text className='text day'>7</text>
-    //     <text className='text'>天</text>
-    //     <text className='text time'>2</text>
-    //     <text className='text'>时</text>
-    //     <text className='text time'>4</text>
-    //     <text className='text'>分</text>
-    //     <text className='text time'>5</text>
-    //     <text className='text'>秒</text>
-    //     {/* <view>距离结束还有</view> */}
-    //   </view>
-
-    //   <view className='flex-h join'>
-    //     <view className='Collect' onClick={handleFavor}>
-    //       <text className='iconfont icon-shoucang' style={isSaved ? { color: 'red' } : undefined}></text>
-    //       <text>{isSaved ? '已收藏' : '收藏'}</text>
-    //     </view>
-    //     <view className='enlisted'>
-    //       <view>
-    //         <text className='iconfont icon-shoucang'></text>
-    //         <text>{detail.enlisted || 0}人已报名</text>
-    //       </view>
-    //     </view>
-    //     <view className='btn' onClick={handleSignup}>
-    //       <text>{activityStatusDict[detail.activityStatus]?.text1}</text>
-    //     </view>
-    //   </view>
-    //   {/* </view> */}
-    // </view>
   );
 
   return (