Merge branch '00' into dev

src/components/activity/newyear-2019/common/prizes/index.js

@@ -85,7 +85,7 @@ class Prizes extends Component {
     } = this.props
     return (
       <>
-        {showSystemNotices && <SystemBulletScreen/>}
+        {showSystemNotices && <SystemBulletScreen bullets={this.state.notices}/>}
         <div className={'prizes-box'} ref={el => this.prizeBox = el}>
           <a href="javascript:;" className='rule-btn' onClick={this.showRules}>活动规则 > </a>
           <div className={`bg`} ref={el => this.bg = el}/>

src/components/activity/newyear-2019/common/system-bullet-screen/index.js

@@ -61,17 +61,15 @@ class SystemBulletScreen extends Component {
         content.style.transform = `translate3d(${-(contentWidth - wrapperWidth) - 10}px,0,0)`
       }, 1000)
     } else {
-      this.swiper.slideNext()
+      setTimeout(() => {
+        swiper.slideNext()
+      }, 3000)
     }
   }
 
   transitionEnd = () => {
     const {
-      bullets = [
-        '第一条消息，第一条消息，第一条消息，第一条消息，第一条消息，第一条消息，',
-        '第二条消息，第二条消息，第二条消息，第二条消息，第二条消息，第二条消息，',
-        '第三条消息，第三条消息，第三条消息，第三条消息，第三条消息，第三条消息，',
-      ]
+      bullets = []
     } = this.props
 
     const len = bullets.length * 3

src/components/activity/newyear-2019/common/user-bullet-screen/bullet-screen.scss

@@ -11,6 +11,8 @@
         height: 100%;
         padding: 2px;
         line-height: 26px;
+        display: flex;
+        align-items: center;
     }
 
     .avatar {

src/components/activity/newyear-2019/landing/index.js

@@ -34,7 +34,7 @@ class Landing extends Component {
 
   componentDidMount() {
     this.fetchPageData()
-    window.showFollowAlert = this.remind('create')
+    window.showFollowAlert = this.remind.bind(this, 'create')
   }
 
   componentDidUpdate(prevProps) {