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

 {{# classicBrands}}
     <div class="brand-img-box {{#if right}}right{{/if}} {{#if bottomSpace}}mb10{{/if}}">
-        <a href="{{url}}" target="_blank">
         {{# big}}
-            <img class="big-img" src="{{image src 565 340}}" alt="big-img">
+        <a href="{{url}}" target="_blank">
+            <img class="big-img" src="{{image src 565 340}}">
+        </a>
         {{/ big}}
+
         {{# small}}
-            <img class="small-img {{#if @first}}first{{/if}}" src="{{image src 281 285}}" alt="big-img">
-        {{/ small}}
+        <a href="{{url}}" target="_blank">
+            <img class="small-img {{#if @first}}first{{/if}}" src="{{image src 281 285}}">
         </a>
+        {{/ small}}
 </div>
 {{/ classicBrands}}

@@ -15,9 +15,11 @@
                     {{/each}}
                 </ul>
                 {{#banner}}
+                    {{#if image}}
                     <a href="{{url}}">
                         <img class="banner-img" data-original="{{image banner 150 120}}">
                     </a>
+                    {{/if}}
                 {{/banner}}
             </div>
 

@@ -26,7 +26,7 @@
                         <div class="brand-products slide-container">
                             {{#if noNewProduct}}
                                 <p class="no-product-info">
-                                    暂无新品, 去<a href="/{{siteUrl}}/brand" target="_blank">名牌频道</a>看看吧
+                                    暂无新品, 去<a href="/product/shop/{{brandDomain}}{{#if shopId}}?shopId={{shopId}}{{/if}}" target="_blank">名牌频道</a>看看吧
                                 </p>
                             {{^}}
                                 <div class="slide-switch">

@@ -125,6 +125,15 @@
             padding: 5px;
             margin-top: 8px;
         }
+
+        .consignee {
+            display: block;
+            float: left;
+            max-width: 140px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
     }
 
     .address-chosed {

@@ -10,7 +10,7 @@
             </p>
 
             <p class="name-and-phone">
-                {{consignee}}
+                <em class="consignee">{{consignee}}</em>
                 <span class="phone bold">{{mobile}}</span>
             </p>