Merge branch 'feature/mBrandShop' of http://git.dev.yoho.cn/web/yohobuywap into feature/mBrandShop

@@ -39,8 +39,9 @@
         right: 30px;
         border-radius: 10px; 
         text-align: center;
-        background: image-url('product/collect.png') no-repeat;
+        background-image: url('/product/collect.png') no-repeat;
         background-size: contain;
+        border: 1px solid red;
     }
 
     .nav {
@@ -133,6 +134,10 @@
         padding-top: 25px;
         margin-bottom: 30px; 
         overflow: hidden; 
+
+        p {
+            font-size: 28px;
+        }
     }
 
     .multi-browse {
@@ -202,6 +207,7 @@
         padding: 0 0 30px 30px;
         overflow: hidden;
         background: #fff;
+        border-bottom: 30px solid #f0f0f0;
 
         li {
             width: 275px;
@@ -298,6 +304,26 @@
             }
         }
 
+        .list-nav {
+            .active > a {
+                color: #000;
+
+                .spanTest{
+                width: auto;
+                height: 100%;
+                display: inline-block;
+                box-sizing:border-box;
+        }
+            .iconfont {
+                color: #999;
+
+                &.cur {
+                    color: #000;
+                }
+            }
+        }
+        }
+
        .list-nav .icon .up {
                 top: -6px;
         }
@@ -310,6 +336,10 @@
             padding-top: 30px;
             padding-bottom: 100px;
         }
+
+        /*.active a{
+            
+        }*/
     }
 
     .search-area {

@@ -38,7 +38,7 @@
                 <div id="nav-main" >
                     {{#unless  brands}}
                     <div class="multi-brands">
-                        <h2>品牌一览</h2>
+                        <p>品牌一览</p>
                         <div class="multi-browse">
                             <ul class="swiper-wrapper">
                                 {{#each multiList}}