Browse Source

fix Countdown error format and invalid initial time, close #1009

pull/1023/head
ddcat1115 8 years ago
parent
commit
ebd6f2ffc8
  1. 12
      src/components/CountDown/index.js

12
src/components/CountDown/index.js

@ -51,9 +51,8 @@ class CountDown extends Component {
}
lastTime = targetTime - new Date().getTime();
return {
lastTime,
lastTime: lastTime < 0 ? 0 : lastTime,
};
}
// defaultFormat = time => (
@ -63,11 +62,11 @@ class CountDown extends Component {
const hours = 60 * 60 * 1000;
const minutes = 60 * 1000;
const h = fixedZero(Math.floor(time / hours));
const m = fixedZero(Math.floor((time - (h * hours)) / minutes));
const s = fixedZero(Math.floor((time - (h * hours) - (m * minutes)) / 1000));
const h = Math.floor(time / hours);
const m = Math.floor((time - (h * hours)) / minutes);
const s = Math.floor((time - (h * hours) - (m * minutes)) / 1000);
return (
<span>{h}:{m}:{s}</span>
<span>{fixedZero(h)}:{fixedZero(m)}:{fixedZero(s)}</span>
);
}
tick = () => {
@ -98,7 +97,6 @@ class CountDown extends Component {
render() {
const { format = this.defaultFormat, onEnd, ...rest } = this.props;
const { lastTime } = this.state;
const result = format(lastTime);
return (<span {...rest}>{result}</span>);

Loading…
Cancel
Save