Merge branch '2020-717-formal' into dev

src/components/activity/2020-717/activity/index.js

@@ -532,21 +532,21 @@ class Anniversary2020 extends Component {
   }
 
   setupCountDown = (totalSeconds) => {
-    this.countDownTimer = setTimeout(() => {
-      totalSeconds--
-      const d = Math.floor(totalSeconds / 60 / 60 / 24)
-      const h = Math.floor(totalSeconds / 60 / 60) % 24
-      const m = Math.floor(totalSeconds / 60) % 60
-      this.setState({
-        countDown: `${d}天${h}时${m}分`,
-      }, () => {
-        if (totalSeconds > 0) {
+    totalSeconds -= 60
+    const d = Math.floor(totalSeconds / 60 / 60 / 24)
+    const h = Math.floor(totalSeconds / 60 / 60) % 24
+    const m = Math.floor(totalSeconds / 60) % 60
+    this.setState({
+      countDown: `${d}天${h}时${m}分`,
+    }, () => {
+      if (totalSeconds > 0) {
+        this.countDownTimer = setTimeout(() => {
           this.setupCountDown(totalSeconds)
-        } else {
-          this.getActivityStage()
-        }
-      });
-    }, 1000 * 60)
+        }, 1000 * 60)
+      } else {
+        this.getActivityStage()
+      }
+    });
   }
 
   render() {