Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -11,7 +11,7 @@
                         </div>
                         <div class="brand-info" data-id="{{brandId}}">
                             <div class="brand-icon">
-                                <img src="{{image brandIco 145 126}}" alt="">
+                                <img src="{{image brandIco 145 126}}" alt="" width="145" height="126">
                             </div>
                             <div class="brand-name">
                                 {{brandName}}

@@ -26,7 +26,8 @@
                             {{/stateText}}
                         </div>
                         <div class="desc">
-                            <span class="name">{{productName}}</span>
+                            <div class="brand-name">{{brandName}}</div>
+                            <div class="product-name">{{productName}}</div>
                             <p class="price">¥{{round salesPrice 2}}</p>
                         </div>
 

@@ -33,7 +33,7 @@
     }
 
     &.cur .icon-round {
-        color: #1d1d1d;
+        color: #1b1b1b;
         font-weight: bold;
     }
 }

 .favorite-products {
-
     margin-top: 20px;
 
     .products-cates {
-
         font-size: 14px;
         background-color: #eee;
 
@@ -14,7 +12,6 @@
             a {
                 color: #bbb;
             }
-
         }
 
         .label.focus {
@@ -28,7 +25,6 @@
     }
 
     .product-list {
-
         margin: 0 -10px;
         padding-bottom: 30px;
         border-bottom: 1px solid #eee;
@@ -86,13 +82,28 @@
                 padding: 0 15px;
             }
 
+            .brand-name {
+                padding: 10px 0;
+                font-size: 14px;
+                font-weight: 700;
+            }
+
+            .product-name {
+                padding: 5px 0;
+                font-size: 14px;
+            }
+
+            .price {
+                padding: 13px;
+                font-size: 14px;
+            }
+
             .thumb {
                 width: 216px;
                 height: 293px;
             }
 
             .tool-area {
-
                 text-align: center;
                 margin-top: 15px;
                 height: 26px;
@@ -103,7 +114,6 @@
                     color: #666;
                     border-color: #666;
                 }
-
             }
         }
 
@@ -122,5 +132,4 @@
             }
         }
     }
-
 }