合并00

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

@@ -22,7 +22,6 @@ class SystemBulletScreen extends Component {
     this.swiper && this.swiper.destroy()
   }
 
-
   initializeSwiper = () => {
     const _this = this
     this.swiper = new Swiper('.sys-bullet-screen-swiper-container', {
@@ -62,18 +61,16 @@ class SystemBulletScreen extends Component {
       }, 1000)
     } else {
       setTimeout(() => {
+        ++this.count;
         swiper.slideNext()
       }, 3000)
     }
   }
 
   transitionEnd = () => {
-    const {
-      bullets = []
-    } = this.props
+    const {bullets} = this.props
 
     const len = bullets.length * 3
-
     if (++this.count === len) {
       setTimeout(() => {
         this.sysNotice.style.height = `0px`
@@ -87,7 +84,7 @@ class SystemBulletScreen extends Component {
 
   removeSystemNotices = e => {
     e.persist()
-    if(e.target === this.sysNotice){
+    if (e.target === this.sysNotice) {
       this.setState({
         showNotices: false
       })

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

 @import "../user-bullet-screen/bullet-screen";
 
 #system-bullet-screen {
+    @extend .bullet-screen;
     overflow: hidden;
     margin-top: 11px;
     margin-bottom: 16px;
@@ -25,9 +26,9 @@
         span {
             display: inline-block;
             white-space: nowrap;
+            overflow: visible;
             line-height: 30px;
         }
     }
 
-    @extend .bullet-screen;
 }

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

@@ -16,7 +16,11 @@ class UserBulletScreen extends Component {
     this.getBulletScreenData(true)
   }
 
+<<<<<<< HEAD
   componentWillUpdate() {
+=======
+  componentWillUnmount() {
+>>>>>>> 00
     this.swiper && this.swiper.destroy()
   }
 

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

@@ -152,6 +152,7 @@ export default class index extends Component {
                     </div>
                     <div className="banner-treasure__decorate"></div>
                 </div>
+<<<<<<< HEAD
                 
                 {/*浮框*/}
                 <div className='nav-right'>
@@ -170,6 +171,9 @@ export default class index extends Component {
                         }
                     </a>
                 </div>
+=======
+
+>>>>>>> 00
                 {/* 大咖直播 */}
                 <LiveRoom/>