许静 5 years ago
parent
commit
5a40f5c7f0

+ 4
- 8
src/pages/activity/assembleItem/index.js View File

20
   componentWillMount(){
20
   componentWillMount(){
21
     this.updateLeftTime(this.props.data.startDate, this.props.data.endDate)
21
     this.updateLeftTime(this.props.data.startDate, this.props.data.endDate)
22
   }
22
   }
23
-  // 活动状态
24
-  const ActBeforeStart = 0;
25
-  const ActInProcess = 1;
26
-  const ActFinished = 2;
27
 
23
 
28
   updateLeftTime(startDate, endDate) {
24
   updateLeftTime(startDate, endDate) {
29
     const st = dayjs(startDate).valueOf()
25
     const st = dayjs(startDate).valueOf()
37
           // 活动未开始
33
           // 活动未开始
38
           this.setState({
34
           this.setState({
39
             leftTime: st - nw,
35
             leftTime: st - nw,
40
-            actState: ActBeforeStart,
36
+            actState: 0,
41
           })
37
           })
42
         } else if (ed > nw) {
38
         } else if (ed > nw) {
43
           // 活动未结束
39
           // 活动未结束
44
           this.setState({
40
           this.setState({
45
             leftTime: ed - nw,
41
             leftTime: ed - nw,
46
-            actState: ActInProcess,
42
+            actState: 1,
47
           })
43
           })
48
         } else {
44
         } else {
49
           // 活动已结束
45
           // 活动已结束
50
           this.clearTicker()
46
           this.clearTicker()
51
           this.setState({
47
           this.setState({
52
             leftTime: 0,
48
             leftTime: 0,
53
-            actState: ActFinished,
49
+            actState: 2,
54
           })
50
           })
55
         }
51
         }
56
       }, 1000)
52
       }, 1000)
76
         <Image className="pic" src={data.img} ></Image>
72
         <Image className="pic" src={data.img} ></Image>
77
         <View className="title">{data.title} {data.status}</View>
73
         <View className="title">{data.title} {data.status}</View>
78
         {!data.verification&&
74
         {!data.verification&&
79
-        <View className="time">{this.state.actState === ActInProcess ? '距活动结束:' : '活动已结束'}<Text className="count-time">{this.state.actState != ActFinished ? this.formateLeftTime() : ''}</Text></View>
75
+        <View className="time">{this.state.actState === 1 ? '距活动结束:' : '活动已结束'}<Text className="count-time">{this.state.actState != 2 ? this.formateLeftTime() : ''}</Text></View>
80
         }
76
         }
81
         {data.verification&&
77
         {data.verification&&
82
         <View className="hexiaoma">核销码:{data.verification}</View>
78
         <View className="hexiaoma">核销码:{data.verification}</View>

+ 5
- 8
src/pages/activity/assistanceItem/index.js View File

20
   componentWillMount(){
20
   componentWillMount(){
21
     this.updateLeftTime(this.props.data.startDate, this.props.data.endDate)
21
     this.updateLeftTime(this.props.data.startDate, this.props.data.endDate)
22
   }
22
   }
23
-  // 活动状态
24
-  const ActBeforeStart = 0;
25
-  const ActInProcess = 1;
26
-  const ActFinished = 2;
23
+ 
27
 
24
 
28
   updateLeftTime(startDate, endDate) {
25
   updateLeftTime(startDate, endDate) {
29
     const st = dayjs(startDate).valueOf()
26
     const st = dayjs(startDate).valueOf()
37
           // 活动未开始
34
           // 活动未开始
38
           this.setState({
35
           this.setState({
39
             leftTime: st - nw,
36
             leftTime: st - nw,
40
-            actState: ActBeforeStart,
37
+            actState: 0,
41
           })
38
           })
42
         } else if (ed > nw) {
39
         } else if (ed > nw) {
43
           // 活动未结束
40
           // 活动未结束
44
           this.setState({
41
           this.setState({
45
             leftTime: ed - nw,
42
             leftTime: ed - nw,
46
-            actState: ActInProcess,
43
+            actState: 1,
47
           })
44
           })
48
         } else {
45
         } else {
49
           // 活动已结束
46
           // 活动已结束
50
           this.clearTicker()
47
           this.clearTicker()
51
           this.setState({
48
           this.setState({
52
             leftTime: 0,
49
             leftTime: 0,
53
-            actState: ActFinished,
50
+            actState: 2,
54
           })
51
           })
55
         }
52
         }
56
       }, 1000)
53
       }, 1000)
76
         <Image className="pic" src={data.img} ></Image>
73
         <Image className="pic" src={data.img} ></Image>
77
         <View className="title">{data.title} {data.status}</View>
74
         <View className="title">{data.title} {data.status}</View>
78
         {!data.verification&&
75
         {!data.verification&&
79
-        <View className="time">{this.state.actState === ActInProcess ? '距活动结束:' : '活动已结束'}<Text className="count-time">{this.state.actState != ActFinished ? this.formateLeftTime() : ''}</Text></View>
76
+        <View className="time">{this.state.actState === 1 ? '距活动结束:' : '活动已结束'}<Text className="count-time">{this.state.actState != 2 ? this.formateLeftTime() : ''}</Text></View>
80
         }
77
         }
81
         {data.verification&&
78
         {data.verification&&
82
         <View className="hexiaoma">核销码:{data.verification}</View>
79
         <View className="hexiaoma">核销码:{data.verification}</View>