|
@@ -16,15 +16,16 @@ import { useSelector } from 'react-redux';
|
16
|
16
|
import {
|
17
|
17
|
signupActivity,
|
18
|
18
|
queryActivityDetail,
|
19
|
|
-<<<<<<< HEAD
|
20
|
|
-} from '@/services/activity';
|
21
|
|
-import { getImgURL } from '@/utils/image';
|
22
|
|
-import getDateFormat from '@/utils/chatDate';
|
23
|
|
-import useParams from '@/utils/hooks/useParams';
|
24
|
|
-import useShare from '@/utils/hooks/useShare';
|
25
|
|
-import useFavor from '@/utils/hooks/useFavor';
|
26
|
|
-import { times } from '@/utils/tools';
|
27
|
|
-import './index.scss';
|
|
19
|
+} from "@/services/activity";
|
|
20
|
+import { getImgURL } from "@/utils/image";
|
|
21
|
+import getDateFormat from "@/utils/chatDate";
|
|
22
|
+import useParams from "@/utils/hooks/useParams";
|
|
23
|
+import useShare from "@/utils/hooks/useShare";
|
|
24
|
+import useFavor from "@/utils/hooks/useFavor";
|
|
25
|
+import { times } from "@/utils/tools";
|
|
26
|
+import useStatus from './useStatus'
|
|
27
|
+
|
|
28
|
+import "./index.scss";
|
28
|
29
|
|
29
|
30
|
const activityStatusDict = {
|
30
|
31
|
0: {
|
|
@@ -49,19 +50,6 @@ const activityStatusDict = {
|
49
|
50
|
},
|
50
|
51
|
};
|
51
|
52
|
|
52
|
|
-=======
|
53
|
|
-} from "@/services/activity";
|
54
|
|
-import { getImgURL } from "@/utils/image";
|
55
|
|
-import getDateFormat from "@/utils/chatDate";
|
56
|
|
-import useParams from "@/utils/hooks/useParams";
|
57
|
|
-import useShare from "@/utils/hooks/useShare";
|
58
|
|
-import useFavor from "@/utils/hooks/useFavor";
|
59
|
|
-import useStatus from './useStatus'
|
60
|
|
-
|
61
|
|
-import { getDownloadURL, times, transferImage } from "@/utils/tools";
|
62
|
|
-import "./index.scss";
|
63
|
|
-
|
64
|
|
->>>>>>> 9b71da79c5db94acce0d9ed188d5664b36c36c8c
|
65
|
53
|
export default withLayout((props) => {
|
66
|
54
|
const { router, shareContent, trackData, person, page } = props;
|
67
|
55
|
const { id } = router.params;
|
|
@@ -135,7 +123,7 @@ export default withLayout((props) => {
|
135
|
123
|
useEffect(() => {
|
136
|
124
|
if(detail.title) {
|
137
|
125
|
const CountsTime = new Date(detail.enlistEnd).getTime() - Date.now()
|
138
|
|
- if(CountsTime) {
|
|
126
|
+ if(CountsTime > 0) {
|
139
|
127
|
SetCountsDown(CountsTime)
|
140
|
128
|
}
|
141
|
129
|
}
|
|
@@ -430,10 +418,10 @@ export default withLayout((props) => {
|
430
|
418
|
</view>
|
431
|
419
|
{detail.type == "dymic" && (
|
432
|
420
|
<view className='PageBottom flex-h'>
|
433
|
|
- <button className='Share' open-type='share'>
|
|
421
|
+ <Button className='Share' open-type='share'>
|
434
|
422
|
<text className='iconfont icon-fenxiang'></text>
|
435
|
423
|
<text>分享</text>
|
436
|
|
- </button>
|
|
424
|
+ </Button>
|
437
|
425
|
<view className='Collect' onClick={handleFavor}>
|
438
|
426
|
<text
|
439
|
427
|
className='iconfont icon-shoucang'
|
|
@@ -443,9 +431,9 @@ export default withLayout((props) => {
|
443
|
431
|
</view>
|
444
|
432
|
<view className='flex-item'></view>
|
445
|
433
|
|
446
|
|
- <button disabled={btnDisabled} className='Post' onClick={handleSignup}>
|
|
434
|
+ <Button disabled={btnDisabled} className='Post' onClick={handleSignup}>
|
447
|
435
|
{btnText}
|
448
|
|
- </button>
|
|
436
|
+ </Button>
|
449
|
437
|
</view>
|
450
|
438
|
)}
|
451
|
439
|
</view>
|