Authored by 2586703@qq.com

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

... ... @@ -7,10 +7,17 @@
<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}}">
{{subChannel}}
</a>
&nbsp;/&nbsp;&nbsp;<span></span>
{{# channel}}
<a href="{{../channelLink}}">
{{.}}
</a>&nbsp;/&nbsp;
{{/ channel}}
{{# subChannel}}
<a href="{{../subChannel}}">
{{.}}
</a>&nbsp;/&nbsp;
{{/ subChannel}}
<span></span>
</span>
<a href="{{link}}" target="_blank" class="content-item-title content-item-detail-title-style content-item-detail-title{{# channelClass}}-{{.}}{{/ channelClass}}" _title="{{title}}">{{title}}</a>
<a href="{{link}}" target="_blank" class="content-item-subtitle content-item-detail-title-style content-item-detail-subtitle{{# channelClass}}-{{.}} content-item-detail-subtitle-style{{/ channelClass}}" _title="{{subtitle}}">{{subtitle}}</a>
... ...
... ... @@ -5,7 +5,14 @@
{{# 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>
<span class="item-date" _time="{{time}}">
{{# channel}}
<a class="channel" href="{{../channelURL}}" target="_blank">{{.}}</a> /
{{/ channel}}
{{# subChannel}}
<a class="channel" href="{{../subChannelLink}}" target="_blank">{{.}}</a> /
{{/ subChannel}}
</span>
<a class="item-title" href="{{link}}" target="_blank" _title="{{title}}">{{title}}</a>
<a class="item-title" href="{{link}}" target="_blank" _title="{{subtitle}}">{{subtitle}}</a>
<a class="item-detail" href="{{link}}" target="_blank" _title="{{content}}" len="{{contentLength}}">{{content}}</a>
... ...
<div class='pop-container' {{# centerBanner}} style="border-top:0;"{{/centerBanner}}>
<div class='pop-container' style="position:relative;">
<span class='pop-text'>#POP</span>
<div class="swiper-container3">
<span class='pop-img-container swiper-wrapper'>
{{# pop}}
<a class='pop-link swiper-slide' href="{{link}}" target="_blank">
<span class='pop-link swiper-slide' href="{{link}}" target="_blank">
<img src='{{img}}' class='img'/>
<span class='title'_title='{{title}}'>{{title}}</span>
<a class='title'_title='{{title}}'>{{title}}</a>
<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>
<a target="_blank" class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
{{/if}}
</span>
<a class='detail' _title='{{detail}}'>{{detail}}</a>
</span>
{{/ pop}}
</span>
</div>
... ...
... ... @@ -4,15 +4,16 @@
<div class="swiper-container3">
<span class='pop-img-container swiper-wrapper'>
{{# pop}}
<a class='pop-link swiper-slide' href="{{link}}" target="_blank">
<span class='pop-link swiper-slide' href="{{link}}" target="_blank">
<img src='{{img}}' class='img'/>
<span class='title'_title='{{title}}'>{{title}}</span>
<a class='title'_title='{{title}}'>{{title}}</a>
<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>
<a target="_blank" class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
{{/if}}
</span>
<a class='detail' _title='{{detail}}'>{{detail}}</a>
</span>
{{/ pop}}
</span>
</div>
... ...