Merge branch 'bugfix' into develop

@@ -31,7 +31,7 @@ lazyLoad($('img.lazy'));
 $('.nav-btn').on('tap', function (event) {
 $('.nav-btn').on('tap', function (event) {
     if (!$(this).hasClass('menu-open')) {
     if (!$(this).hasClass('menu-open')) {
         $('.mobile-wrap').addClass('menu-open');
         $('.mobile-wrap').addClass('menu-open');
-        $('.overlay').addClass('show');
+        $('.overlay').show().css('opacity', 0.3);
         $('.side-nav').addClass('on');
         $('.side-nav').addClass('on');
 
 
         //设置boy高宽，页面不能上下滑动
         //设置boy高宽，页面不能上下滑动
@@ -48,13 +48,16 @@ $('.nav-btn').on('tap', function (event) {
 $('.mobile-wrap').on('tap', function () {
 $('.mobile-wrap').on('tap', function () {
     if ($(this).hasClass('menu-open')) {
     if ($(this).hasClass('menu-open')) {
         $('.mobile-wrap').removeClass('menu-open');
         $('.mobile-wrap').removeClass('menu-open');
-        $('.overlay').removeClass('show');
+        $('.overlay').css('opacity', 0);
         $('.sub-nav').removeClass('show');
         $('.sub-nav').removeClass('show');
         $('.side-nav').removeClass('on');
         $('.side-nav').removeClass('on');
         $('body').css({
         $('body').css({
             height: 'auto',
             height: 'auto',
             overflow: 'auto'
             overflow: 'auto'
         });
         });
+        setTimeout(function() {
+            $('.overlay').hide();
+        }, 300);
     }
     }
 });
 });
 
 

@@ -31,7 +31,7 @@
     }
     }
 
 
     .plus-star-row {
     .plus-star-row {
-        margin-bottom: 10rem / $pxConvertRem;
+        margin-bottom: 30rem / $pxConvertRem;
 
 
         &:last-child {
         &:last-child {
             margin-bottom: 0;
             margin-bottom: 0;

@@ -10,12 +10,11 @@
     position: relative;
     position: relative;
     z-index: 2;
     z-index: 2;
     background: #f0f0f0;
     background: #f0f0f0;
-    @include transition(transform .3s);
+    @include transition(transform .3s  ease-out);
 }
 }
 
 
 .mobile-wrap.menu-open {
 .mobile-wrap.menu-open {
     @include transform(translateX(540rem / $pxConvertRem));
     @include transform(translateX(540rem / $pxConvertRem));
-    @include transition(transform .3s);
 }
 }
 
 
 
 
@@ -27,10 +26,12 @@
     right: 0;
     right: 0;
     bottom: 0;
     bottom: 0;
     background: #000;
     background: #000;
-    opacity: 0.3;
+    opacity: 0;
     z-index: 99;
     z-index: 99;
+    @include transition(opacity 1s);
 }
 }
 
 
 .overlay.show {
 .overlay.show {
     display: block;
     display: block;
+    opacity: 0.3;
 }
 }

 .side-nav {
 .side-nav {
-    display: none;
+    // display: none;
     background: #fff;
     background: #fff;
     position: fixed;
     position: fixed;
     top: 0;
     top: 0;
@@ -8,6 +8,8 @@
     left: 0;
     left: 0;
     z-index: 1;
     z-index: 1;
     overflow: hidden;
     overflow: hidden;
+    @include transform(translateX(-540rem / $pxConvertRem));
+    @include transition(all .3s ease-out);
 
 
     ul {
     ul {
         background: #f0f0f0;
         background: #f0f0f0;
@@ -103,20 +105,22 @@
 }
 }
 
 
 .side-nav.on {
 .side-nav.on {
-    display: block;
+    // display: block;
+    @include transform(translateX(0rem / $pxConvertRem));
 }
 }
 
 
 .sub-nav {
 .sub-nav {
+    // display: none;
     position: fixed;
     position: fixed;
     top: 0;
     top: 0;
     right: 100rem / $pxConvertRem;
     right: 100rem / $pxConvertRem;
     left: 0;
     left: 0;
     bottom: 0;
     bottom: 0;
+    width: 100%;
     background: #fff !important;
     background: #fff !important;
-    z-index: 2;
-
-    @include transform(translateX(100%));
+    // z-index: 2;
 
 
+    @include transform(translateX(540rem / $pxConvertRem));
     @include transition(transform 0.3s);
     @include transition(transform 0.3s);
 
 
     li {
     li {

@@ -15,7 +15,7 @@
         text-align: center;
         text-align: center;
         color: #b0b0b0;
         color: #b0b0b0;
         &.current {
         &.current {
-            color: #5e4b3c;
+            color: #414141;
         }
         }
     }
     }
     .tab-icon {
     .tab-icon {
@@ -27,4 +27,36 @@
         font-size: 20rem / $pxConvertRem;
         font-size: 20rem / $pxConvertRem;
         line-height: 1;
         line-height: 1;
     }
     }
+}
+
+.boys-wrap {
+    .footer-tab {
+        .tab-item.current {
+            color: #414141;
+        }
+    }
+}
+
+.girls-wrap {
+    .footer-tab {
+        .tab-item.current {
+            color: #FF88AE;
+        }
+    }
+}
+
+.kids-wrap {
+    .footer-tab {
+        .tab-item.current {
+            color: #7ad9f9;
+        }
+    }
+}
+
+.lifestyle-wrap {
+    .footer-tab {
+        .tab-item.current {
+            color: #4f4138;
+        }
+    }
 }
 }

@@ -13,7 +13,7 @@
         {{/ twoColumnGoods}}
         {{/ twoColumnGoods}}
 
 
         <div class="overlay"></div>
         <div class="overlay"></div>
+        {{> layout/footer_tab}}
     </div>
     </div>
     {{> home/side_nav}}
     {{> home/side_nav}}
-{{> layout/footer_tab}}
 {{> layout/footer}}
 {{> layout/footer}}

@@ -8,7 +8,7 @@
         {{> home/content}}
         {{> home/content}}
  
  
         <div class="overlay"></div>
         <div class="overlay"></div>
+        {{> layout/footer_tab}}
     </div>
     </div>
     {{> home/side_nav}}
     {{> home/side_nav}}
-{{> layout/footer_tab}}
 {{> layout/footer}}
 {{> layout/footer}}

@@ -19,7 +19,7 @@
         {{/ bannerBottom}}
         {{/ bannerBottom}}
  
  
         <div class="overlay"></div>
         <div class="overlay"></div>
+        {{> layout/footer_tab}}
     </div>
     </div>
     {{> home/side_nav}}
     {{> home/side_nav}}
-{{> layout/footer_tab}}
 {{> layout/footer}}
 {{> layout/footer}}

@@ -17,7 +17,7 @@
             {{> home/banner_bottom}}
             {{> home/banner_bottom}}
         {{/ bannerBottom}}
         {{/ bannerBottom}}
         <div class="overlay"></div>
         <div class="overlay"></div>
+        {{> layout/footer_tab}}
     </div>
     </div>
     {{> home/side_nav}}
     {{> home/side_nav}}
-{{> layout/footer_tab}}
 {{> layout/footer}}
 {{> layout/footer}}