Authored by lore-w

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://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-contact-us.png" alt="Yoho!Boys">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/qr-contact-us.png" alt="Yoho!Boys">
</div>
</div>
</div>
... ...
... ... @@ -35,7 +35,7 @@
<div class="about-section contact-us">
<h2>聯繫我們: </h2>
<div class="contact-us-qr">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-contact-us.png" alt="Yoho!Boys">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/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://cmsres.test.yoho.cn/res/new/girls/assets/images/about/download_boy_icon.png" alt="">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/download_boy_icon.png" alt="">
<span>YOHO!BOYS</span>
</div>
<div class="product-wrap product-wrap-right">
<img class="qr-img" src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/yohoboyqr.png" alt="">
<img class="qr-img" src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/yohoboyqr.png" alt="">
<em>iPhone / Android</em>
</div>
</div>
<div class="product yoho clearfix">
<div class="product-wrap">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-yoho-icon.png" alt="">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/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://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-yoho-img.png" alt="">
<img class="qr-img" src="http://cdn.yoho.cn/yohogirls-frontend-web/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://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-show-icon.png" alt="">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/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://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-show-img.png" alt="">
<img class="qr-img" src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/qr-show-img.png" alt="">
<em>iPhone / Android</em>
</div>
</div>
... ...
... ... @@ -16,31 +16,31 @@
<div class="about-us-qr">
<div class="product girl clearfix">
<div class="product-wrap">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/download_boy_icon.png" alt="">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/download_boy_icon.png" alt="">
<span>YOHO!BOYS</span>
</div>
<div class="product-wrap product-wrap-right">
<img class="qr-img" src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/yohoboyqr.png" alt="">
<img class="qr-img" src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/yohoboyqr.png" alt="">
<em>iPhone / Android</em>
</div>
</div>
<div class="product yoho clearfix">
<div class="product-wrap">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-yoho-icon.png" alt="">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/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://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-yoho-img.png" alt="">
<img class="qr-img" src="http://cdn.yoho.cn/yohogirls-frontend-web/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://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-show-icon.png" alt="">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/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://cmsres.test.yoho.cn/res/new/girls/assets/images/about/qr-show-img.png" alt="">
<img class="qr-img" src="http://cdn.yoho.cn/yohogirls-frontend-web/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://cmsres.test.yoho.cn/res/new/girls/assets/images/about/links06.png" alt=""></a></li>
<li><a target="_blank" href="http://www.yohoboys.com/"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/boys-logo.png" alt=""></a></li>
<li><a target="_blank" href="http://app.yohoshow.com/"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/links06.png" alt=""></a></li>
<li><a target="_blank" href="http://www.yohoboys.com/"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/boys-logo.png" alt=""></a></li>
</ul>
</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://cmsres.test.yoho.cn/res/new/girls/assets/images/about/links06.png" alt=""></a></li>
<li><a target="_blank" href="http://www.yohoboys.com/"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/boys-logo.png" alt=""></a></li>
<li><a target="_blank" href="http://app.yohoshow.com/"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/links06.png" alt=""></a></li>
<li><a target="_blank" href="http://www.yohoboys.com/"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/boys-logo.png" alt=""></a></li>
</ul>
</div>
</div>
... ...
{{> layout/header_jian}}
<div class="error-container">
<div class="error-img">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/other/error.png" alt="404 page">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/other/error.png" alt="404 page">
</div>
<div class="error-btn clearfix">
<a class="back-btn" href="javascript:;" onclick="history.go(-1);">返回上一页</a>
... ...
{{> layout/header_fan}}
<div class="error-container">
<div class="error-img">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/other/error.png" alt="404 page">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/other/error.png" alt="404 page">
</div>
<div class="error-btn clearfix">
<a class="back-btn" href="javascript:;" onclick="history.go(-1);">返回上壹頁</a>
... ...
... ... @@ -5,7 +5,7 @@
<div class="swiper-container-banner {{# bannerLength}}swiper-container{{/ bannerLength}}" style="cursor: -webkit-grab;">
<div class="swiper-wrapper" style="width: 1080px; height: 507px;background-color: rgb(255, 255, 255);">
{{# data}}
<div class="swiper-slide" style="width: 992px; height: 504px; background: url(http://cmsres.test.yoho.cn/res/new/boys/images/loading.gif) 50% 50% no-repeat;">
<div class="swiper-slide" style="width: 992px; height: 504px; background: url(http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/loading.gif) 50% 50% no-repeat;">
<a href="{{link}}" target="_blank" title="{{alt}}" onclick="YOHODCLICK('banner','web','bannerTop')">
<img src="{{img}}" alt="{{alt}}">
</a>
... ...
... ... @@ -10,7 +10,7 @@
<li><a href="http://weibo.com/yohogirl" target="_blank" class="icons sina" onclick="YOHODCLICK('follow','web','followSina')"></a></li>
<li class="li-weixin">
<a class="icons weixin"></a>
<a class="pop"><img class="lazy bitmap" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" data-original="http://cmsres.test.yoho.cn/res/new/boys/images/webxin_followus.jpg" alt="follow yoho!boys"></a>
<a class="pop"><img class="lazy bitmap" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" data-original="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/webxin_followus.jpg" alt="follow yoho!boys"></a>
</li>
<li><a href="http://facebook.com/YOHOGIRL" target="_blank" class="icons facebook" onclick="YOHODCLICK('follow','web','followFacebook')"></a></li>
<li><a href="http://instagram.com/YOHOGIRL" target="_blank" class="icons inst" onclick="YOHODCLICK('follow','web','followInstagram')"></a></li>
... ...
... ... @@ -34,7 +34,7 @@
<textarea placeholder="说点什么..." cid="4288"></textarea>
<div class="login-status clearfix">
<div class="userimg">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/user-img.png" alt="">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/detail/user-img.png" alt="">
<i></i>
</div>
<div class="anonymous" style="display: none;">YohoGirl</div>
... ...
... ... @@ -34,7 +34,7 @@
<textarea placeholder="說點什麼..." cid="4288"></textarea>
<div class="login-status clearfix">
<div class="userimg">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/user-img.png" alt="">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/detail/user-img.png" alt="">
<i></i>
</div>
<div class="anonymous" style="display: none;">YohoGirl</div>
... ...
... ... @@ -3,7 +3,7 @@
<textarea placeholder="说点什么..."></textarea>
<div class="login-status clearfix">
<div class="userimg">
<img src="http://cmsres.test.yoho.cn/res/new/boys/images/detail/user-img.png" alt="">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/detail/user-img.png" alt="">
<i></i>
</div>
<div class="userinfo" style="display: none;">
... ...
... ... @@ -3,7 +3,7 @@
<textarea placeholder="說點什麽..."></textarea>
<div class="login-status clearfix">
<div class="userimg">
<img src="http://cmsres.test.yoho.cn/res/new/boys/images/detail/user-img.png" alt="">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/detail/user-img.png" alt="">
<i></i>
</div>
<div class="userinfo" style="display: none;">
... ...
... ... @@ -8,5 +8,5 @@
<link rel="stylesheet" type="text/css" href="http://res.previewboys.yoho.cn/res/new/girls/css/mobile.css"/>
{{/ prevEnvironment}}
{{# prodEnvironment}}
<link rel="stylesheet" type="text/css" href="http://rescdn.yohoboys.com/res/new/girls/css/mobile.css"/>
<link rel="stylesheet" type="text/css" href="http://cdn.yoho.cn/yohogirls-frontend-mobile/2.0.1/mobile.css"/>
{{/ prodEnvironment}}
\ No newline at end of file
... ...
... ... @@ -8,5 +8,5 @@ http://cmsres.test.yoho.cn/res/new/girls/images
http://res.previewboys.yoho.cn/res/new/girls/images
{{/ prevEnvironment}}
{{# prodEnvironment}}
http://rescdn.yohoboys.com/res/new/girls/images
http://cdn.yoho.cn/yohogirls-frontend-mobile/assets/images
{{/ prodEnvironment}}
\ No newline at end of file
... ...
... ... @@ -10,6 +10,6 @@
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/mobile.js"></script>
{{/ prevEnvironment}}
{{# prodEnvironment}}
<script type="text/javascript" src="http://rescdn.yohoboys.com/res/new/girls/js/util/seajs.js"></script>
<script type="text/javascript" src="http://rescdn.yohoboys.com/res/new/girls/mobile.js"></script>
<script src="http://cdn.yoho.cn/yohogirls-frontend-mobile/2.0.1/sea.js"></script>
<script src="http://cdn.yoho.cn/yohogirls-frontend-mobile/2.0.1/index.js"></script>
{{/ prodEnvironment}}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,6 @@
<link rel="stylesheet" type="text/css" href="http://res.previewboys.yoho.cn/res/new/girls/css/girls.css" />
{{/ prevEnvironment}}
{{# prodEnvironment}}
<link rel="stylesheet" type="text/css" href="http://rescdn.yohoboys.com/res/new/girls/css/girls.css" />
<link rel="stylesheet" type="text/css" href="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/girls.css"/>
{{/ prodEnvironment}}
... ...
{{# devEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util{{/ devEnvironment}}
{{# testEnvironment}}http://cmsres.test.yoho.cn/res/new/girls/assets/swf/util{{/ testEnvironment}}
{{# prevEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/swf/util{{/ prevEnvironment}}
{{# prodEnvironment}}http://rescdn.yohoboys.com/res/new/girls/assets/swf/util{{/ prodEnvironment}}
\ No newline at end of file
{{# prodEnvironment}}http://cdn.yoho.cn/yohogirls-frontend-web/assets/swf/util{{/ prodEnvironment}}
\ No newline at end of file
... ...
... ... @@ -16,8 +16,8 @@ seajs.use("index");
</script>
{{/ prevEnvironment}}
{{# prodEnvironment}}
<script type="text/javascript" src="http://rescdn.yohoboys.com/res/new/girls/js/util/seajs.js"></script>
<script type="text/javascript" src="http://rescdn.yohoboys.com/res/new/girls/index.js"></script>
<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/sea.js"></script>
<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/index.js"></script>
<script type="text/javascript">
seajs.use("index");
</script>
... ...
{{# devEnvironment}}http://localhost:8000/dist/yohogirls-frontend-web/assets/images{{/ devEnvironment}}
{{# testEnvironment}}http://cmsres.test.yoho.cn/res/new/girls/assets/images{{/ testEnvironment}}
{{# prevEnvironment}}http://res.previewboys.yoho.cn/res/new/girls/assets/images{{/ prevEnvironment}}
{{# prodEnvironment}}http://rescdn.yohoboys.com/res/new/girls/assets/images{{/ prodEnvironment}}
{{# prodEnvironment}}http://cdn.yoho.cn/yohogirls-frontend-web/assets/images{{/ prodEnvironment}}
... ...
... ... @@ -16,8 +16,8 @@ seajs.use("index");
</script>
{{/ prevEnvironment}}
{{# prodEnvironment}}
<script type="text/javascript" src="http://rescdn.yohoboys.com/res/new/girls/js/util/seajs.js"></script>
<script type="text/javascript" src="http://rescdn.yohoboys.com/res/new/girls/index.js"></script>
<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/sea.js"></script>
<script type="text/javascript" src="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/index.js"></script>
<script type="text/javascript">
seajs.use("index");
</script>
... ...
... ... @@ -10,7 +10,7 @@
<span>分享到微信朋友圈</span>
</div>
<div class="wx-popup-bd">
<img src="http://previewnewgirls.yoho.cn/go/qrcode?text={{url}}">
<img src="http://www.yohoboys.com/go/qrcode?text={{url}}">
</div>
<div class="wx-popup-ft">打开微信,点击底部的“发现”,使用<br>“扫一扫”即可将网页分享至朋友圈。</div>
</div>
... ...
... ... @@ -11,7 +11,7 @@
<span>分享到微信朋友圈</span>
</div>
<div class="wx-popup-bd">
<img src="http://previewhkgirls.yoho.cn/go/qrcode?text={{url}}">
<img src="http://www.yohoboys.com/go/qrcode?text={{url}}">
</div>
<div class="wx-popup-ft">打開微信,點擊底部的“發現”,使用<br>“掃一掃”即可將網頁分享至朋友圈。</div>
</div>
... ...
<script id="third-login-tpl" type="x-tmpl-mustache">
<div class="third-login-box clearfix">
<span>第三方评论</span>
<a class="qq" ref="/passport/partner/index/oauth/qq" href="javascript:;" onclick="YOHODCLICK('login','web','qq')"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-qq.png" alt="" /></a>
<a class="yoho" href="javascript:;" onclick="YOHODCLICK('login','web','yoho')"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-yoho.png" alt="" /></a>
<a class="sina" ref="/passport/partner/index/oauth/sina" href="javascript:;" onclick="YOHODCLICK('login','web','sina')"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-sina.png" alt="" /></a>
<a class="fb" ref="/passport/partner/index/oauth/facebook" href="javascript:;" onclick="YOHODCLICK('login','web','facebook')"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-facebook.png" alt="" /></a>
<a class="qq" ref="/passport/partner/index/oauth/qq" href="javascript:;" onclick="YOHODCLICK('login','web','qq')"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/thirdbtn-qq.png" alt="" /></a>
<a class="yoho" href="javascript:;" onclick="YOHODCLICK('login','web','yoho')"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/thirdbtn-yoho.png" alt="" /></a>
<a class="sina" ref="/passport/partner/index/oauth/sina" href="javascript:;" onclick="YOHODCLICK('login','web','sina')"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/thirdbtn-sina.png" alt="" /></a>
<a class="fb" ref="/passport/partner/index/oauth/facebook" href="javascript:;" onclick="YOHODCLICK('login','web','facebook')"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/thirdbtn-facebook.png" alt="" /></a>
</div>
</script>
\ No newline at end of file
... ...
<script id="third-login-tpl" type="x-tmpl-mustache">
<div class="third-login-box clearfix">
<span>第三方評論</span>
<a class="fb" ref="/passport/partner/index/oauth/facebook" href="javascript:;" onclick="YOHODCLICK('login','web','facebook')"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-facebook.png" alt="" /></a>
<a class="yoho" href="javascript:;" onclick="YOHODCLICK('login','web','yoho')"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-yoho.png" alt="" /></a>
<a class="sina" ref="/passport/partner/index/oauth/sina" href="javascript:;" onclick="YOHODCLICK('login','web','sina')"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-sina.png" alt="" /></a>
<a class="qq" ref="/passport/partner/index/oauth/qq" href="javascript:;" onclick="YOHODCLICK('login','web','qq')"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/about/thirdbtn-qq.png" alt="" /></a>
<a class="fb" ref="/passport/partner/index/oauth/facebook" href="javascript:;" onclick="YOHODCLICK('login','web','facebook')"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/thirdbtn-facebook.png" alt="" /></a>
<a class="yoho" href="javascript:;" onclick="YOHODCLICK('login','web','yoho')"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/thirdbtn-yoho.png" alt="" /></a>
<a class="sina" ref="/passport/partner/index/oauth/sina" href="javascript:;" onclick="YOHODCLICK('login','web','sina')"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/thirdbtn-sina.png" alt="" /></a>
<a class="qq" ref="/passport/partner/index/oauth/qq" href="javascript:;" onclick="YOHODCLICK('login','web','qq')"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/about/thirdbtn-qq.png" alt="" /></a>
</div>
</script>
\ No newline at end of file
... ...
{{#if appDownload}}
<div class="app-download clearfix">
<div class="qr">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/boys-qr.png" alt="">
<img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/detail/boys-qr.png" alt="">
</div>
<div class="app-main">
<h6>Yoho!Girls</h6>
<p>No Fashion,No Life!</p>
<div class="download-btn clearfix">
<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>
<a href="{{iosUrl}}"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/detail/ios-download-1024.png" alt=""></a>
<a href="{{androidUrl}}"><img src="http://cdn.yoho.cn/yohogirls-frontend-web/assets/images/detail/android-download-1024.png" alt=""></a>
</div>
</div>
</div>
... ...
... ... @@ -18,7 +18,7 @@
</div>
{{> common/environment320_js}}
<script type="text/javascript">
seajs.use(['js/common'], function (common)
seajs.use(['js/common'], function (common)
{
common.init();
});
... ...
... ... @@ -18,7 +18,7 @@
</div>
{{> common/environment320_js}}
<script type="text/javascript">
seajs.use(['js/common'], function (common)
seajs.use(['js/common'], function (common)
{
common.init();
});
... ...