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

@@ -3,7 +3,6 @@
  * @author: xuqi<qi.xu@yoho.cn>
  * @date: 2015/10/20
  */
-
 var $ = require('yoho.zepto'),
     Swiper = require('yoho.iswiper'),
     lazyLoad = require('yoho.zeptolazyload');

@@ -2,7 +2,7 @@
     position: absolute;
     left: 0;
     right: 0;
-    top: 0;
+    top: 2px;
 }
 
 .filter-mask {

 .good-info {
     float: left;
-    width: 44%;
+    width: 46.4%;
     height: 486rem / $pxConvertRem;
-    margin: 28rem / $pxConvertRem 3% 0;
+    margin: 28rem / $pxConvertRem 0 0 2.4%;
 
 
     .tag-container {

@@ -24,6 +24,10 @@ $clothes: sprite-map("guang/clothes/*.png");
 }
 
 .guang-detail-page {
+    #wrapper {
+        background: #f0f0f0;
+    }
+    
     #wrapper.ios {
         position: absolute;
         top: 0;

@@ -73,6 +73,7 @@
 
     .info-list-container {
         overflow-x: hidden;
+        background: #f0f0f0;
     }
 
     .info-list.hide {

@@ -29,8 +29,8 @@
     }   
 } */
 .home-header {
-    height: 88rem / $pxConvertRem;
-    line-height: 88rem / $pxConvertRem;
+    height: 90rem / $pxConvertRem;
+    line-height: 90rem / $pxConvertRem;
     @include background-image(linear-gradient(#323232, #414141));
     position: relative;
     .iconfont {

@@ -14,16 +14,18 @@
         border-right: 1px solid #e0e0e0;
         border-top: 1px solid #e0e0e0;
         overflow: hidden;
+        background: #fff;
 
         .brand-logo {
-            width: 100%;
+            display: table-cell;
+            width: 3.95rem;
             height: 128rem / $pxConvertRem;
             line-height: 128rem / $pxConvertRem;
             text-align: center;
             font-size: 0;
+            vertical-align: middle;
 
             img {
-                vertical-align: middle;
                 max-width: 100%;
                 max-height: 100%;
             }
@@ -52,6 +54,7 @@
         width: 317rem / $pxConvertRem;
         height: 174rem / $pxConvertRem;
         border-top: 1px solid #e0e0e0;
+        background: #fff;
         
         a {
             display: block;
@@ -68,7 +71,7 @@
     background: #fff;
     width: 100%;
     height: 140rem / $pxConvertRem;
-    margin-bottom: 28rem / $pxConvertRem;
+    // margin-bottom: 28rem / $pxConvertRem;
     border-top: 1px solid #e0e0e0;
     overflow: hidden;
 

@@ -30,11 +30,11 @@
 
         .nav-icon, .nav-img {
             position: absolute;
-            width: 60rem / $pxConvertRem;
-            height: 60rem / $pxConvertRem;
+            width: 48rem / $pxConvertRem;
+            height: 48rem / $pxConvertRem;
             top: 50%;
-            margin-top: -30rem / $pxConvertRem;
-            left: 24rem / $pxConvertRem;
+            margin-top: -24rem / $pxConvertRem;
+            left: 30rem / $pxConvertRem;
         }
 
         .enter-subnav {

@@ -4,8 +4,8 @@
     color: #fff;
     width: 100%;
     overflow: hidden;
-    height: 88rem / $pxConvertRem;
-    line-height: 88rem / $pxConvertRem;
+    height: 90rem / $pxConvertRem;
+    line-height: 90rem / $pxConvertRem;
 
     &.boys {
         @include background-image(linear-gradient(#323232, #414141));

 .discount-page {
-    background-color: #f0f0f0;
+    background-color: #fff;
 
      .swiper-container {
         width: 100%;
@@ -32,6 +32,7 @@
     }
   
     .list-nav {
+        border:1px solid #e6e6e6;
         > li {
             float: left;
             width: 25%;
@@ -50,9 +51,14 @@
         }
 
         .active > a {
-            border-bottom: 2px solid #000;
             color: #000;
-
+            .spanTest{
+                width: auto;
+                height: 100%;
+                border-bottom: 2px solid #000;
+                display: inline-block;
+                box-sizing:border-box;
+            }
             .iconfont {
                 color: #999;
 

@@ -3,7 +3,7 @@
 
      .swiper-container {
         width: 100%;
-        height: 240rem / $pxConvertRem;
+        height: 200rem / $pxConvertRem;
 
         img {
             height: 100%;
@@ -23,7 +23,7 @@
   
     .banner-top-single{
         width: 100%;
-        height: 240rem / $pxConvertRem;
+        height: 200rem / $pxConvertRem;
         img {
            display: block;
            height: 100%;

@@ -7,13 +7,13 @@
            <ul id="list-nav" class="list-nav clearfix">
             <li class="new active">
                 <a href="javascript:void(0);">
-                    最新
+                    <span class="spanTest">最新</span>
                     <span class="iconfont cur">&#xe616;</span>
                 </a>
             </li>
             <li class="price">
                 <a href="javascript:void(0);">
-                    价格
+                    <span class="spanTest">价格</span>
                     <span class="icon">
                         <i class="iconfont up">&#xe615;</i>
                         <i class="iconfont down cur">&#xe616;</i>
@@ -22,7 +22,7 @@
             </li>
             <li class="discount">
                 <a href="javascript:void(0);">
-                    折扣
+                    <span class="spanTest">折扣</span>
                     <span class="icon">
                         <i class="iconfont up">&#xe615;</i>
                         <i class="iconfont down cur">&#xe616;</i>
@@ -31,7 +31,7 @@
             </li>
             <li class="filter">
                 <a href="javascript:void(0);">
-                    筛选
+                    <span class="spanTest">筛选</span>
                     <span class="iconfont">&#xe613;</span>
                 </a>
             </li>

@@ -48,7 +48,7 @@ class SideModel
                 $result[$key]['textEn'] = $value['sort_name_en'];
                 $result[$key]['styleClass'] = strtolower($value['sort_name_en']);
                 $result[$key]['url'] = Helpers::getFilterUrl($value['sort_url']);
-                $result[$key]['img'] = Helpers::getImageUrl($value['sort_ico'], 60, 60);
+                $result[$key]['img'] = Helpers::getImageUrl($value['sort_ico'], 60, 60, 1);
             }
         }