@@ -64,8 +64,12 @@ export default class AtCountdown extends React.Component<
64
64
65
65
if ( this . seconds > 0 ) {
66
66
day = this . props . isShowDay ? Math . floor ( this . seconds / ( 60 * 60 * 24 ) ) : 0
67
- hours = Math . floor ( this . seconds / ( 60 * 60 ) ) - day * 24
68
- minutes = Math . floor ( this . seconds / 60 ) - day * 24 * 60 - hours * 60
67
+ hours = this . props . isShowHour
68
+ ? Math . floor ( this . seconds / ( 60 * 60 ) ) - day * 24
69
+ : 0
70
+ minutes = this . props . isShowMinute
71
+ ? Math . floor ( this . seconds / 60 ) - day * 24 * 60 - hours * 60
72
+ : 0
69
73
seconds =
70
74
Math . floor ( this . seconds ) -
71
75
day * 24 * 60 * 60 -
@@ -134,7 +138,8 @@ export default class AtCountdown extends React.Component<
134
138
format,
135
139
isShowDay,
136
140
isCard,
137
- isShowHour
141
+ isShowHour,
142
+ isShowMinute
138
143
} = this . props
139
144
const { _day, _hours, _minutes, _seconds } = this . state
140
145
@@ -150,25 +155,15 @@ export default class AtCountdown extends React.Component<
150
155
style = { customStyle }
151
156
>
152
157
{ isShowDay && (
153
- < AtCountdownItem isCard = { isCard } num = { _day } separator = { format ! . day } />
158
+ < AtCountdownItem num = { _day } separator = { format ? .day || '天' } />
154
159
) }
155
160
{ isShowHour && (
156
- < AtCountdownItem
157
- isCard = { isCard }
158
- num = { _hours }
159
- separator = { format ! . hours }
160
- />
161
+ < AtCountdownItem num = { _hours } separator = { format ?. hours || '' } />
161
162
) }
162
- < AtCountdownItem
163
- isCard = { isCard }
164
- num = { _minutes }
165
- separator = { format ! . minutes }
166
- />
167
- < AtCountdownItem
168
- isCard = { isCard }
169
- num = { _seconds }
170
- separator = { format ! . seconds }
171
- />
163
+ { isShowMinute && (
164
+ < AtCountdownItem num = { _minutes } separator = { format ?. minutes || '' } />
165
+ ) }
166
+ < AtCountdownItem num = { _seconds } separator = { format ?. seconds || '' } />
172
167
</ View >
173
168
)
174
169
}
@@ -180,6 +175,7 @@ AtCountdown.defaultProps = {
180
175
isCard : false ,
181
176
isShowDay : false ,
182
177
isShowHour : true ,
178
+ isShowMinute : true ,
183
179
format : {
184
180
day : '天' ,
185
181
hours : '时' ,
@@ -198,6 +194,7 @@ AtCountdown.propTypes = {
198
194
isCard : PropTypes . bool ,
199
195
isShowDay : PropTypes . bool ,
200
196
isShowHour : PropTypes . bool ,
197
+ isShowMinute : PropTypes . bool ,
201
198
format : PropTypes . object ,
202
199
day : PropTypes . number ,
203
200
hours : PropTypes . number ,
0 commit comments