Merge branch 'web_develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into web_develop

 {{> layout/header_jian }}
-<div id="search-content">
+<div id="search-content" class="clearfix">
     <div class="search-content">
         <div class="search-input-content">
             <input id="input-search-search" type="text" value="{{searchText}}" autocomplete="off" class="ac_input"><span class="searchbutton" id="search-button-search"></span>

@@ -4,7 +4,7 @@
             <img class="lazy pic" src="{{img}}" data-original="{{img}}" alt="{{title}}" style="display: inline;">
             <span class="arrow-bottom girl-channel-arrow{{# channelClass}}-{{.}}{{/ channelClass}}"></span>
         </a>
-        <span href="{{link}}" target="_blank" class="video-icon" title="{{alt}}"></a>
+        <span href="{{link}}" style="{{^ isVideo}}display:none;{{/ isVideo}}" target="_blank" class="video-icon" title="{{alt}}"></a>
     </span>
     <span class="content-item-detail-subchannle" _time="{{time}}">
         <a href="{{subChannelLink}}">

@@ -2,7 +2,7 @@
     <a href="{{link}}" target="_blank" class="img-link" title="{{title}}">
         <img class="img lazy" data-original="{{img}}" alt="{{title}}"/>
         <span class="arrow-bottom girl-channel-arrow"></span>
-        <span class="video-icon-Fragment"></span>
+        {{# isVideo}}<span class="video-icon-Fragment"></span>{{/ isVideo}}
     </a>
     <div class="item-text-area">
         <span class="item-date" _time="{{time}}"><a class="channel" href="{{channelURL}}" target="_blank">{{channelClass}}</a> / </span>

-<div class='pop-container'  style='position:relative;'>
+
+<div class='pop-container' style="position:relative;">
     <span class='pop-text'>#POP</span>
     <div class="swiper-container3">
         <span class='pop-img-container swiper-wrapper'>
@@ -6,7 +7,10 @@
             <a class='pop-link swiper-slide' href="{{link}}" target="_blank">
                 <img src='{{img}}' class='img'/>
                 <span class='title'_title='{{title}}'>{{title}}</span>
-                <span class='date' _title='{{date}}'>{{date}}</span>
+                <span class='date default-pop-date' _time='{{time}}'>
+                {{#if channelClass}}
+                    <a target="_blank" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
+                {{/if}}</span>
                 <span class='detail' _title='{{detail}}'>{{detail}}</span>
             </a>
             {{/ pop}}