返场

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

@@ -66,7 +66,7 @@ class LiveRoom extends Component {
         }
       });
     }
-    
+
   }
   // 已预约 给提示
   tip = () => {
@@ -88,7 +88,7 @@ class LiveRoom extends Component {
       this.toLogin();
     }else{
       const vCourseId = url.split('/')[0];
-      history.push(`/play/video?id=${vCourseId}`)
+      window.location.href = `/play/video?id=${vCourseId}`
     }
   }
   // 关闭弹框
@@ -140,7 +140,7 @@ class LiveRoom extends Component {
             </CommonPopup>
           )
         }
-        
+
         <CommonContainer title='大咖直播' id="year-live">
           <ul className='live__list'>
             {
@@ -177,7 +177,7 @@ class LiveRoom extends Component {
                         item.on_live == 0 && item.is_end == 0 && item.is_subscribe == 1 && (
                           <span onClick={this.tip} className="order__btn subscribed">已预约</span>
                         )
-                      }                      
+                      }
                       {
                         item.on_live == 1 && item.is_end == 0 && (
                           <span onClick={()=>this.toLivingRoom(item.room_url)} className="order__btn living">正在直播</span>

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

@@ -610,7 +610,6 @@ class YearCourse extends Component {
             <div className={'year-index-course'}>
 
                 {/*浮框*/}
-
                 {
                     Number(treasureStage) === 1 &&
                     <div className='nav-right'>

src/components/activity/newyear-2019/preheat/YearCourse/index.scss

@@ -417,7 +417,11 @@
     }
   }
   .nav-right-wish {
-
+    background-image: url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/fanc-bx.png");
+    .nav-right__link{
+      top: 60px;
+      left: 10px;
+    }
   }
 
 }
\ No newline at end of file

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

@@ -136,6 +136,16 @@ export default class index extends Component {
                     activity_stage: data.activity_stage,
                     treasure_stage: data.treasure_stage
                 })
+
+                if(data.activity_stage == 3){
+                    this.setState({
+                        banner: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_banner_fc.png',
+                    })
+                } else {
+                    this.setState({
+                        banner: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_banner_bj%402x.png',
+                    })
+                }
             } else {
                 Toast.info(msg, 2)
             }