修复店铺bug

@@ -145,12 +145,12 @@ function getPageGoods(info) {
 }
 }
 
 
 function getParam(req) {
 function getParam(req) {
-    if (shopId) {
-        req.data.shop_id = shopId;
-    }
-
     if (brand) {
     if (brand) {
         req.data.brand = brand;
         req.data.brand = brand;
+    } else {
+        if (shopId) {
+            req.data.shop_id = shopId;
+        }
     }
     }
 }
 }
 
 
@@ -463,11 +463,11 @@ function search(opt) {
     });
     });
 
 
     if (brand) {
     if (brand) {
-        setting.brand = brand;
-    }
-
-    if (shopId) {
-        setting.shop_id = shopId;
+        req.data.brand = brand;
+    } else {
+        if (shopId) {
+            req.data.shop_id = shopId;
+        }
     }
     }
 
 
     searching = true;
     searching = true;

@@ -466,19 +466,43 @@
             &:first-child {
             &:first-child {
                 border-left: none;
                 border-left: none;
             }
             }
+
+            a {
+                display: block;
+                box-sizing: border-box;
+                text-align: center;
+                width: 100%;
+                height: 100%;
+                color: #999;
+            }
         }
         }
+
         .active .cur {
         .active .cur {
             color: #000;
             color: #000;
         }
         }
-        
+
         .active a {
         .active a {
             color: #000;
             color: #000;
         }
         }
-        
-        .iconfont {
+
+
+        .new .iconfont {
+            transform: scale(0.8);
             font-weight: bold;
             font-weight: bold;
         }
         }
-    }
 
 
- 
+        .price .iconfont {
+            transform: scale(0.8);
+            font-weight: bold;
+        }
+
+        .filter .iconfont {
+            font-size: 22px;
+            transition: transform 0.1 ease-in;
+        }
+
+        .filter.active .iconfont {
+            transform: rotate(-180deg);
+        }
+    }
 }
 }