Authored by happyhour7

Merge branch 'develop' into test

... ... @@ -35,7 +35,7 @@
<div class="about-section contact-us">
<h2>联系我们: </h2>
<div class="contact-us-qr">
<img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-contact-us.png" alt="Yoho!Boys">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-contact-us.png" alt="Yoho!Boys">
</div>
</div>
</div>
... ...
... ... @@ -16,31 +16,31 @@
<div class="about-us-qr">
<div class="product girl clearfix">
<div class="product-wrap">
<img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/download_boy_icon.png" alt="">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/download_boy_icon.png" alt="">
<span>YOHO!BOYS</span>
</div>
<div class="product-wrap product-wrap-right">
<img class="qr-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/yohoboyqr.png" alt="">
<img class="qr-img" src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/yohoboyqr.png" alt="">
<em>iPhone / Android</em>
</div>
</div>
<div class="product yoho clearfix">
<div class="product-wrap">
<img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-yoho-icon.png" alt="">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-yoho-icon.png" alt="">
<span>YOHO!有货</span>
</div>
<div class="product-wrap product-wrap-right">
<img class="qr-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-yoho-img.png" alt="">
<img class="qr-img" src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-yoho-img.png" alt="">
<em>iPhone / Android</em>
</div>
</div>
<div class="product show clearfix">
<div class="product-wrap">
<img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-show-icon.png" alt="">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-show-icon.png" alt="">
<span>Show</span>
</div>
<div class="product-wrap product-wrap-right">
<img class="qr-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/qr-show-img.png" alt="">
<img class="qr-img" src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-show-img.png" alt="">
<em>iPhone / Android</em>
</div>
</div>
... ...
... ... @@ -14,8 +14,8 @@
<div class="about-section">
<h2>LOGO链接:</h2>
<ul class="links-pic-list clearfix">
<li><a target="_blank" href="http://app.yohoshow.com/"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/links06.png" alt=""></a></li>
<li><a target="_blank" href="http://www.yohogirls.com/"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/links07.png" alt=""></a></li>
<li><a target="_blank" href="http://app.yohoshow.com/"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/links06.png" alt=""></a></li>
<li><a target="_blank" href="http://www.yohogirls.com/"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/links07.png" alt=""></a></li>
</ul>
</div>
</div>
... ...
... ... @@ -16,7 +16,7 @@
{{/ topItems}}
<div class="right-advt">
{{# advert}}
<a class="link" href="{{link}}">
<a class="link" href="{{link}}" target="_blank">
<img src="{{img}}" class="img" alt="{{alt}}"/>
</a>
{{/ advert}}
... ...
{{# appDownload}}
<div class="app-download clearfix">
<div class="qr">
<img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/detail/qr.png" alt="">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/qr.png" alt="">
</div>
<div class="app-main">
<h6>Yoho!Boys</h6>
<p>We love to Play & Learn</p>
<div class="download-btn clearfix">
<a href="{{iosUrl}}"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/detail/ios-download-1024.png" alt=""></a>
<a href="{{androidUrl}}"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/detail/android-download-1024.png" alt=""></a>
<a href="{{iosUrl}}"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/ios-download-1024.png" alt=""></a>
<a href="{{androidUrl}}"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/android-download-1024.png" alt=""></a>
</div>
</div>
</div>
... ...
... ... @@ -3,13 +3,13 @@
<div class="side-video">
<div class="video-area">
<object width="100%" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab">
<param name="movie" value="http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util/VideoPlayerSmall.swf?url=\{{video}}&amp;language=\{{language}}&amp;title1=【Yoho!Boys】\{{title}}\{{subtitle}}&amp;shareurl=\{{link}}&amp;sharepic=\{{cover}}&amp;coverpic=\{{cover}}">
<param name="movie" value="http://cmsres.test.yoho.cn/res/new/girls/assets/swf/util/VideoPlayerSmall.swf?url=\{{video}}&amp;language=\{{language}}&amp;title1=【Yoho!Boys】\{{title}}\{{subtitle}}&amp;shareurl=\{{link}}&amp;sharepic=\{{cover}}&amp;coverpic=\{{cover}}">
<param name="quality" value="high">
<param name="bgcolor" value="#ffffff">
<param value="true" name="allowFullScreen">
<param name="allowScriptAccess" value="always">
<param name="wmode" value="transparent">
<embed align="middle" width="100%" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util/VideoPlayerSmall.swf?url=\{{video}}&amp;language=\{{language}}&amp;title1=【Yoho!Boys】\{{title}}\{{subtitle}}&amp;shareurl=\{{link}}&amp;shareurl=\{{link}}&amp;sharepic=\{{cover}}&amp;coverpic=\{{cover}}" name="vMessage" wmode="transparent" quality="high" bgcolor="#ffffff" play="true" loop="false" allowscriptaccess="always" allowfullscreen="true" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" id="flash">
<embed align="middle" width="100%" src="http://cmsres.test.yoho.cn/res/new/girls/assets/swf/util/VideoPlayerSmall.swf?url=\{{video}}&amp;language=\{{language}}&amp;title1=【Yoho!Boys】\{{title}}\{{subtitle}}&amp;shareurl=\{{link}}&amp;shareurl=\{{link}}&amp;sharepic=\{{cover}}&amp;coverpic=\{{cover}}" name="vMessage" wmode="transparent" quality="high" bgcolor="#ffffff" play="true" loop="false" allowscriptaccess="always" allowfullscreen="true" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" id="flash">
</object>
<video id="side-video-ipad" style="display:none;" controls="controls" preload="auto" poster="\{{cover}}"><source src="\{{video}}" type="video/mp4"></video>
</div>
... ...
... ... @@ -17,8 +17,8 @@
<p>CopyRight © 2014 南京新与力文化传播有限公司<br />苏ICP备09011225号</p>
</footer>
</div>
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/mobile.js"></script>
<script type="text/javascript" src="http://cmsres.dev.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/mobile.js"></script>
{{> common/script320}}
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -3,7 +3,7 @@
<div class="column-slide e-zine">
<h4>YOHO!GIRL</h4>
<div class="slide-box">
<img class="loading-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/loading.gif" alt=" ">
<img class="loading-img" src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/loading.gif" alt=" ">
</div>
<div class="slide-ctrl" style="display: none;">
<a class="slide-ctrl-prev" href="javascript:;" style="display: none;"></a>
... ...
<div class="column-slide mags-app-download">
<div class="slide-box">
<ul class="slide-piclist clearfix">
<li class="column-slide01"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/magazine/app-column01.png" alt=" "></li>
<li class="column-slide02"><img style="margin:11px 0 0 70px;" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/magazine/app-column02.png" alt=" "></li>
<li class="column-slide03"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/magazine/app-column03.png" alt="扫一扫下载YOHO!潮流志"><span>iPhone | Android</span></li>
<li class="column-slide01"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/magazine/app-column01.png" alt=" "></li>
<li class="column-slide02"><img style="margin:11px 0 0 70px;" src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/magazine/app-column02.png" alt=" "></li>
<li class="column-slide03"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/magazine/app-column03.png" alt="扫一扫下载YOHO!潮流志"><span>iPhone | Android</span></li>
<li>
{{^ fan}}
<h6>YOHO!GIRL</h6>
... ...