Merge branch '00' into pre

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

@@ -264,8 +264,7 @@ class Landing extends Component {
         const {data} = res.data
         return data.url
       }).then(text => {
-      //todo 使用线上二维码
-      QRCode.toDataURL('http://m.julyedu.com')
+      QRCode.toDataURL(text)
         .then(url => {
           Popup({
             title: '提醒服务',
@@ -275,8 +274,7 @@ class Landing extends Component {
               <div className="des">{type === 'create' ? '有好友加入队伍后第一时间通知我~' : '获得宝箱时第一时间通知我~'}</div>
               <img src={url} alt=""/>
               {browser.isAndroidApp ? <div>
-                //todo 使用线上二维码
-                <button className={'android-qr-code-btn'} onClick={this.saveImage.bind(this, 'http://m.julyedu.com')}>保存二维码</button>
+                <button className={'android-qr-code-btn'} onClick={this.saveImage.bind(this, text)}>保存二维码</button>
               </div> : null}
               <div className="des">长按识别/扫码 关注【七月在线】服务号即可预约</div>
             </div>,

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

@@ -51,7 +51,7 @@ class LiveRoom extends Component {
             this.setState({
               showMark: true,
               subUrl: url,
-              QRCodeUrl: url,
+              QRCodeUrl: data.url,
             })
           })
         } else {