merge and solve

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

@@ -19,7 +19,7 @@ class SystemBulletScreen extends Component {
   }
 
   componentWillUnmount() {
-    this.swiper && this.swiper.destroy(true, true)
+    this.swiper && this.swiper.destroy()
   }
 
 

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

@@ -6,6 +6,8 @@ import './bullet-screen.scss'
 
 class UserBulletScreen extends Component {
 
+  swiper
+
   state = {
     bulletScreenData: []
   }
@@ -14,6 +16,10 @@ class UserBulletScreen extends Component {
     this.getBulletScreenData(true)
   }
 
+  componentWillUpdate() {
+    this.swiper && this.swiper.destroy()
+  }
+
 
   initializeBulletScreen = () => {
     const _this = this

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

@@ -152,24 +152,6 @@ export default class index extends Component {
                     </div>
                     <div className="banner-treasure__decorate"></div>
                 </div>
-                
-                {/*浮框*/}
-                <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>
                 {/* 大咖直播 */}
                 <LiveRoom/>
 

src/components/activity/newyear-2019/year-wish/index.js

@@ -17,10 +17,10 @@ class YarnWish extends Component {
     }
 
     componentWillUpdate() {
-        const {activityStage} = this.state;
-        if(activityStage == 1) {
+        const {activityStage} = this.state
+        if (activityStage == 1) {
             document.title = `七月在线年终大回馈，人气好课免费学，精品课程1分抢！`
-        }else{
+        } else {
             document.title = `七月在线年终大回馈，人气好课免费学，精品课程1分抢！`
         }
     }
@@ -33,6 +33,8 @@ class YarnWish extends Component {
                 this.setState({
                     list: JSON.stringify(data) === '{}' ? [] : data
                 })
+            } else if (code === 4030) {
+                this.props.history.push('/passport/login')
             }
         })
     }
@@ -116,7 +118,8 @@ class YarnWish extends Component {
                                                         </div>
                                                         <div className="price">
                                                             {item.type == 2 ? '到手最低:¥' : '¥'}
-                                                            <span className="new-price">{item.type == 4?'0.01':item.price2}</span>
+                                                            <span
+                                                                className="new-price">{item.type == 4 ? '0.01' : item.price2}</span>
                                                             <span className="old-price"> 现价：<s>¥{item.price1}</s></span>
                                                         </div>