Authored by unknown

Merge branch 'develop' into test

... ... @@ -27,7 +27,10 @@
</div>
{{/if}}
<div class="chart-score clearfix">
<div id="chart"></div>
{{#if chart}}
<div id="chart" {{#each chart}}data-chart{{@key}}="{{.}}"{{/each}}>
</div>
{{/if}}
{{#if detailScore}}
<div class="detail-score">
<ul class="clearfix">
... ...
{{> layout/header_fan}}
<div class="detail-container clearfix">
{{#if trialStep}}
{{> common/trial_step}}
{{/if}}
{{# header}}
{{> detail/detail_title}}
{{/ header}}
<div class="detail-body">
{{# content}}
{{> detail/trail_content}}
{{/ content}}
<form class="review-form" action="">
<h2 class="form-title">試用網站評鑒結果分析</h2>
<div class="final-score form-final">
<h2>總體評價</h2>
{{> common/final_score}}
</div>
{{#if reviewInfo}}
<div class="review-info">
<ul class="clearfix">
{{#each reviewInfo}}
<li>{{@key}}:{{.}}</li>
{{/each}}
</ul>
</div>
{{/if}}
<div class="chart-score clearfix">
{{#if chart}}
<div id="chart" {{#each chart}}data-chart{{@key}}="{{.}}"{{/each}}>
</div>
{{/if}}
{{#if detailScore}}
<div class="detail-score">
<ul class="clearfix">
{{#each detailScore}}
<li class="clearfix" score="{{.}}">
<label>{{@key}}</label>
<div class="score-select-wrap clearfix">
<a class="score-select" href="javascript:;"></a>
<a class="score-select" href="javascript:;"></a>
<a class="score-select" href="javascript:;"></a>
<a class="score-select" href="javascript:;"></a>
<a class="score-select" href="javascript:;"></a>
</div>
</li>
{{/each}}
</ul>
</div>
{{/if}}
</div>
<div class="review-class clearfix">
{{#if buyAgain}}
<div class="buy-again review-percent">
<h4>回購評分</h4>
<ul>
{{#each buyAgain}}
<li class="clearfix">
<span>{{text}}</span>
<em percent="{{percent}}"><i></i></em>
<span>{{num}}/{{percent}}</span>
</li>
{{/each}}
</ul>
</div>
{{/if}}
{{#if skin}}
<div class="review-percent">
<h4>參評網友膚質分佈</h4>
<ul>
{{#each skin}}
<li class="clearfix">
<span>{{text}}</span>
<em percent="{{percent}}"><i>{{percent}}</i></em>
<span>{{num}}/{{percent}}</span>
</li>
{{/each}}
</ul>
</div>
{{/if}}
{{#if age}}
<div class="review-percent">
<h4>參評網友年齡分佈</h4>
<ul>
{{#each skin}}
<li class="clearfix">
<span>{{text}}</span>
<em percent="{{percent}}"><i>{{percent}}</i></em>
<span>{{num}}/{{percent}}</span>
</li>
{{/each}}
</ul>
</div>
{{/if}}
</div>
</form>
{{# trialStatus}}
{{> common/trial_status_hk}}
{{/ trialStatus}}
<div class="review-list-wrap" id="{{id}}">
<h2>試用報告</h2>
<div class="review-list" id="{{id}}">
{{> detail/review_item_hk}}
</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">
<p class="info-detail clearfix" class="clearfix">
<span class="name">{{nickname}}</span>
<span>{{isBuy}}&nbsp;/&nbsp;</span>
<span>{{age}}&nbsp;/&nbsp;</span>
<span>{{skin}}&nbsp;/&nbsp;</span>
<span>{{time}}</span>
</p>
<div class="clearfix score-wrap">
<div class="final-score">
<h2>总评星</h2>
{{> common/final_score}}
</div>
{{#if detailScore}}
<div class="detail-score">
<h4>细项评分:</h4>
<ul>
{{#each detailScore}}
<li>{{@key}} {{.}}</li>
{{/each}}
</ul>
{{#if moreDetailScore}}
<div class="more-score">
<a class="more-btn" href="javascript:;">更多</a>
<div class="more-score-list">
<div class="more-score-top"></div>
<div class="more-score-bottom"></div>
<ul>
{{#each moreDetailScore}}
<li>{{@key}} {{.}}</li>
{{/each}}
</ul>
</div>
</div>
{{/if}}
</div>
{{/if}}
</div>
</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>
{{/each}} -->
<div class="load-more">
<a href="javascript:;"></a>
</div>
</div>
<div class="review-pagination" style="display:none">
{{> channel/pager}}
</div>
</div>
</div>
{{> layout/footer_fan}}
\ No newline at end of file
... ...
{{> layout/header_fan}}
<div class="detail-container clearfix">
{{#if trialStep}}
{{> common/trial_step}}
{{/if}}
{{# header}}
{{> detail/detail_title}}
{{/ header}}
<div class="detail-body">
{{# content}}
{{> detail/trail_content}}
{{/ content}}
{{# trialStatus}}
{{> common/trial_status_hk}}
{{/ trialStatus}}
{{#unless toolTip}}
{{> detail/application_form_hk}}
{{/unless}}
{{> detail/tooltip_hk}}
</div>
</div>
{{> common/share_hk}}
{{> layout/footer_fan}}
\ No newline at end of file
... ...
... ... @@ -2,7 +2,7 @@
{{#if passCheck}}
<p class="pass-tip">您已经通过审核,发点试用心得吧~</p>
{{/if}}
{{#if publishUrl}}
{{#if isEnd}}
<a class="end-btn" href="javascript:;">活动已结束</a>
{{/if}}
{{# like}}
... ... @@ -11,7 +11,4 @@
<b class="like-num {{# isLike}}apply-dislike{{/ isLike}}">{{#if num}}{{num}}{{/if}}</b>
</a>
{{/ like}}
{{#if publishUrl}}
<a class="publish-btn" href="{{publishUrl}}">发试用心得</a>
{{/if}}
</div>
\ No newline at end of file
... ...
<div class="trial-status clearfix">
{{#if passCheck}}
<p class="pass-tip">您已經通過審核,發點試用心得吧~</p>
{{/if}}
{{#if isEnd}}
<a class="end-btn" href="javascript:;">活動已結束</a>
{{/if}}
{{# like}}
<a class="user-like" href="javascript:;">
<span class="iconfont">&#xe600;</span>
<b class="like-num {{# isLike}}apply-dislike{{/ isLike}}">{{#if num}}{{num}}{{/if}}</b>
</a>
{{/ like}}
</div>
\ No newline at end of file
... ...
<div class="application-form">
<div class="application-tips">
<h2>TIPS</h2>
<p>{{formTip}}</p>
</div>
<div class="form">
{{# form}}
<form id="application-form" c-id="{{id}}" action="" onsubmit="return false;">
<p class="clearfix">
<label for="user-name">姓名:</label>
<input id="userName" name="userName" class="char required" type="text" value="{{name}}">
</p>
<p class="clearfix">
<label for="user-tell">手機:</label>
<input id="userTell" name="userTell" class="char required" type="text" value="{{tell}}">
<i class="verification-btn">獲取驗證碼</i>
</p>
<p class="clearfix">
<label for="user-verification">驗證碼:</label>
<input id="userVerification" name="verification" class="char" type="text">
<i class="verification-icon">驗證碼錯誤</i>
</p>
<p class="address-char clearfix">
<label for="user-address">地址:</label>
<span id="userAddress" class="varchar" contentEditable="true">{{address}}</span>
</p>
<p class="clearfix">
<label for="user-age">年齡:</label>
<input id="userAge" name="age" class="char required" type="text" value="{{age}}">
</p>
<p class="gender-select clearfix">
<label>性別:</label>
{{#each gender}}
<span class="select-item clearfix">
<input id="gender{{@index}}" class="gender radio" name="user-gender" type="radio" value="{{value}}" {{#if default}}checked{{/if}}>
<label class="radio-label {{#if default}}current{{/if}}" for="gender{{@index}}">{{value}}</label>
</span>
{{/each}}
</p>
<p class="skin-select clearfix">
<label>膚質:</label>
{{#each skin}}
<span class="select-item clearfix">
<input id="skin{{@index}}" class="radio" name="user-skin" type="radio" value="{{text}}" {{#if default}}checked{{/if}}>
<label class="radio-label radio-long-label {{#if default}}current{{/if}}" for="skin{{@index}}">{{text}}</label>
</span>
{{/each}}
</p>
<p class="clearfix">
<label>您的問題</label>
</p>
<p class="trouble-wrap clearfix">
{{#each problem}}
<span class="select-item clearfix">
<input id="trouble{{@index}}" class="checkbox" name="user-trouble" type="checkbox" value="{{text}}" {{#if default}}checked{{/if}}>
<em class="{{#if default}}current{{/if}}"></em>
<label class="checkbox-label" for="trouble{{@index}}">{{text}}</label>
</span>
{{/each}}
</p>
<div class="application-reason" contentEditable="true">
{{# reason}}
{{.}}
{{/ reason}}
{{^ reason}}
<span class="placeholder">你可以從肌膚現有問題,鐘愛哪些產品等方面提交申請理由</span>
{{/ reason}}
</div>
<p class="clearfix">
<input id="submit-btn" class="submit-btn" type="submit" value="免費申請">
</p>
</form>
{{/ form}}
</div>
</div>
\ No newline at end of file
... ...
... ... @@ -34,9 +34,6 @@
<div class="more-score-top"></div>
<div class="more-score-bottom"></div>
<ul>
\{{#each sub}}
<li>\{{aName}} \{{t_score}}</li>
\{{/each}}
</ul>
</div>
</div>
... ...
<script id="review-list-template" type="text/x-handlebars-template">
\{{#each reviewList}}
<div class="review-item">
<div class="item-top clearfix">
<div class="user-avatar">
<img src="\{{titlePic}}" alt="">
<i class="\{{partnerType}}"></i>
</div>
<div class="user-info">
<p class="info-detail clearfix" class="clearfix">
<span class="name">\{{nick}}</span>
<span>\{{buyAgain}}&nbsp;/&nbsp;</span>
<span>\{{age}}&nbsp;/&nbsp;</span>
<span>\{{skin}}&nbsp;/&nbsp;</span>
<span>\{{update_time}}</span>
</p>
<div class="clearfix score-wrap">
<div class="final-score">
<h2>总评星</h2>
{{> common/final_score}}
</div>
\{{#if sub}}
<div class="detail-score">
<h4>细项评分:</h4>
<ul>
\{{#each sub}}
<li>\{{aName}} \{{t_score}}</li>
\{{/each}}
</ul>
<div class="more-score">
<a class="more-btn" href="javascript:;">更多</a>
<div class="more-score-list">
<div class="more-score-top"></div>
<div class="more-score-bottom"></div>
<ul>
</ul>
</div>
</div>
</div>
\{{/if}}
</div>
</div>
</div>
<div class="review-content">
<h2>\{{title}}</h2>
<div class="min-content">
<div class="text-wrap">
<p>\{{summary}}<a class="more-content" href="javascript:;">展開</a></p>
</div>
\{{#if pics}}
<div class="min-img clearfix">
\{{#each pics}}
<img src="\{{.}}" alt="">
\{{/each}}
</div>
\{{/if}}
</div>
<div class="normal-content">
\{{{content}}}
</div>
</div>
</div>
\{{/each}}
</script>
\ No newline at end of file
... ...
{{^ toolTip}}
<div class="tooltip" style="display:none;">
<p class="trial-tip">恭喜您申請提交成功!</p>
<p>請耐心等待系統審核</p>
<p>我們會短信通知您申請結果</p>
</div>
{{/ toolTip}}
{{# toolTip}}
<div class="tooltip">
<p class="trial-tip">{{title}}</p>
<p>{{content}}</p>
</div>
{{/ toolTip}}
\ No newline at end of file
... ...