Merge branch '00' into dev

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

@@ -289,8 +289,7 @@ class Landing extends Component {
         const {data} = res.data
         return data.url
       }).then(text => {
-      //todo text
-      QRCode.toDataURL('m.julyedu.com')
+      QRCode.toDataURL('text')
         .then(url => {
           Popup({
             title: '提醒服务',
@@ -546,7 +545,7 @@ class Landing extends Component {
               </>
             }
             {
-              status === 2 && !activityEnd && < button type='button' className={'invite-btn'} onClick={this.joinTeam}>
+              !(standby_plan && browser.isWeixin) && status === 2 && !activityEnd && < button type='button' className={'invite-btn'} onClick={this.joinTeam}>
                 同意加入队伍
               </button>
             }

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

@@ -102,7 +102,6 @@ class TeamInfo extends Component {
         // 直接跳转
 
         if (!getParam('version')) {
-          //todo 域名
           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 {