解决冲突

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

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

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

@@ -62,7 +62,6 @@ class Landing extends Component {
     }
   }
 
-<<<<<<< HEAD
   componentWillUnmount() {
     this.shareTipPopup && this.shareTipPopup.remove()
   }
@@ -83,9 +82,6 @@ class Landing extends Component {
     }
 
   createMeta = (title,dec,imgname) => {
-=======
-  createMeta = () => {
->>>>>>> a39d99f886043e7b6e36758defd406d49df37bd6
     let meta = document.createElement('meta');
     meta.setAttribute('name', 'description')
     meta.setAttribute('itemprop', 'description')

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

@@ -172,31 +172,7 @@ export default class index extends Component {
                     </div>
                     <div className="banner-treasure__decorate"></div>
                 </div>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                
-                {/*浮框*/}
-                <div className='nav-right'>
-                    <span onClick={this.toBoxList} className='nav-right__link'>
-                        未开宝箱
-                        {
-                            removable > 0 &&
-                            <i className="nav-right__number">{removable}</i>
-                        }
-                    </span>
-                    <a onClick={() => this.toYearWish()} className='nav-right__link'>
-                        心愿单
-                        {
-                            this.state.txt1 > 0 &&
-                            <i className="nav-right__number">{this.state.txt1}</i>
-                        }
-                    </a>
-                </div>
-=======
 
->>>>>>> 00
-=======
->>>>>>> a39d99f886043e7b6e36758defd406d49df37bd6
                 {/* 大咖直播 */}
                 <LiveRoom isAppUpdate={this.state.isAppUpdate}/>