ued / yohogirls_mustache · Commits

Go to a project

Authored by lore-w
Commit 9de4bb930e9ed4764c4ca73384eff17622becce7 2 parents 98100416 9b19fd8c

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

Inline Side-by-side
Showing 11 changed files with 49 additions and 84 deletions
... ... @@ -45,10 +45,13 @@
<div class="trial-top">
{{# topTen}}
<div class="trial-user-info login-status">
<a href="javascript:;">
<span class="trial-user-pic">
<img class="loginAvatar" src="{{userPic}}" alt=""/>
<img class="loginAvatar" src="http://rescdn.yohoboys.com/res/new/boys/images/detail/user-img120.png" alt=""/>
<i class="loginType"></i>
</span>
<span>我的试用</span>
<span>我的試用</span>
</a>
</div>
<h2 class="beauty-top-h2">本周试用排行榜</h2>
... ...
... ... @@ -45,10 +45,13 @@
<div class="trial-top">
{{# topTen}}
<div class="trial-user-info login-status">
<a href="javascript:;">
<span class="trial-user-pic">
<img class="loginAvatar" src="http://rescdn.yohoboys.com/res/new/boys/images/detail/user-img120.png" alt=""/>
<i class="loginType"></i>
</span>
<span>我的試用</span>
</a>
</div>
<h2 class="beauty-top-h2">本周試用排行榜</h2>
... ...
... ... @@ -3,7 +3,7 @@
<div id="trial-detail" class="detail">
{{# detailData}}
<h2 class="share-h2">{{title}}</h2>
<h3 class="share-h3">{{subTitle}}</h3>
<h3 class="share-h3">{{subtitle}}</h3>
<div class="author-channel">
{{# author}}
<p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p>
... ... @@ -108,72 +108,7 @@
<div class="review-list">
{{> detail/review_item320}}
</div>
<!-- {{#each reviewList}}
<div class="review-item">
<div class="item-top clearfix">
<div class="user-avatar">
<img src="{{avatar}}" alt="">
<i class="{{type}}"></i>
</div>
<div class="user-info clearfix">
<span class="name">{{nickname}}</span>
<p class="clearfix">
<span>{{isBuy}}&nbsp;/&nbsp;</span>
<span>{{age}}&nbsp;/&nbsp;</span>
<span>{{skin}}&nbsp;/&nbsp;</span>
<span>{{time}}</span>
</p>
</div>
</div>
<div class="review-content">
<h2>{{title}}</h2>
<div class="min-content">
{{# minContent}}
<div class="text-wrap">
<p>{{text}}<a class="more-content" href="javascript:;">展开</a></p>
</div>
<div class="min-img clearfix">
{{#each imgBox}}
<img src="{{img}}" alt="">
{{/each}}
</div>
{{/ minContent}}
</div>
<div class="normal-content">
{{#each content}}
{{#if img}}
<img src="{{img}}" alt="">
{{/if}}
{{#if text}}
<p>{{text}}</p>
{{/if}}
{{/each}}
</div>
</div>
<div class="score-wrap clearfix">
{{#if detailScore}}
<div class="detail-score">
<h4>细项评分：</h4>
<ul class="clearfix">
{{#each detailScore}}
<li>{{@key}} {{.}}</li>
{{/each}}
<li class="more-score-btn">
<span class="show-icon iconfont">更多&#xe604;</span>
<span class="put-away iconfont">收起&#xe603;</span>
</li>
</ul>
</div>
{{/if}}
<div class="final-score">
<h2>总评星</h2>
{{> common/final_score}}
</div>
</div>
</div>
{{/each}} -->
<div class="load-more">
<a href="javascript:;"></a>
</div>
... ...
... ... @@ -3,7 +3,7 @@
<div id="trial-detail" class="detail">
{{# detailData}}
<h2 class="share-h2">{{title}}</h2>
<h3 class="share-h3">{{subTitle}}</h3>
<h3 class="share-h3">{{subtitle}}</h3>
<div class="author-channel">
{{# author}}
<p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p>
... ...
... ... @@ -3,7 +3,7 @@
<div id="trial-detail" class="detail">
{{# detailData}}
<h2 class="share-h2">{{title}}</h2>
<h3 class="share-h3">{{subTitle}}</h3>
<h3 class="share-h3">{{subtitle}}</h3>
<div class="author-channel">
{{# author}}
<p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p>
... ... @@ -22,11 +22,20 @@
{{> common/trial_status}}
{{/ trialStatus}}
{{#if formTip}}
{{#unless toolTip}}
{{> detail/application_form}}
{{/if}}
{{/unless}}
{{> detail/tooltip}}
<div class="review-list-wrap" id="{{id}}">
<h2>试用报告</h2>
<div class="review-list">
{{> detail/review_item320}}
</div>
<div class="load-more">
<a href="javascript:;"></a>
</div>
</div>
</div>
</div>
{{> layout/footer320}}
... ...
... ... @@ -3,7 +3,7 @@
<div id="trial-detail" class="detail">
{{# detailData}}
<h2 class="share-h2">{{title}}</h2>
<h3 class="share-h3">{{subTitle}}</h3>
<h3 class="share-h3">{{subtitle}}</h3>
<div class="author-channel">
{{# author}}
<p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p>
... ... @@ -22,11 +22,20 @@
{{> common/trial_status_hk}}
{{/ trialStatus}}
{{#if formTip}}
{{> detail/application_form_hk}}
{{/if}}
{{#unless toolTip}}
{{> detail/application_form}}
{{/unless}}
{{> detail/tooltip_hk}}
<div class="review-list-wrap" id="{{id}}">
<h2>试用报告</h2>
<div class="review-list">
{{> detail/review_item_hk320}}
</div>
<div class="load-more">
<a href="javascript:;"></a>
</div>
</div>
</div>
</div>
{{> layout/footer_hk320}}
... ...
... ... @@ -6,8 +6,10 @@
</div>
{{/ toolTip}}
{{# toolTip}}
<div class="tooltip">
{{#if title}}
<div class="tooltip">
<p class="trial-tip">{{title}}</p>
<p>{{content}}</p>
</div>
</div>
{{/if}}
{{/ toolTip}}
\ No newline at end of file
... ...
... ... @@ -6,8 +6,10 @@
</div>
{{/ toolTip}}
{{# toolTip}}
<div class="tooltip">
{{#if title}}
<div class="tooltip">
<p class="trial-tip">{{title}}</p>
<p>{{content}}</p>
</div>
</div>
{{/if}}
{{/ toolTip}}
\ No newline at end of file
... ...
... ... @@ -11,11 +11,13 @@
<div class="trail-info">
<p>
价格：<span>{{price}}</span>&nbsp;/&nbsp;
规格：<span>{{standard}}</span>&nbsp;/&nbsp;
规格：<span>{{capacity}}{{standard}}</span>&nbsp;/&nbsp;
数量：<span>{{num}}件</span>
</p>
<p>申请时间：{{applicationDate}}</p>
<p>距离结束还有{{endTime}}</p>
{{# endTime}}
<p>距离结束还有{{.}}</p>
{{/ endTime}}
</div>
{{/ trialInfo}}
</div>
\ No newline at end of file
... ...
... ... @@ -2,7 +2,7 @@
<footer class="girl-footer">
<span class="come-back" onclick="">返回顶部</span>
<div class="login-language">
<span class="side-bar-header" onclick="YOHODCLICK('login','mobile','translateCN')">登录</span>
<span class="side-bar-header loginName" onclick="YOHODCLICK('login','mobile','translateCN')">登录</span>
<a class="language" href="/go/location" onclick="YOHODCLICK('traditional','mobile','translateCN')">繁体</a>
</div>
<ul class="info">
... ...
... ... @@ -2,7 +2,7 @@
<footer class="girl-footer">
<span class="come-back" onclick="">返回頂部</span>
<div class="login-language">
<span class="side-bar-header" onclick="YOHODCLICK('login','mobile','translateHK')">登錄</span>
<span class="side-bar-header loginName" onclick="YOHODCLICK('login','mobile','translateHK')">登錄</span>
<a class="language" href="/go/location" onclick="YOHODCLICK('traditional','mobile','translateHK')">簡體</a>
</div>
<ul class="info">
... ...