Merge branch 'bugfix' into develop

@@ -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,7 +54,8 @@
         width: 317rem / $pxConvertRem;
         height: 174rem / $pxConvertRem;
         border-top: 1px solid #e0e0e0;
-
+        background: #fff;
+        
         a {
             display: block;
             width: 100%;
@@ -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));

@@ -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%;

@@ -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);
             }
         }