Merge branch '00' of gitlab.julyedu.com:baiguangyao/mr-julyedu into dev

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/landing/index.js

@@ -289,7 +289,7 @@ class Landing extends Component {
         const {data} = res.data
         return data.url
       }).then(text => {
-      QRCode.toDataURL('text')
+      QRCode.toDataURL(text)
         .then(url => {
           Popup({
             title: '提醒服务',
@@ -372,11 +372,10 @@ class Landing extends Component {
   }
 
   requiredLogin = () => {
-    const {history, user} = this.props
-
+    const {history, user, location} = this.props
     if (user.hasError) {
       if (browser.isWeixin) {
-        window.location.assign(`https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=${encodeURIComponent(window.location.href + '&aa=bb')}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`)
+        window.location.assign(`https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=${encodeURIComponent(`${window.location.origin}${location.pathname}?treasure_code=${getParam('treasure_code')}&origin=${getParam('origin')}&aa=bb`)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`)
       } else {
         history.push('/passport')
       }

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: #999;
+        color: #fff;
+      }
       .living {
         background: rgba(0, 153, 255, 1);
         color: #fff;

src/components/activity/newyear-2019/treasure-box/team.js

@@ -102,8 +102,8 @@ class TeamInfo extends Component {
         // 直接跳转
 
         if (!getParam('version')) {
-          this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
-          // window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
+          // this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
+          window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
         } else {
           window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code + '&version='+ getParam('version'));
         }