Merge branch '00'

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

@@ -545,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/landing/landing.scss

@@ -195,7 +195,7 @@
         }
 
         .certainly-prompt {
-            margin-top: -43px;
+            margin-top: 27px;
             padding-bottom: 16px;
             font-size: 14px;
             color: #FFE300;