Merge branch '00' into pre

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

@@ -86,7 +86,7 @@ class Prizes extends Component {
     const {notices} = this.state
     return (
       <>
-        {showSystemNotices && notices && notices.length && <SystemBulletScreen bullets={notices}/>}
+        {(showSystemNotices && notices && notices.length) ? <SystemBulletScreen bullets={notices}/> : null}
         <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,8 +61,8 @@ class SystemBulletScreen extends Component {
       }, 1000)
     } else {
       setTimeout(() => {
-        ++this.count
-        swiper.slideNext()
+        ++this.count;
+        (swiper && !swiper.destroyed) && swiper.slideNext()
       }, 3000)
     }
   }
@@ -99,17 +99,18 @@ class SystemBulletScreen extends Component {
       this.state.showNotices &&
       <div id="system-bullet-screen" onTransitionEnd={this.removeSystemNotices} ref={el => this.sysNotice = el}>
         <img className='avatar'
-             src='https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/system-avatar.png' alt=""/>
+             src='https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/system-notice-icon.png' alt=""/>
         <div className='sys-bullet-screen-swiper-container'>
           <ul className="swiper-wrapper">
             {
-              bullets && bullets.length && bullets.map((item, index) => {
-                return (
-                  <li className="swiper-slide" key={index}>
-                    <span>{item}</span>
-                  </li>
-                )
-              })
+              (bullets && bullets.length) ? bullets.map((item, index) => {
+                  return (
+                    <li className="swiper-slide" key={index}>
+                      <span>{item}</span>
+                    </li>
+                  )
+                })
+                : null
             }
           </ul>
         </div>