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

@@ -7,7 +7,7 @@
                 <li>
                     <a data-key="{{key}}" href="{{brandDomain}}" target="_blank">
                         <img class="lazy" data-original="{{image brandIco 270 190}}">
-                        <span>{{brandNameEn}}</span>
+                        <span>{{#if brandNameEn}}{{brandNameEn}}{{else}}{{brandNameCn}}{{/if}}</span>
                     </a>
                 </li>
                 {{/each}}

@@ -246,6 +246,7 @@ const _getRelatedData = (idList) => {
 const _processContentData = (list) => {
     list = list || [];
     list = camelCase(list);
+
     // console.log(list)
 
     let contentData = {
@@ -285,7 +286,7 @@ const _processContentData = (list) => {
     let idList = '';
 
     let recoLength = '';
-   
+
     let related = {
         relatedReco: [],
         relatedGroup: []
@@ -366,7 +367,7 @@ const _processContentData = (list) => {
             return null;
         } else {
             return related;
-        }     
+        }
 
     }).then((result) => {
 

@@ -35,14 +35,14 @@
                                             <dt>
                                                 <a href="{{link}}">{{name}}</a>
                                                 {{#if hot}}
-                                                    <span class="hot"></span>
+                                                    <span class="hot iconfont">&#xe650;</span>
                                                 {{/if}}
                                             </dt>
                                             {{^}}
                                             <dd>
                                                 <a href="{{link}}">{{name}}</a>
                                                 {{#if hot}}
-                                                    <span class="hot"></span>
+                                                    <span class="hot iconfont">&#xe650;</span>
                                                 {{/if}}
                                             </dd>
                                             {{/if}}

@@ -433,11 +433,9 @@
         }
 
         .hot {
-            width: 26px;
-            height: 12px;
-            display: inline-block;
-            background: url("/layout/hot.png");
-            margin-left: 4px;
+            color: #fc0d1b;
+            font-size: 16px;
+            margin-left: 10px;
         }
 
         .show-detail {