hotfix/shop

@@ -123,7 +123,7 @@ class ShopProcess
             }
             self::$shopData['spring'][$key] = array(
                 'url' => $val['data'][0]['url'],
-                'springType' => $val['data'][0]['src']
+                'springType' => str_replace('http:', '', $val['data'][0]['src'])
             );
         }
     }
@@ -178,7 +178,7 @@ class ShopProcess
             if (empty($slide['data'][0])) {
                 continue;
             }
-            self::$shopData['bannerTop']['list'][] = array('url' => $slide['data'][0]['url'], 'img' => $slide['data'][0]['src']);
+            self::$shopData['bannerTop']['list'][] = array('url' => $slide['data'][0]['url'], 'img' => str_replace('http:', '', $slide['data'][0]['src']));
         }
     }
 
@@ -192,7 +192,7 @@ class ShopProcess
     {
         self::$shopData['hotCategory']['name'] = '热门品类';
         foreach ($data as $cate) {
-            self::$shopData['hotCategory']['list'][] = array('url' => $cate['url'], 'img' => $cate['src']);
+            self::$shopData['hotCategory']['list'][] = array('url' => $cate['url'], 'img' => str_replace('http:', '', $cate['src']));
         }
     }
 

@@ -417,6 +417,8 @@ function search(opt) {
             }
         }
 
+        $listNav.children('.active').removeClass('active');
+        $pre.addClass('active');
         if (opt.id) {
             switch (opt.type) {
                 case 'shop_id':
@@ -582,11 +584,6 @@ $.ajax({
     success: function(data) {
         $goodsContainer.append(data);
 
-        setTimeout(function() {
-            myScroll.refresh();
-            scH = $('#scroller').outerHeight();
-        }, 1000);
-
         //初始化filter&注册filter回调
         filter.initFilter({
             fCbFn: search,
@@ -598,6 +595,11 @@ $.ajax({
             },
             missStatus: true
         });
+
+        setTimeout(function() {
+            myScroll.refresh();
+            scH = $('#scroller').outerHeight();
+        }, 1000);
     }
 });
 

@@ -269,6 +269,7 @@
 
     .icon {
         position: relative;
+        color: #b1b1b1;
 
         i {
             position: absolute;
@@ -285,10 +286,6 @@
         }
     }
 
-    .iconfont {
-        color: #b1b1b1;
-    }
-
     .goods-container {
         position: relative;
         min-height: 440px;
@@ -302,14 +299,11 @@
 
         .list-nav li {
             display: block;
-            height: 28px;
+            height: 78px;
             float: left;
-            line-height: 28px;
-            width: 24%;
+            line-height: 78px;
+            width: 24.8%;
             text-align: center;
-            border-left: 1px solid #e1e1e1;
-            margin-top: 30px;
-            margin-bottom: 30px;
             border-sizing: border-box;
 
             span {
@@ -319,9 +313,17 @@
             &:first-child {
                 border-left: none;
             }
+
+            b {
+                border-right: 1px solid #e1e1e1;
+                display: block;
+                width: 1px;
+                height: 28px;
+                float: right;
+                margin-top: 25px;
+        }
         }
 
- 
         .active {
             .cur {
                 color: #000;
@@ -330,21 +332,17 @@
         
 
        .list-nav .icon .up {
-                top: -6px;
+                top: -28px;
         }
 
         .list-nav .icon .down {
-                top: 8px;
+                top: -16px;
         }
 
         .goods-container {
             padding-top: 30px;
             padding-bottom: 100px;
         }
-
-        /*.active a{
-            
-        }*/
     }
 
     .search-area {
@@ -454,11 +452,8 @@
             height: 28px;
             float: left;
             line-height: 28px;
-            width: 24%;
+            width: 24.8%;
             text-align: center;
-            border-left: 1px solid #e1e1e1;
-            margin-top: 30px;
-            margin-bottom: 30px;
             border-sizing: border-box;
 
             span {
@@ -477,6 +472,15 @@
                 height: 100%;
                 color: #999;
             }
+
+            b {
+                border-right: 1px solid #e1e1e1;
+                display: block;
+                width: 1px;
+                height: 28px;
+                float: right;
+                margin-top: 25px;
+            }
         }
 
         .active .cur {

@@ -89,7 +89,7 @@ class SearchModel
 
         // 设置选定的gender
         $gender = '1,2,3';
-        if (isset($condition['gender'])) {
+        if (isset($condition['gender']) && !empty($condition['gender'])) {
             $gender = $condition['gender'];
         }