Authored by lore-w

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

@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <div class="about-us-qr"> 16 <div class="about-us-qr">
17 <div class="product girl clearfix"> 17 <div class="product girl clearfix">
18 <div class="product-wrap"> 18 <div class="product-wrap">
19 - <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/download_boy_icon.png" alt=""> 19 + <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/download_boy_icon.png" alt="">
20 <span>YOHO!BOYS</span> 20 <span>YOHO!BOYS</span>
21 </div> 21 </div>
22 <div class="product-wrap product-wrap-right"> 22 <div class="product-wrap product-wrap-right">
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <div class="about-us-qr"> 16 <div class="about-us-qr">
17 <div class="product girl clearfix"> 17 <div class="product girl clearfix">
18 <div class="product-wrap"> 18 <div class="product-wrap">
19 - <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/download_boy_icon.png" alt=""> 19 + <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/download_boy_icon.png" alt="">
20 <span>YOHO!BOYS</span> 20 <span>YOHO!BOYS</span>
21 </div> 21 </div>
22 <div class="product-wrap product-wrap-right"> 22 <div class="product-wrap product-wrap-right">
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 {{> detail/detail_text}} 14 {{> detail/detail_text}}
15 {{/ content}} 15 {{/ content}}
16 {{> detail/detail_tag}} 16 {{> detail/detail_tag}}
17 - {{> detail/detail_status}} 17 + {{> detail/detail_status_hk}}
18 {{# commentParam}} 18 {{# commentParam}}
19 <div class="comments-box" cid="{{cid}}" cc="{{cc}}" ctype="{{ctype}}" ctwoc="{{ctwoc}}"></div> 19 <div class="comments-box" cid="{{cid}}" cc="{{cc}}" ctype="{{ctype}}" ctwoc="{{ctwoc}}"></div>
20 {{/ commentParam}} 20 {{/ commentParam}}
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class="follow-us"> 3 <div class="follow-us">
4 <div class="title"> 4 <div class="title">
5 {{^ fanti}} 关注我们 {{/ fanti}} 5 {{^ fanti}} 关注我们 {{/ fanti}}
6 - {{# fanti}} Follow us {{/ fanti}} 6 + {{# fanti}} 關注我們 {{/ fanti}}
7 </div> 7 </div>
8 <ul class="icons-content"> 8 <ul class="icons-content">
9 <li><a href="http://app.yohoshow.com" target="_blank" class="icons show" onclick="YOHODCLICK('follow','web','followShow')"></a></li> 9 <li><a href="http://app.yohoshow.com" target="_blank" class="icons show" onclick="YOHODCLICK('follow','web','followShow')"></a></li>
1 <div class="follow-us-default"> 1 <div class="follow-us-default">
2 <div class="title"> 2 <div class="title">
3 - {{# fanti}} Follow us {{/ fanti}} 3 + {{# fanti}} 關注我們 {{/ fanti}}
4 {{^ fanti}} 关注我们 {{/ fanti}} 4 {{^ fanti}} 关注我们 {{/ fanti}}
5 </div> 5 </div>
6 <ul class="icons-content"> 6 <ul class="icons-content">
1 <div class="focus-us clearfix"> 1 <div class="focus-us clearfix">
2 - <h4>follow us</h4> 2 + <h4>關注我們</h4>
3 <ul class="focuslist clearfix"> 3 <ul class="focuslist clearfix">
4 <li class="show"><a href="http://app.yohoshow.com" target="_blank"></a></li> 4 <li class="show"><a href="http://app.yohoshow.com" target="_blank"></a></li>
5 <li class="weibo"><a href="http://weibo.com/yohomedia" target="_blank"></a></li> 5 <li class="weibo"><a href="http://weibo.com/yohomedia" target="_blank"></a></li>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <div class="detail-slide-ctrl"> 10 <div class="detail-slide-ctrl">
11 <ul class="detail-slide-ctrl-tabs clearfix"> 11 <ul class="detail-slide-ctrl-tabs clearfix">
12 {{# smallImgList}} 12 {{# smallImgList}}
13 - <li><a href="javascript:;"><span class="border"></span><span class="arrow"></span><img class="lazy" data-original="{{src}}" alt=""></a></li> 13 + <li><a href="javascript:;"><span class="border"></span><span class="arrow"></span><img src="{{src}}" alt=""></a></li>
14 {{/ smallImgList}} 14 {{/ smallImgList}}
15 </ul> 15 </ul>
16 <a href="javascript:;" class="detail-slide-ctrl-prev"></a> 16 <a href="javascript:;" class="detail-slide-ctrl-prev"></a>
  1 +<div class="stats-btn clearfix">
  2 + <ul class="statslist clearfix">
  3 + <li class="wow"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
  4 + <li class="zzz"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
  5 + <li class="wtf"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
  6 + <li class="comments hk"><a class="clearfix" href="javascript:;"><strong></strong><span class="comment-num"></span></a></li>
  7 + </ul>
  8 +</div>
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 <p class="mags-text">《YOHO!潮流誌》是新力傳媒著重打造的媒體,也是目前最成熟的媒體之壹。他是第壹本內地編輯的屬於年輕人的潮流時尚雜誌,讀者受眾定位為16—30歲年輕人群,內容包括潮流服飾、原創品牌、明星娛樂、藝術設計、動漫影音等,將年輕人關註的方方面面壹網打盡。</p> 5 <p class="mags-text">《YOHO!潮流誌》是新力傳媒著重打造的媒體,也是目前最成熟的媒體之壹。他是第壹本內地編輯的屬於年輕人的潮流時尚雜誌,讀者受眾定位為16—30歲年輕人群,內容包括潮流服飾、原創品牌、明星娛樂、藝術設計、動漫影音等,將年輕人關註的方方面面壹網打盡。</p>
6 <div class="date-price"> 6 <div class="date-price">
7 <p><span>{{date}} </span> | {{title}}</p> 7 <p><span>{{date}} </span> | {{title}}</p>
8 - <p class="price">RMB15</p> 8 + <p class="price">KD$ 20</p>
9 </div> 9 </div>
10 {{# buyUrl}} 10 {{# buyUrl}}
11 <div class="mags-buy"> 11 <div class="mags-buy">
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 detail.videoMiniPlayer(); 6 detail.videoMiniPlayer();
7 7
8 // IPAD上面的视频处理 8 // IPAD上面的视频处理
9 - if (navigator.userAgent.indexOf("iPad") !== -1) { 9 + /*if (navigator.userAgent.indexOf("iPad") !== -1) {
10 // 封面视频播放器替换为H5的VIDEO标签 10 // 封面视频播放器替换为H5的VIDEO标签
11 if (!!$(".video-wrap").find("object").size()) { 11 if (!!$(".video-wrap").find("object").size()) {
12 $(".video-wrap").find("object").hide(); 12 $(".video-wrap").find("object").hide();
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 $(this).replaceWith(videoHtml); 35 $(this).replaceWith(videoHtml);
36 }); 36 });
37 } 37 }
38 - } 38 + }*/
39 } 39 }
40 40
41 41