Merge branch '00'

src/App.js

@@ -157,6 +157,12 @@ class App extends Component {
 
         if (code && !oid) {
 
+            //针对2019双旦活动特殊处理，活动结束后删掉
+            //treasure_code=3538333139312c31&origin=2&aa=bb&code=0211aiYB1VVOL60rmWWB1367YB11aiY7&state=STATE
+            if(getParam('treasure_code') == '3538333139312c31' && code == '0211aiYB1VVOL60rmWWB1367YB11aiY7'){
+                return
+            }
+
             http.get(`${API['home']}/m/wx_loginInfo/code/${code}?redirect=${encodeURIComponent(window.location.href)}`)
                 .then(res => {
                     let data = res.data

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

@@ -166,11 +166,18 @@ class LiveRoom extends Component {
                           <span onClick={ ()=>this.subscribe(item.live_id)} className="order__btn">立即预约</span>
                         )
                       }
+
+                      {
+                        item.is_end == 1 && item.transcribe_url=='' && (
+                          <span className="order__btn live__end">已结束</span>
+                        )
+                      }
+
                       {
                         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/LiveRoom/index.scss

@@ -91,6 +91,10 @@
       .subscribed {
         background: rgba(254, 228, 29, 1);
       }
+      .live__end{
+        background: rgba(82, 92, 101, .3);
+        color: #fff;
+      }
       .living {
         background: rgba(0, 153, 255, 1);
         color: #fff;