Merge remote-tracking branch 'origin/release/6.0' into release/6.0

@@ -123,7 +123,7 @@ module.exports = class extends global.yoho.BaseModel {
 
         let result = {
             id: articleData.id,
-            classification: articleData.category_name,
+            classification: _.get(articleData, 'min_category_name') || _.get(articleData, 'category_name'),
 
             // isReco: articleData.is_recommended && Number(articleData.is_recommended) === 1 ? true : false,
             url: +articleData.category_id === 9999 ?

@@ -3,21 +3,7 @@
         <div class="classification">
             {{classification}}
         </div>
-        {{# isCollocation}}
-            <div class="type-icon collocation"></div>
-        {{/ isCollocation}}
-        {{# isFashionMan}}
-            <div class="type-icon fashion-man"></div>
-        {{/ isFashionMan}}
-        {{# isFashionGood}}
-            <div class="type-icon fashion-good"></div>
-        {{/ isFashionGood}}
-        {{# isTopic}}
-            <div class="type-icon topic"></div>
-        {{/ isTopic}}
-        {{# isSpecialTopic}}
-            <div class="type-icon special-topic"></div>
-        {{/ isSpecialTopic}}
+        <div class="type-icon fashion-man"></div>
         <a href="{{url}}" target="_blank">
             <img class="lazy{{#if isSquareImg}} square{{/if}}" data-original="{{image2 img}}">
             {{#if isVideo}}<i class="video-icon"></i>{{/if}}

@@ -201,25 +201,9 @@
             background-size: 100% 100%;
             z-index: 100;
 
-            &.collocation {
-                background: resolve("guang/collocation.png") no-repeat;
-            }
-
-            &.fashion-good {
-                background: resolve("guang/fashion-good.png") no-repeat;
-            }
-
             &.fashion-man {
                 background: resolve("guang/fashion-man.png") no-repeat;
             }
-
-            &.reco {
-                background: resolve("guang/msg-reco.png") no-repeat;
-            }
-
-            &.topic {
-                background: resolve("guang/topic.png") no-repeat;
-            }
         }
 
         .msg-info {