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

@@ -101,5 +101,16 @@
                 border-bottom: none;
             }
         }
+
+        a {
+            display: block;
+            height: 100%;
+            width: 100%;
+            color: #000;
+
+            &:visisted {
+                color: #000;
+            }
+        }
     }
 }
\ No newline at end of file

@@ -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 {

@@ -45,13 +45,6 @@ a {
     text-decoration: none;
     outline: none;
     color: #000;
-
-    &:link,
-    &:visted,
-    &:hover,
-    &:active {
-        color: #000;
-    }
 }
 
 *:focus {

@@ -52,16 +52,22 @@
 
         li {
             float: left;
-            height: 68rem / $pxConvertRem;
-            line-height: 68rem / $pxConvertRem;
-            font-size: 28rem / $pxConvertRem;
-            height: 68rem / $pxConvertRem;
-            line-height: 38rem / $pxConvertRem;
             margin-right: 20rem / $pxConvertRem;
             margin-bottom: 20rem / $pxConvertRem;
+        }
+
+        a {
+            display: block;
+            height: 68rem / $pxConvertRem;
+            line-height: 68rem / $pxConvertRem;
             padding: 0 20rem / $pxConvertRem;
+            font-size: 28rem / $pxConvertRem;
             background: #f8f8f8;
             color: #000;
+
+            &:visited {
+                color: #000;
+            }
         }
 
         .clear-history {

@@ -49,6 +49,11 @@
             border-top: 1px solid #e6e6e6;
             font-size: 17px;
             background: #fff;
+            color: #000;
+
+            &:visisted {
+                color: #000;
+            }
         }
 
         .brand-thumb {

 {{> layout/header}}
 <div class="guang-list-page guang-page yoho-page">
     {{# guang}}
-        <div class="swiper-container">
-            <div class="swiper-wrapper">
-                {{# swiper}}
-                    <div class="swiper-slide">
-                        <a href="{{url}}">
-                            <img class="swiper-lazy" data-src="{{img}}">
-                        </a>
-                        <div class="swiper-lazy-preloader"></div>
-                    </div>
-                {{/ swiper}}
+        {{#if swiper}}
+            <div class="swiper-container">
+                <div class="swiper-wrapper">
+                    {{# swiper}}
+                        <div class="swiper-slide">
+                            <a href="{{url}}">
+                                <img class="swiper-lazy" data-src="{{img}}">
+                            </a>
+                            <div class="swiper-lazy-preloader"></div>
+                        </div>
+                    {{/ swiper}}
+                </div>
+                <div class="swiper-pagination"></div>
             </div>
-            <div class="swiper-pagination"></div>
-        </div>
+        {{/if}}
 
         <ul id="guang-nav" class="guang-nav clearfix">
             {{# navs}}

 {{> 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