Merge branch 'syangby' into dev

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) {
@@ -420,7 +426,7 @@ class Landing extends Component {
           </div>
         }
         <BoxContainer>
-          <i className={`snow-deco ${standby_plan ? 'standby' : ''}`}/>
+          <i className={`snow-deco ${standby_plan && browser.isWeixin ? 'standby' : ''}`}/>
           {
             standby_plan && browser.isWeixin &&
             <>

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;
@@ -44,7 +45,7 @@
         background: url("https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/snow-deco.png") no-repeat;
         background-size: contain;
 
-        &.standby{
+        &.standby {
             top: 0;
         }
     }
@@ -54,7 +55,7 @@
         height: 49px;
         border-radius: 50%;
         margin-bottom: 5px;
-        margin-top: 37.5px;
+        margin-top: 55px;
         object-fit: cover;
     }
 
@@ -73,7 +74,7 @@
         }
     }
 
-    .standby-space{
+    .standby-space {
         height: 25px;
     }
 
@@ -83,12 +84,13 @@
         height: 32px;
         background: #FFDE00;
         border-radius: 5px;
-        margin: 0 auto -20px;
+        margin: 0 auto -40px;
         line-height: 32px;
         text-align: center;
         color: #202426;
         font-size: 15px;
-        &::after{
+
+        &::after {
             content: '';
             display: block;
             position: absolute;