Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -10,7 +10,7 @@
     position: relative;
     z-index: 2;
     background: #f0f0f0;
-    @include transition(transform .3s  ease-out);
+    @include transition(transform .3s);
 }
 
 .mobile-wrap.menu-open {
@@ -27,7 +27,7 @@
     bottom: 0;
     background: #000;
     opacity: 0;
-    z-index: 99;
+    z-index: 4;
     @include transition(opacity 1s);
 }
 

 .side-nav {
-    display: block;
+    display: none;
     background: #fff;
     position: fixed;
     top: 0;
     bottom: 0;
-    left: -540rem / $pxConvertRem;
-    right: 640rem / $pxConvertRem;
+    left: 0;
+    right: 100rem / $pxConvertRem;
     width: 540rem / $pxConvertRem;
-    z-index: -1;
+    z-index: 1;
     overflow: hidden;
     @include transition(all .3s);
 
@@ -107,9 +107,7 @@
 }
 
 .side-nav.on {
-    left: 0;
-    right: 100rem / $pxConvertRem;
-    z-index: 3;
+    display: block;
 }
 
 .sub-nav {

 {{> layout/header}}
-    <div class="mobile-wrap boys-wrap yoho-page">
-         {{! 首页header}}
-        {{# homeHeader}}
-            {{> home/home_header}}
-        {{/ homeHeader}}
+    <div class="mobile-container">
+        <div class="mobile-wrap boys-wrap yoho-page">
+             {{! 首页header}}
+            {{# homeHeader}}
+                {{> home/home_header}}
+            {{/ homeHeader}}
 
-        {{> home/content}}
-        
-        {{! 商品列表}}
-        {{# twoColumnGoods}}
-            {{> home/two_column_goods}}
-        {{/ twoColumnGoods}}
+            {{> home/content}}
+            
+            {{! 商品列表}}
+            {{# twoColumnGoods}}
+                {{> home/two_column_goods}}
+            {{/ twoColumnGoods}}
 
-        <div class="overlay"></div>
-        {{> layout/footer_tab}}
+            <div class="overlay"></div>
+            {{> layout/footer_tab}}
+        </div>
+        {{> home/side_nav}}
     </div>
-    {{> home/side_nav}}
 {{> layout/footer}}
\ No newline at end of file

 {{> layout/header}}
+<div class="mobile-container">
     <div class="mobile-wrap girls-wrap yoho-page">
         {{! 首页header}}
         {{# homeHeader}}
@@ -11,4 +12,5 @@
         {{> layout/footer_tab}}
     </div>
     {{> home/side_nav}}
+</div>    
 {{> layout/footer}}

 {{> layout/header}}
- 
+<div class="mobile-container"> 
     <div class="mobile-wrap kids-wrap yoho-page">
         {{! 首页header}}
         {{# homeHeader}}
@@ -22,4 +22,5 @@
         {{> layout/footer_tab}}
     </div>
     {{> home/side_nav}}
+</div>    
 {{> layout/footer}}

 {{> layout/header}}
+<div class="mobile-container">
      <div class="mobile-wrap lifestyle-wrap yoho-page">
         {{! 首页header}}
         {{# homeHeader}}
@@ -20,4 +21,5 @@
         {{> layout/footer_tab}}
     </div>
     {{> home/side_nav}}
+</div>    
 {{> layout/footer}}
\ No newline at end of file