Authored by happyhour7

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

... ... @@ -2,7 +2,7 @@
<!--magazine-banner-->
{{#magazineBanner}}
<div class="magazine-banner">
<div class="{{^isOne}}swiper-container{{/isOne}} public-banner">
<div class="{{^only}}swiper-container{{/only}} public-banner">
<ul class="swiper-wrapper">
{{#bannerItem}}
<li class="swiper-slide">
... ... @@ -13,11 +13,11 @@
{{/bannerItem}}
</ul>
</div>
{{^isOne}}
{{^only}}
<div class="pagination-wrap">
<div class="pagination"></div>
</div>
{{/isOne}}
{{/only}}
<div class="magazine-more">
<time>2014.10.15 /全智贤</time>
<span>RBM 15</span>
... ...
... ... @@ -2,12 +2,12 @@
{{> channel/banner320}}
<div class="video swiper-container">
<ul class="swiper-wrapper">
{{#video}}
{{#tvs}}
<li class="swiper-slide">
<a href="{{link}}" target="_blank"></a>
<img src="{{img}}" alt="">
</li>
{{/video}}
{{/tvs}}
</ul>
</div>
<!--content-->
... ...