Authored by unknown

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

... ... @@ -34,7 +34,7 @@
<div class="trial-submit">
{{# isOver}}<b class="apply-link apply-link-over">活动已结束</b>{{/ isOver}}
{{^ isOver}}<a class="apply-link" href="{{link}}">免费申请</a>{{/ isOver}}
<span class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}" data-cid="{{cid}}">&#xe600;<b>{{#if likeNum}}{{likeNum}}{{/if}}</b></span>
<span class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}" data-cid="{{id}}">&#xe600;<b>{{#if likeNum}}{{likeNum}}{{/if}}</b></span>
</div>
</div>
</li>
... ...
{{> layout/writer_header_hk320}}
<div class="trial-nav">
<span class="trial-nav-l">試用中心</span>
<span class="trial-nav-r">我的試用</span>
</div>
<div class="trial-l-content trial-content trial-active-content">
{{> channel/banner320}}
<div class="home-content">
<ul>
{{# contentCenter}}
<li class="content-item channel-{{channelType}} channel-beauty-trial">
<a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
<img class="lazy" data-original="{{img}}"
src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
alt=""/>
</a>
<h2>
<a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
</h2>
<h3>
<a href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
</h3>
<div class="trial-product-info">
<span>價格:{{price}}元&nbsp;/&nbsp;</span>
<span>規格:{{size}}&nbsp;{{standand}}&nbsp;/&nbsp;</span>
<span>數量:{{num}}份</span>
</div>
<time class="{{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}">
<span>申請時間:{{timeStart}}——{{timeEnd}}</span>
<span class="trial-time-overplus">距離結束還有{{timeOverplus}}</span>
</time>
<div class="trial-submit">
{{# isOver}}<b class="apply-link apply-link-over">活動已結束</b>{{/ isOver}}
{{^ isOver}}<a class="apply-link" href="{{applyLink}}">免費申請</a>{{/ isOver}}
<span class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}">&#xe600;{{likeNum}}</span>
</div>
</li>
{{/ contentCenter}}
</ul>
{{# contentCenterSwitch}}
{{> channel/page320}}
{{/ contentCenterSwitch}}
</div>
</div>
<div class="trial-r-content trial-content">
<div class="home-content trial-tab-content-ing">
<ul>
{{# trialIng}}
<li class="content-item channel-{{channelType}} channel-beauty-trial">
<a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
<img class="lazy" data-original="{{img}}"
src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
alt=""/>
</a>
<h2>
<a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
</h2>
<h3>
<a href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
</h3>
<time class="{{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}">
<span>申請時間:{{timeStart}}</span>
</time>
<div class="apply-status">
{{# success}}申請成功{{/ success}}{{# fail}}審核未通過{{/ fail}}{{# ing}}申請待審核{{/ ing}}
</div>
<div class="trial-submit">
<a class="apply-detail-link" href="{{applyDetailLink}}">查看詳情</a>
</div>
</li>
{{/ trialIng}}
</ul>
{{# trialIngSwitch}}
{{> channel/page320}}
{{/ trialIngSwitch}}
{{^ trialIng}}
<div class="noting-trial-tip">
<p>您還沒有申請中的試用品</p>
<b>立即去</b><a href="#">免費申請</a>
</div>
{{/ trialIng}}
</div>
<div class="home-content trial-tab-content-success">
<ul>
{{# trialSuccess}}
<li class="content-item channel-{{channelType}} channel-beauty-trial">
<a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
<img class="lazy" data-original="{{img}}"
src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
alt=""/>
</a>
<h2>
<a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
</h2>
<h3>
<a href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
</h3>
<time class="{{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}">
<span>申請時間:{{timeStart}}</span>
</time>
<div class="apply-status">
{{# success}}申請成功{{/ success}}{{# fail}}審核未通過{{/ fail}}{{# ing}}申請待審核{{/ ing}}
</div>
<div class="trial-submit">
<a class="apply-detail-link" href="{{applyDetailLink}}">查看詳情</a>
</div>
</li>
{{/ trialSuccess}}
</ul>
{{# trialSuccessSwitch}}
{{> channel/page320}}
{{/ trialSuccessSwitch}}
{{^ trialSuccess}}
<div class="noting-trial-tip">
<p>您還沒有申請成功的試用品</p>
<b>立即去</b><a href="#">免費申請</a>
</div>
{{/ trialSuccess}}
</div>
<div class="home-content trial-tab-content-fail">
<ul>
{{# trialFail}}
<li class="content-item channel-{{channelType}} channel-beauty-trial">
<a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
<img class="lazy" data-original="{{img}}"
src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
alt=""/>
</a>
<h2>
<a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
</h2>
<h3>
<a href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
</h3>
<time class="{{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}">
<span>申請時間:{{timeStart}}</span>
</time>
<div class="apply-status">
{{# success}}申請成功{{/ success}}{{# fail}}審核未通過{{/ fail}}{{# ing}}申請待審核{{/ ing}}
</div>
<div class="trial-submit">
<a class="apply-detail-link" href="{{applyDetailLink}}">查看詳情</a>
</div>
</li>
{{/ trialFail}}
</ul>
{{# trialFailSwitch}}
{{> channel/page320}}
{{/ trialFailSwitch}}
{{^ trialFail}}
<div class="noting-trial-tip">
<p>您還沒有申請中的試用品</p>
<b>立即去</b><a href="#">免費申請</a>
</div>
{{/ trialFail}}
</div>
</div>
{{> default/download320}}
<!--trialCat-->
<div id="trial-cat">
<div class="trial-cat-main">
<ul>
<li><span onclick="YOHODCLICK('trial','mobile','')"></span></li>
<li><span onclick="YOHODCLICK('trial','mobile','')"></span></li>
<li><span onclick="YOHODCLICK('trial','mobile','')"></span></li>
</ul>
</div>
</div>
{{> layout/footer_hk320}}
\ No newline at end of file
... ...
{{> layout/header_fan}}
{{> channel/banner_top}}
<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix" id="beauuty-trial-list">
<div class="trial-content-left">
<ul>
{{# content}}
<li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}">
<a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
<img class="lazy" data-original="{{img}}"
src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
alt=""/>
</a>
<div class="content-trial-item-main {{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}">
<h2>
<a href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
</h2>
<h3>
<a href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
</h3>
<div class="trial-product-info">
<span>價格:{{price}}元&nbsp;/&nbsp;</span>
<span>規格:{{size}}&nbsp;{{standand}}&nbsp;/&nbsp;</span>
<span>數量:{{num}}份</span>
</div>
<time>
<span>申請時間:{{timeStart}}——{{timeEnd}}</span>
<span class="trial-time-overplus">{{# timeOverplus}}距離結束還有{{/ timeOverplus}}{{timeOverplus}}</span>
</time>
<div class="trial-submit">
{{# isOver}}<b class="apply-link apply-link-over">活動已結束</b>{{/ isOver}}
{{^ isOver}}<a class="apply-link" href="{{link}}">免費申請</a>{{/ isOver}}
<span class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}" data-cid="{{id}}">&#xe600;<b>{{#if likeNum}}{{likeNum}}{{/if}}</b></span>
</div>
</div>
</li>
{{/ content}}
</ul>
</div>
<div class="trial-content-right" id="trial-list-top-ten">
<div class="trial-top">
{{# topTen}}
<div class="trial-user-info">
<span class="trial-user-pic">
<img src="{{userPic}}" alt=""/>
</span>
<span>我的試用</span>
</div>
<h2 class="beauty-top-h2">本周試用排行榜</h2>
{{# top}}
<a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
<span class="top-leading"></span>
<div class="top-content">
<h2>{{title}}</h2>
<h3>{{subTitle}}</h3>
</div>
<span class="top-like-num {{bestLike}}">{{likeNum}}</span>
</a>
{{/ top}}
{{/ topTen}}
</div>
</div>
</div>
{{> channel/pager}}
{{> layout/footer_fan}}
\ No newline at end of file
... ...
{{> layout/header_fan}}
<div class="trial-tab-select">
<div class="tab-select-wrapper">
<span class="trial-tab-ing">申請中</span>
<span class="trial-tab-success">申請成功</span>
<span class="trial-tab-fail">申請失敗</span>
</div>
</div>
<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix" id="beauuty-trial-list">
<div class="trial-tab-content-ing">
<div class="trial-content-left" style="float:none;">
<ul>
{{# trialIng}}
<li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}">
<a class="img-link" href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">
<img class="lazy" data-original="{{img}}"
src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
alt=""/>
</a>
<div class="content-trial-item-main {{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}">
<h2>
<a href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
</h2>
<h3>
<a href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
</h3>
<time class="trial-tab-time">
<span>申請時間:{{timeStart}}</span>
</time>
<div class="apply-status">
{{# success}}申請成功{{/ success}}{{# fail}}審核未通過{{/ fail}}{{# ing}}申請待審核{{/ ing}}
</div>
<div class="trial-submit">
<a class="apply-link" href="{{applyDetailLink}}">查看詳情</a>
</div>
</div>
</li>
{{/ trialIng}}
</ul>
{{^ trialIng}}
<div class="no-trial">
您沒有正在申請的試用品<br />
<span>立即去</span><a href="">免費申請</a>
</div>
{{/ trialIng}}
</div>
{{# trialIngSwitch}}
{{> channel/trial_pager}}
{{/ trialIngSwitch}}
</div>
<div class="trial-tab-content-success">
<div class="trial-content-left" style="float:none;">
<ul>
{{# trialSuccess}}
<li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}">
<a class="img-link" href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">
<img class="lazy" data-original="{{img}}"
src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
alt=""/>
</a>
<div class="content-trial-item-main {{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}">
<h2>
<a href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
</h2>
<h3>
<a href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
</h3>
<time class="trial-tab-time">
<span>申請時間:{{timeStart}}</span>
</time>
<div class="apply-status">
{{# success}}申請成功{{/ success}}{{# fail}}審核未通過{{/ fail}}{{# ing}}申請待審核{{/ ing}}
</div>
<div class="trial-submit">
<a class="apply-link" href="{{applyDetailLink}}">查看詳情</a>
</div>
</div>
</li>
{{/ trialSuccess}}
</ul>
{{^ trialSuccess}}
<div class="no-trial">
您沒有申請成功的試用品<br />
<span>立即去</span><a href="">免費申請</a>
</div>
{{/ trialSuccess}}
</div>
{{# trialSuccessSwitch}}
{{> channel/trial_pager}}
{{/ trialSuccessSwitch}}
</div>
<div class="trial-tab-content-fail">
<div class="trial-content-left" style="float:none;">
<ul>
{{# trialFail}}
<li class="content-trial-item channel-{{channelType}} channel-beauty-trial {{# noBorder}} no-border {{/ noBorder}}">
<a class="img-link" href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">
<img class="lazy" data-original="{{img}}"
src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
alt=""/>
</a>
<div class="content-trial-item-main {{# success}}trial-time-success{{/ success}}{{# fail}}trial-time-fail{{/ fail}}{{# ing}}trial-time-ing{{/ ing}}">
<h2>
<a href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
</h2>
<h3>
<a href="{{link}}" target="_blank"
onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
</h3>
<time class="trial-tab-time">
<span>申請時間:{{timeStart}}</span>
</time>
<div class="apply-status">
{{# success}}申請成功{{/ success}}{{# fail}}審核未通過{{/ fail}}{{# ing}}申請待審核{{/ ing}}
</div>
<div class="trial-submit">
<a class="apply-link" href="{{applyDetailLink}}">查看詳情</a>
</div>
</div>
</li>
{{/ trialFail}}
</ul>
{{^ trialFail}}
<div class="no-trial">
您沒有申請失敗的試用品<br />
<span>立即去</span><a href="">免費申請</a>
</div>
{{/ trialFail}}
</div>
{{# trialFailSwitch}}
{{> channel/trial_pager}}
{{/ trialFailSwitch}}
</div>
</div>
{{> layout/footer_fan}}
\ No newline at end of file
... ...
{{> layout/header_jian}}
{{# testEnvironment}}
<link rel="stylesheet" href="http://cmsres.test.yoho.cn/res/new/girls/css/yohood.css"/>
<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/yohood.js"></script>
<script type="text/javascript">
seajs.use("js/yohood");
</script>
{{/ testEnvironment}}
{{# prevEnvironment}}
<link rel="stylesheet" href="http://res.previewboys.yoho.cn/res/new/girls/css/yohood.css"/>
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_preview.js"></script>
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/yohood.js"></script>
<script type="text/javascript">
seajs.use("js/yohood");
</script>
{{/ prevEnvironment}}
{{# prodEnvironment}}
<link rel="stylesheet" type="text/css" href="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/yohood.css"/>
<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/yohood.js"></script>
<script type="text/javascript">
seajs.use("js/yohood");
</script>
{{/ prodEnvironment}}
{{> channel/banner_top}}
<div class="content clearfix">
... ...
{{> layout/header_fan}}
{{# testEnvironment}}
<link rel="stylesheet" href="http://cmsres.test.yoho.cn/res/new/girls/css/yohood.css"/>
<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/yohood.js"></script>
<script type="text/javascript">
seajs.use("js/yohood");
</script>
{{/ testEnvironment}}
{{# prevEnvironment}}
<link rel="stylesheet" href="http://res.previewboys.yoho.cn/res/new/girls/css/yohood.css"/>
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_preview.js"></script>
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/yohood.js"></script>
<script type="text/javascript">
seajs.use("js/yohood");
</script>
{{/ prevEnvironment}}
{{# prodEnvironment}}
<link rel="stylesheet" type="text/css" href="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/yohood.css"/>
<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/yohood.js"></script>
<script type="text/javascript">
seajs.use("js/yohood");
</script>
{{/ prodEnvironment}}
{{> channel/banner_top}}
<div class="content clearfix">
... ... @@ -50,7 +74,7 @@
</div>
{{/if}}
</div>
<div class="content-yohood-right">
<div class="content-yohood-right" style="position: relative;">
{{# yohood}}
<div class="advert-without-border">
<a href="{{link}}" target="_blank"><img
... ...
{{> layout/header_jian}}
{{# testEnvironment}}
<link rel="stylesheet" href="http://cmsres.test.yoho.cn/res/new/girls/css/yohood.css"/>
<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/yohood.js"></script>
<script type="text/javascript">
seajs.use("js/yohood");
</script>
{{/ testEnvironment}}
{{# prevEnvironment}}
<link rel="stylesheet" href="http://res.previewboys.yoho.cn/res/new/girls/css/yohood.css"/>
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/js/util/seajs_preview.js"></script>
<script type="text/javascript" src="http://res.previewboys.yoho.cn/res/new/girls/yohood.js"></script>
<script type="text/javascript">
seajs.use("js/yohood");
</script>
{{/ prevEnvironment}}
{{# prodEnvironment}}
<link rel="stylesheet" type="text/css" href="http://cdn.yoho.cn/yohogirls-frontend-web/0.0.1/yohood.css"/>
<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/yohood.js"></script>
<script type="text/javascript">
seajs.use("js/yohood");
</script>
{{/ prodEnvironment}}
{{> channel/banner_top}}
<div class="content clearfix">
... ...
{{# banner}}
<div class="scrollPic-content">
{{# bannerLength}}
<a class="arrow arrow-left" href="javascript:;" onclick="YOHODCLICK('banner','web','bannerTopPrevNext')"></a>
<a class="arrow arrow-right" href="javascript:;" onclick="YOHODCLICK('banner','web','bannerTopPrevNext')"></a>
{{/ bannerLength}}
<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://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>
</div>
{{/ data}}
</div>
</div>
</div>
{{/ banner}}
\ No newline at end of file
... ...
... ... @@ -6,9 +6,9 @@
<a class="end-btn" href="javascript:;">活动已结束</a>
{{/if}}
{{# like}}
<a class="user-like" href="javascript:;">
<a class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}" data-cid="{{id}}" href="javascript:;">
<span class="iconfont">&#xe600;</span>
<b class="like-num {{# isLike}}apply-dislike{{/ isLike}}">{{num}}</b>
<b>{{#if likeNum}}{{likeNum}}{{/if}}</b>
</a>
{{/ like}}
</div>
\ No newline at end of file
... ...
... ... @@ -6,9 +6,9 @@
<a class="end-btn" href="javascript:;">活動已結束</a>
{{/if}}
{{# like}}
<a class="user-like" href="javascript:;">
<a class="apply-like-num {{# isLike}}apply-dislike{{/ isLike}}" data-cid="{{id}}" href="javascript:;">
<span class="iconfont">&#xe600;</span>
<b class="like-num {{# isLike}}apply-dislike{{/ isLike}}">{{num}}</b>
<b>{{#if likeNum}}{{likeNum}}{{/if}}</b>
</a>
{{/ like}}
</div>
... ...