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 61 additions and 96 deletions
@@ -44,12 +44,15 @@ @@ -44,12 +44,15 @@
44 <div class="trial-content-right" id="trial-list-top-ten"> 44 <div class="trial-content-right" id="trial-list-top-ten">
45 <div class="trial-top"> 45 <div class="trial-top">
46 {{# topTen}} 46 {{# topTen}}
47 - <div class="trial-user-info login-status">  
48 - <span class="trial-user-pic">  
49 - <img class="loginAvatar" src="{{userPic}}" alt=""/>  
50 - </span>  
51 - <span>我的试用</span>  
52 - </div> 47 + <div class="trial-user-info login-status">
  48 + <a href="javascript:;">
  49 + <span class="trial-user-pic">
  50 + <img class="loginAvatar" src="http://rescdn.yohoboys.com/res/new/boys/images/detail/user-img120.png" alt=""/>
  51 + <i class="loginType"></i>
  52 + </span>
  53 + <span>我的試用</span>
  54 + </a>
  55 + </div>
53 56
54 <h2 class="beauty-top-h2">本周试用排行榜</h2> 57 <h2 class="beauty-top-h2">本周试用排行榜</h2>
55 {{# top}} 58 {{# top}}
@@ -45,10 +45,13 @@ @@ -45,10 +45,13 @@
45 <div class="trial-top"> 45 <div class="trial-top">
46 {{# topTen}} 46 {{# topTen}}
47 <div class="trial-user-info login-status"> 47 <div class="trial-user-info login-status">
48 - <span class="trial-user-pic">  
49 - <img class="loginAvatar" src="http://rescdn.yohoboys.com/res/new/boys/images/detail/user-img120.png" alt=""/>  
50 - </span>  
51 - <span>我的試用</span> 48 + <a href="javascript:;">
  49 + <span class="trial-user-pic">
  50 + <img class="loginAvatar" src="http://rescdn.yohoboys.com/res/new/boys/images/detail/user-img120.png" alt=""/>
  51 + <i class="loginType"></i>
  52 + </span>
  53 + <span>我的試用</span>
  54 + </a>
52 </div> 55 </div>
53 56
54 <h2 class="beauty-top-h2">本周試用排行榜</h2> 57 <h2 class="beauty-top-h2">本周試用排行榜</h2>
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div id="trial-detail" class="detail"> 3 <div id="trial-detail" class="detail">
4 {{# detailData}} 4 {{# detailData}}
5 <h2 class="share-h2">{{title}}</h2> 5 <h2 class="share-h2">{{title}}</h2>
6 - <h3 class="share-h3">{{subTitle}}</h3> 6 + <h3 class="share-h3">{{subtitle}}</h3>
7 <div class="author-channel"> 7 <div class="author-channel">
8 {{# author}} 8 {{# author}}
9 <p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p> 9 <p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p>
@@ -108,72 +108,7 @@ @@ -108,72 +108,7 @@
108 <div class="review-list"> 108 <div class="review-list">
109 {{> detail/review_item320}} 109 {{> detail/review_item320}}
110 </div> 110 </div>
111 - <!-- {{#each reviewList}}  
112 - <div class="review-item">  
113 - <div class="item-top clearfix">  
114 - <div class="user-avatar">  
115 - <img src="{{avatar}}" alt="">  
116 - <i class="{{type}}"></i>  
117 - </div>  
118 - <div class="user-info clearfix">  
119 - <span class="name">{{nickname}}</span>  
120 - <p class="clearfix">  
121 - <span>{{isBuy}}&nbsp;/&nbsp;</span>  
122 - <span>{{age}}&nbsp;/&nbsp;</span>  
123 - <span>{{skin}}&nbsp;/&nbsp;</span>  
124 - <span>{{time}}</span>  
125 - </p>  
126 - </div>  
127 - </div>  
128 - <div class="review-content">  
129 - <h2>{{title}}</h2>  
130 - <div class="min-content">  
131 - {{# minContent}}  
132 - <div class="text-wrap">  
133 - <p>{{text}}<a class="more-content" href="javascript:;">展开</a></p>  
134 - </div>  
135 - <div class="min-img clearfix">  
136 - {{#each imgBox}}  
137 - <img src="{{img}}" alt="">  
138 - {{/each}}  
139 - </div>  
140 - {{/ minContent}}  
141 - </div>  
142 - <div class="normal-content">  
143 - {{#each content}}  
144 - {{#if img}}  
145 - <img src="{{img}}" alt="">  
146 - {{/if}}  
147 - {{#if text}}  
148 - <p>{{text}}</p>  
149 - {{/if}}  
150 - {{/each}}  
151 - </div>  
152 -  
153 - </div>  
154 - <div class="score-wrap clearfix">  
155 - {{#if detailScore}}  
156 - <div class="detail-score">  
157 - <h4>细项评分：</h4>  
158 - <ul class="clearfix">  
159 - {{#each detailScore}}  
160 - <li>{{@key}} {{.}}</li>  
161 - {{/each}}  
162 - <li class="more-score-btn">  
163 - <span class="show-icon iconfont">更多&#xe604;</span>  
164 - <span class="put-away iconfont">收起&#xe603;</span>  
165 - </li>  
166 - </ul>  
167 - </div>  
168 - {{/if}}  
169 111
170 - <div class="final-score">  
171 - <h2>总评星</h2>  
172 - {{> common/final_score}}  
173 - </div>  
174 - </div>  
175 - </div>  
176 - {{/each}} -->  
177 <div class="load-more"> 112 <div class="load-more">
178 <a href="javascript:;"></a> 113 <a href="javascript:;"></a>
179 </div> 114 </div>
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div id="trial-detail" class="detail"> 3 <div id="trial-detail" class="detail">
4 {{# detailData}} 4 {{# detailData}}
5 <h2 class="share-h2">{{title}}</h2> 5 <h2 class="share-h2">{{title}}</h2>
6 - <h3 class="share-h3">{{subTitle}}</h3> 6 + <h3 class="share-h3">{{subtitle}}</h3>
7 <div class="author-channel"> 7 <div class="author-channel">
8 {{# author}} 8 {{# author}}
9 <p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p> 9 <p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p>
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div id="trial-detail" class="detail"> 3 <div id="trial-detail" class="detail">
4 {{# detailData}} 4 {{# detailData}}
5 <h2 class="share-h2">{{title}}</h2> 5 <h2 class="share-h2">{{title}}</h2>
6 - <h3 class="share-h3">{{subTitle}}</h3> 6 + <h3 class="share-h3">{{subtitle}}</h3>
7 <div class="author-channel"> 7 <div class="author-channel">
8 {{# author}} 8 {{# author}}
9 <p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p> 9 <p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p>
@@ -22,11 +22,20 @@ @@ -22,11 +22,20 @@
22 {{> common/trial_status}} 22 {{> common/trial_status}}
23 {{/ trialStatus}} 23 {{/ trialStatus}}
24 24
25 - {{#if formTip}} 25 + {{#unless toolTip}}
26 {{> detail/application_form}} 26 {{> detail/application_form}}
27 - {{/if}} 27 + {{/unless}}
28 28
29 {{> detail/tooltip}} 29 {{> detail/tooltip}}
  30 + <div class="review-list-wrap" id="{{id}}">
  31 + <h2>试用报告</h2>
  32 + <div class="review-list">
  33 + {{> detail/review_item320}}
  34 + </div>
  35 + <div class="load-more">
  36 + <a href="javascript:;"></a>
  37 + </div>
  38 + </div>
30 </div> 39 </div>
31 </div> 40 </div>
32 {{> layout/footer320}} 41 {{> layout/footer320}}
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div id="trial-detail" class="detail"> 3 <div id="trial-detail" class="detail">
4 {{# detailData}} 4 {{# detailData}}
5 <h2 class="share-h2">{{title}}</h2> 5 <h2 class="share-h2">{{title}}</h2>
6 - <h3 class="share-h3">{{subTitle}}</h3> 6 + <h3 class="share-h3">{{subtitle}}</h3>
7 <div class="author-channel"> 7 <div class="author-channel">
8 {{# author}} 8 {{# author}}
9 <p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p> 9 <p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p>
@@ -22,11 +22,20 @@ @@ -22,11 +22,20 @@
22 {{> common/trial_status_hk}} 22 {{> common/trial_status_hk}}
23 {{/ trialStatus}} 23 {{/ trialStatus}}
24 24
25 - {{#if formTip}}  
26 - {{> detail/application_form_hk}}  
27 - {{/if}} 25 + {{#unless toolTip}}
  26 + {{> detail/application_form}}
  27 + {{/unless}}
28 28
29 {{> detail/tooltip_hk}} 29 {{> detail/tooltip_hk}}
  30 + <div class="review-list-wrap" id="{{id}}">
  31 + <h2>试用报告</h2>
  32 + <div class="review-list">
  33 + {{> detail/review_item_hk320}}
  34 + </div>
  35 + <div class="load-more">
  36 + <a href="javascript:;"></a>
  37 + </div>
  38 + </div>
30 </div> 39 </div>
31 </div> 40 </div>
32 {{> layout/footer_hk320}} 41 {{> layout/footer_hk320}}
@@ -6,8 +6,10 @@ @@ -6,8 +6,10 @@
6 </div> 6 </div>
7 {{/ toolTip}} 7 {{/ toolTip}}
8 {{# toolTip}} 8 {{# toolTip}}
9 -<div class="tooltip">  
10 - <p class="trial-tip">{{title}}</p>  
11 - <p>{{content}}</p>  
12 -</div> 9 + {{#if title}}
  10 + <div class="tooltip">
  11 + <p class="trial-tip">{{title}}</p>
  12 + <p>{{content}}</p>
  13 + </div>
  14 + {{/if}}
13 {{/ toolTip}} 15 {{/ toolTip}}
@@ -6,8 +6,10 @@ @@ -6,8 +6,10 @@
6 </div> 6 </div>
7 {{/ toolTip}} 7 {{/ toolTip}}
8 {{# toolTip}} 8 {{# toolTip}}
9 -<div class="tooltip">  
10 - <p class="trial-tip">{{title}}</p>  
11 - <p>{{content}}</p>  
12 -</div> 9 + {{#if title}}
  10 + <div class="tooltip">
  11 + <p class="trial-tip">{{title}}</p>
  12 + <p>{{content}}</p>
  13 + </div>
  14 + {{/if}}
13 {{/ toolTip}} 15 {{/ toolTip}}
@@ -11,11 +11,13 @@ @@ -11,11 +11,13 @@
11 <div class="trail-info"> 11 <div class="trail-info">
12 <p> 12 <p>
13 价格：<span>{{price}}</span>&nbsp;/&nbsp; 13 价格：<span>{{price}}</span>&nbsp;/&nbsp;
14 - 规格：<span>{{standard}}</span>&nbsp;/&nbsp; 14 + 规格：<span>{{capacity}}{{standard}}</span>&nbsp;/&nbsp;
15 数量：<span>{{num}}件</span> 15 数量：<span>{{num}}件</span>
16 </p> 16 </p>
17 <p>申请时间：{{applicationDate}}</p> 17 <p>申请时间：{{applicationDate}}</p>
18 - <p>距离结束还有{{endTime}}</p> 18 + {{# endTime}}
  19 + <p>距离结束还有{{.}}</p>
  20 + {{/ endTime}}
19 </div> 21 </div>
20 {{/ trialInfo}} 22 {{/ trialInfo}}
21 </div> 23 </div>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <footer class="girl-footer"> 2 <footer class="girl-footer">
3 <span class="come-back" onclick="">返回顶部</span> 3 <span class="come-back" onclick="">返回顶部</span>
4 <div class="login-language"> 4 <div class="login-language">
5 - <span class="side-bar-header" onclick="YOHODCLICK('login','mobile','translateCN')">登录</span> 5 + <span class="side-bar-header loginName" onclick="YOHODCLICK('login','mobile','translateCN')">登录</span>
6 <a class="language" href="/go/location" onclick="YOHODCLICK('traditional','mobile','translateCN')">繁体</a> 6 <a class="language" href="/go/location" onclick="YOHODCLICK('traditional','mobile','translateCN')">繁体</a>
7 </div> 7 </div>
8 <ul class="info"> 8 <ul class="info">
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <footer class="girl-footer"> 2 <footer class="girl-footer">
3 <span class="come-back" onclick="">返回頂部</span> 3 <span class="come-back" onclick="">返回頂部</span>
4 <div class="login-language"> 4 <div class="login-language">
5 - <span class="side-bar-header" onclick="YOHODCLICK('login','mobile','translateHK')">登錄</span> 5 + <span class="side-bar-header loginName" onclick="YOHODCLICK('login','mobile','translateHK')">登錄</span>
6 <a class="language" href="/go/location" onclick="YOHODCLICK('traditional','mobile','translateHK')">簡體</a> 6 <a class="language" href="/go/location" onclick="YOHODCLICK('traditional','mobile','translateHK')">簡體</a>
7 </div> 7 </div>
8 <ul class="info"> 8 <ul class="info">