Merge branch 'syangby' into dev

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

@@ -276,7 +276,7 @@ class Landing extends Component {
   }
 
 
-  remind = (type = 'create', trearemindsure_code, origin = 1) => {
+  remind = (type = 'create', treasure_code, origin = 1) => {
     const {user} = this.props
     http.get(`${API["base-api"]}/wx/user_temporary_qrcode/${user.data.uid}`)
       .then(res => {
@@ -414,15 +414,15 @@ class Landing extends Component {
     return (
       <div id={'landing'}>
         {
-          !standby_plan &&
+          !(standby_plan && browser.isWeixin) &&
           <div id="to-square">
             <a href='javascript:' onClick={this.toSquare}>前往活动会场，享更多福利！ >></a>
           </div>
         }
         <BoxContainer>
-          <i className="snow-deco"/>
+          <i className={`snow-deco ${standby_plan ? 'standby' : ''}`}/>
           {
-            standby_plan &&
+            standby_plan && browser.isWeixin &&
             <>
               <WhiteSpace className={'standby-space'}/>
               <div className={'standby-tip'}>点击右上角，选择“在浏览器打开”</div>
@@ -486,7 +486,7 @@ class Landing extends Component {
                   还差 {lack_member} 名队员即可获得当前宝箱哦~
                 </div>
                 {
-                  !standby_plan &&
+                  !(standby_plan && browser.isWeixin) &&
                   <button type='button' className={'invite-btn'} onClick={this.showShareTip}>
                     邀请好友加入队伍
                   </button>
@@ -505,7 +505,7 @@ class Landing extends Component {
                   }
                 </div>
                 {
-                  !standby_plan && (my_team['is_team'] ?
+                  !(standby_plan && browser.isWeixin) && (my_team['is_team'] ?
                     <button type='button' className={'invite-btn'}
                             onClick={this.inviteMembers.bind(this, my_team['treasure_code'])}>
                       继续组队
@@ -528,7 +528,7 @@ class Landing extends Component {
                   }
                 </div>
                 {
-                  !standby_plan && (my_team['is_team'] ?
+                  !(standby_plan && browser.isWeixin) && (my_team['is_team'] ?
                     <button type='button' className={'invite-btn'}
                             onClick={this.inviteMembers.bind(this, my_team['treasure_code'])}>
                       继续组队

src/components/activity/newyear-2019/landing/landing.scss

@@ -43,6 +43,10 @@
         height: 68px;
         background: url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/snow-deco.png") no-repeat;
         background-size: contain;
+
+        &.standby{
+            top: 0;
+        }
     }
 
     .main-avatar {
@@ -70,7 +74,7 @@
     }
 
     .standby-space{
-        height: 55px;
+        height: 25px;
     }
 
     .standby-tip {
@@ -79,7 +83,7 @@
         height: 32px;
         background: #FFDE00;
         border-radius: 5px;
-        margin: 0 auto;
+        margin: 0 auto -20px;
         line-height: 32px;
         text-align: center;
         color: #202426;