Merge branch 'feature/guangTag' into release/6.0

@@ -3,21 +3,7 @@
         <div class="classification">
         <div class="classification">
             {{classification}}
             {{classification}}
         </div>
         </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">
         <a href="{{url}}" target="_blank">
             <img class="lazy{{#if isSquareImg}} square{{/if}}" data-original="{{image2 img}}">
             <img class="lazy{{#if isSquareImg}} square{{/if}}" data-original="{{image2 img}}">
             {{#if isVideo}}<i class="video-icon"></i>{{/if}}
             {{#if isVideo}}<i class="video-icon"></i>{{/if}}

@@ -201,25 +201,9 @@
             background-size: 100% 100%;
             background-size: 100% 100%;
             z-index: 100;
             z-index: 100;
 
 
-            &.collocation {
-                background: resolve("guang/collocation.png") no-repeat;
-            }
-
-            &.fashion-good {
-                background: resolve("guang/fashion-good.png") no-repeat;
-            }
-
             &.fashion-man {
             &.fashion-man {
                 background: resolve("guang/fashion-man.png") no-repeat;
                 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 {
         .msg-info {