Browse Source

静态页面

xcx 4 years ago
parent
commit
5cf7e77db9

+ 23
- 2
src/components/ActivityListItem/index.jsx View File

1
 import React, { useState } from 'react'
1
 import React, { useState } from 'react'
2
 import Taro from '@tarojs/taro'
2
 import Taro from '@tarojs/taro'
3
+import toolclass from '@/utils/toolclass.js'
3
 import '@/assets/css/reset.less'
4
 import '@/assets/css/reset.less'
4
 import '@/assets/css/iconfont.less'
5
 import '@/assets/css/iconfont.less'
5
 import './index.less'
6
 import './index.less'
8
 
9
 
9
   const { Data } = props
10
   const { Data } = props
10
 
11
 
12
+  const BtnStatus = () => { // 按钮状态
13
+    let StartTime = new Date(Data.enlistStart).getTime()
14
+    let EndTime = new Date(Data.enlistEnd).getTime()
15
+    let StopTime = new Date(Data.endDate).getTime()
16
+    let Now = Date.now()
17
+    if (StartTime > Now) {
18
+      return `未开始`
19
+    }
20
+    if (StartTime <= Now && EndTime > Now) {
21
+      return !!Data.isSign ? `已报名` : `去报名`
22
+    }
23
+    if (EndTime <= Now && StopTime > Now) {
24
+      return `进行中`
25
+    }
26
+    if (StopTime <= Now) {
27
+      return `已结束`
28
+    }
29
+    return ``
30
+  }
31
+
11
   return (
32
   return (
12
     <view className='ActivityListItem' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${Data.dynamicId}` }) }}>
33
     <view className='ActivityListItem' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${Data.dynamicId}` }) }}>
13
       <view className='Img'>
34
       <view className='Img'>
16
       <view className='Info flex-h'>
37
       <view className='Info flex-h'>
17
         <view className='flex-item'>
38
         <view className='flex-item'>
18
           <text>{Data.title}</text>
39
           <text>{Data.title}</text>
19
-          <text>参与截止时间:{Data.enlistEnd}</text>
40
+          <text>参与截止时间:{toolclass.FormatDate(Data.enlistEnd)}</text>
20
         </view>
41
         </view>
21
-        <text className='active'>未开始</text>
42
+        <text className={BtnStatus() === '未开始' || BtnStatus() === '去报名' ? 'active' : ''}>{BtnStatus()}</text>
22
       </view>
43
       </view>
23
     </view >
44
     </view >
24
   )
45
   )

+ 1
- 0
src/pages/HuoDong/HuoDongDetail/index.css View File

81
   font-size: 28px;
81
   font-size: 28px;
82
   color: #F35844;
82
   color: #F35844;
83
   line-height: 40px;
83
   line-height: 40px;
84
+  margin-left: 10px;
84
 }
85
 }
85
 .HuoDongDetail > .Info > .Desc {
86
 .HuoDongDetail > .Info > .Desc {
86
   position: relative;
87
   position: relative;

+ 3
- 2
src/pages/HuoDong/HuoDongDetail/index.jsx View File

4
 import request, { apis } from '@/utils/request'
4
 import request, { apis } from '@/utils/request'
5
 import { useModel } from '@/store'
5
 import { useModel } from '@/store'
6
 import GetUserPhone from '@/components/GetUserPhone/index'
6
 import GetUserPhone from '@/components/GetUserPhone/index'
7
+import toolclass from '@/utils/toolclass.js'
7
 import '@/assets/css/reset.less'
8
 import '@/assets/css/reset.less'
8
 import '@/assets/css/iconfont.less'
9
 import '@/assets/css/iconfont.less'
9
 import './index.less'
10
 import './index.less'
85
             <text className='Tips'>{ActivityDetail.enlisted}人已报名</text>
86
             <text className='Tips'>{ActivityDetail.enlisted}人已报名</text>
86
             <view className='flex-h'>
87
             <view className='flex-h'>
87
               <text>活动时间:</text>
88
               <text>活动时间:</text>
88
-              <view className='flex-item'>{ActivityDetail.startDate}<text>限{ActivityDetail.enlistNum}人</text></view>
89
+              <view className='flex-item'>{toolclass.FormatDate(ActivityDetail.startDate)}<text>限{ActivityDetail.enlistNum}人</text></view>
89
             </view>
90
             </view>
90
             <view className='flex-h'>
91
             <view className='flex-h'>
91
               <text>活动地址:</text>
92
               <text>活动地址:</text>
93
             </view>
94
             </view>
94
             <view className='flex-h'>
95
             <view className='flex-h'>
95
               <text>报名截止:</text>
96
               <text>报名截止:</text>
96
-              <view className='flex-item'>{ActivityDetail.enlistEnd}</view>
97
+              <view className='flex-item'>{toolclass.FormatDate(ActivityDetail.enlistEnd)}</view>
97
             </view>
98
             </view>
98
           </view>
99
           </view>
99
 
100
 

+ 1
- 0
src/pages/HuoDong/HuoDongDetail/index.less View File

87
             font-size: 28px;
87
             font-size: 28px;
88
             color: #F35844;
88
             color: #F35844;
89
             line-height: 40px;
89
             line-height: 40px;
90
+            margin-left: 10px;
90
           }
91
           }
91
         }
92
         }
92
       }
93
       }

+ 1
- 1
src/pages/ShouYe/HuoDong/index.jsx View File

6
 import '@/assets/css/iconfont.less'
6
 import '@/assets/css/iconfont.less'
7
 import './index.less'
7
 import './index.less'
8
 
8
 
9
-export default function ShouYeHuoDong (props) {
9
+export default function ShouYeHuoDong () {
10
 
10
 
11
   const [IsPullUp, setIsPullUp] = useState(false)
11
   const [IsPullUp, setIsPullUp] = useState(false)
12
   const [IsPullDown, setIsPullDown] = useState(false)
12
   const [IsPullDown, setIsPullDown] = useState(false)

+ 17
- 0
src/utils/toolclass.js View File

1
+const toolclass = {
2
+  FormatDate: (date = null) => { // 格式化时间
3
+    if (date !== null) {
4
+      date = new Date(date)
5
+      let YY = date.getFullYear()
6
+      let MM = date.getMonth() + 1
7
+      let DD = date.getDate()
8
+      let hh = date.getHours()
9
+      let mm = date.getMinutes()
10
+      let ss = date.getSeconds()
11
+      return `${YY}-${MM > 9 ? MM : `0${MM}`}-${DD > 9 ? DD : `0${DD}`} ${hh > 9 ? hh : `0${hh}`}:${mm > 9 ? mm : `0${mm}`}:${ss > 9 ? ss : `0${ss}`}`
12
+    } else {
13
+      return ''
14
+    }
15
+  }
16
+}
17
+export default toolclass