Authored by happyhour7@163.com

Merge branch 'web_develop' into develop

... ... @@ -5,14 +5,14 @@
<span class='pop-img-container swiper-wrapper'>
{{# pop}}
<span class='pop-link swiper-slide' href="{{link}}" target="_blank">
<img src='{{img}}' class='img'/>
<a class='title'_title='{{title}}'>{{title}}</a>
<a><img src='{{img}}' class='img'/></a>
<a href='{{link}}' class='title'_title='{{title}}'>{{title}}</a>
<span class='date default-pop-date' _time='{{time}}'>
{{#if channelClass}}
<a target="_blank" class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
<a target="_blank" href='{{link}}' class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
{{/if}}
</span>
<a class='detail' _title='{{detail}}'>{{detail}}</a>
<a class='detail' href='{{link}}' _title='{{detail}}'>{{detail}}</a>
</span>
{{/ pop}}
</span>
... ...
... ... @@ -5,14 +5,14 @@
<span class='pop-img-container swiper-wrapper'>
{{# pop}}
<span class='pop-link swiper-slide' href="{{link}}" target="_blank">
<img src='{{img}}' class='img'/>
<a class='title'_title='{{title}}'>{{title}}</a>
<a><img src='{{img}}' class='img'/></a>
<a href='{{link}}' class='title'_title='{{title}}'>{{title}}</a>
<span class='date default-pop-date' _time='{{time}}'>
{{#if channelClass}}
<a target="_blank" class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
<a target="_blank" href='{{link}}' class="default-pop-subchannel" href="{{channelURL}}">{{channelClass}}</a>&nbsp;|&nbsp;
{{/if}}
</span>
<a class='detail' _title='{{detail}}'>{{detail}}</a>
<a class='detail' href='{{link}}' _title='{{detail}}'>{{detail}}</a>
</span>
{{/ pop}}
</span>
... ...
{{> layout/header_jian }}
{{> layout/header_fan }}
{{> default/channel_banner}}
<!--六个小电视-->
<div class="tv-area">
... ... @@ -71,4 +71,4 @@
</div>
</div>
</div>
{{> layout/footer_jian }}
\ No newline at end of file
{{> layout/footer_fan }}
\ No newline at end of file
... ...
... ... @@ -29,6 +29,7 @@
<li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
<li class="item enterprise-yohood"><span>YO'HOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
<li class="jianfan"><a class="unchoosen" href="/go/location"></a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="#"></a></li>
</ul>
</div>
... ...
... ... @@ -7,11 +7,6 @@
<p><span>{{date}} </span> | {{title}}</p>
<p class="price">RMB15</p>
</div>
{{# buyUrl}}
<div class="mags-buy">
<a target="_blank" href="{{url}}" class="buy-btn">立即購買</a>
</div>
{{/ buyUrl}}
</div>
<div class="mags-slide">
<div class="slide-box swiper-container">
... ...