Merge branch '00'

src/components/activity/newyear-2019/box-container/box-container.scss

 .box-container {
     position: relative;
-    background: #327443;
+    background: #327443 url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/PC/sd_nr_bj2.png") repeat-y;
+    background-size: 100% auto;
     padding: 14px 0;
 
     .image-box {
         height: 100%;
-        background: url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/PC/sd_nr_bj2.png") repeat-y;
-        background-size: 100% auto;
+
     }
 
     @mixin common-deco($bg) {

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

@@ -39,6 +39,12 @@ class Landing extends Component {
     this.fetchPageData()
     window.showFollowAlert = this.remind.bind(this, 'create')
     document.title = '七月在线年终大回馈，幸运宝箱随你开，100%有奖！'
+    const landing = document.querySelector('#landing')
+    const boxContainer = document.querySelector('.box-container')
+    if(boxContainer.offsetHeight < window.innerHeight){
+      landing.style.minHeight = `${window.innerHeight}px`
+      boxContainer.style.minHeight = `${window.innerHeight}px`
+    }
   }
 
   componentDidUpdate(prevProps) {
@@ -397,7 +403,8 @@ class Landing extends Component {
         lack_member,
         team_num,
         prize_info,
-        my_team
+        my_team,
+        standby_plan
       },
       activityEnd,
       isCaptain
@@ -409,14 +416,23 @@ class Landing extends Component {
     * 3-已加入当前队伍
     * 4-已加入别的队伍
     * */
-
     return (
       <div id={'landing'}>
-        <div id="to-square">
-          <a href='javascript:' onClick={this.toSquare}>前往活动会场，享更多福利！ >></a>
-        </div>
+        {
+          !(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 && browser.isWeixin ? 'standby' : ''}`}/>
+          {
+            standby_plan && browser.isWeixin &&
+            <>
+              <WhiteSpace className={'standby-space'}/>
+              <div className={'standby-tip'}>点击右上角，选择“在浏览器打开”</div>
+            </>
+          }
           <img className='main-avatar'
                src={head_img} alt=""/>
           {
@@ -474,9 +490,12 @@ class Landing extends Component {
                 <div className="group-des">
                   还差 {lack_member} 名队员即可获得当前宝箱哦~
                 </div>
-                <button type='button' className={'invite-btn'} onClick={this.showShareTip}>
-                  邀请好友加入队伍
-                </button>
+                {
+                  !(standby_plan && browser.isWeixin) &&
+                  <button type='button' className={'invite-btn'} onClick={this.showShareTip}>
+                    邀请好友加入队伍
+                  </button>
+                }
               </>
             }
             {
@@ -491,14 +510,14 @@ class Landing extends Component {
                   }
                 </div>
                 {
-                  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'])}>
                       继续组队
                     </button>
                     : <button type='button' className={'invite-btn'} onClick={this.createMyTeam}>
                       创建我的队伍
-                    </button>
+                    </button>)
                 }
               </>
             }
@@ -514,14 +533,14 @@ class Landing extends Component {
                   }
                 </div>
                 {
-                  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'])}>
                       继续组队
                     </button>
                     : <button type='button' className={'invite-btn'} onClick={this.createMyTeam}>
                       创建我的队伍
-                    </button>
+                    </button>)
                 }
               </>
             }

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

@@ -17,6 +17,7 @@
 #landing {
     background: #BC2A18;
     text-align: center;
+    min-height: 100%;
 
     #to-square {
         position: fixed;
@@ -43,6 +44,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 {
@@ -50,7 +55,7 @@
         height: 49px;
         border-radius: 50%;
         margin-bottom: 5px;
-        margin-top: 37.5px;
+        margin-top: 55px;
         object-fit: cover;
     }
 
@@ -69,6 +74,35 @@
         }
     }
 
+    .standby-space {
+        height: 25px;
+    }
+
+    .standby-tip {
+        position: relative;
+        width: 270px;
+        height: 32px;
+        background: #FFDE00;
+        border-radius: 5px;
+        margin: 0 auto -40px;
+        line-height: 32px;
+        text-align: center;
+        color: #202426;
+        font-size: 15px;
+
+        &::after {
+            content: '';
+            display: block;
+            position: absolute;
+            top: -120%;
+            right: -6%;
+            width: 50px;
+            height: 38px;
+            background: url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/standby-share-tip-icon.png");
+            background-size: contain;
+        }
+    }
+
 
     .group {
         ul.member {

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

@@ -102,6 +102,7 @@ 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);
         } else {
           window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code + '&version='+ getParam('version'));