Merge branch '11-11-formal' into pre

src/components/blessingPreheat/collectBlessing/index.js

@@ -141,6 +141,7 @@ class CollectBlessing extends Component {
           Toast.info('今日已分享，记得明天来~', 2, null, false);
         }else {
           handleToShowShare();
+          this.shareTimer && clearInterval(this.shareTimer);
           this.shareTimer = setInterval(() => {
             this.setState(
               {
@@ -148,6 +149,9 @@ class CollectBlessing extends Component {
               },
               () => {
                 if (seconds === 0) {
+                  this.setState({
+                    seconds: 5
+                  });
                   typeof cb === 'function' && cb();
                   clearInterval(this.shareTimer);
                 }