Authored by unknown

Merge branch 'develop' into test

@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <span time="{{time}}" class="time-format"></span> 13 <span time="{{time}}" class="time-format"></span>
14 </div> 14 </div>
15 {{/ detailData}} 15 {{/ detailData}}
16 - <div class="detail-body"> 16 + <div class="detail-body" id="{{id}}">
17 {{# content}} 17 {{# content}}
18 {{> detail/trail_content}} 18 {{> detail/trail_content}}
19 {{/ content}} 19 {{/ content}}
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <h2>总体评价</h2> 24 <h2>总体评价</h2>
25 {{> common/final_score}} 25 {{> common/final_score}}
26 </div> 26 </div>
27 - <div id="chart"></div> 27 + <div id="chart" {{#each chart}}data-chart{{@key}}="{{.}}"{{/each}}></div>
28 </div> 28 </div>
29 29
30 {{#if reviewInfo}} 30 {{#if reviewInfo}}
  1 +{{> layout/writer_header_hk320}}
  2 +<div id="wx_pic" style="width:0px; height:0px; overflow:hidden"><img src="{{shareImg}}"/></div>
  3 +<div id="trial-detail" class="detail">
  4 + {{# detailData}}
  5 + <h2 class="share-h2">{{title}}</h2>
  6 + <h3 class="share-h3">{{subTitle}}</h3>
  7 + <div class="author-channel">
  8 + {{# author}}
  9 + <p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p>
  10 + {{/ author}}
  11 + {{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
  12 + {{# twoChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ twoChannel}}
  13 + <span time="{{time}}" class="time-format"></span>
  14 + </div>
  15 + {{/ detailData}}
  16 + <div class="detail-body" id="{{id}}">
  17 + {{# content}}
  18 + {{> detail/trail_content}}
  19 + {{/ content}}
  20 + <form class="review-form" action="">
  21 + <h2 class="form-title">試用網站評鑒結果分析</h2>
  22 + <div class="chart-score clearfix">
  23 + <div class="final-score form-final">
  24 + <h2>總體評價</h2>
  25 + {{> common/final_score}}
  26 + </div>
  27 + <div id="chart" {{#each chart}}data-chart{{@key}}="{{.}}"{{/each}}></div>
  28 + </div>
  29 +
  30 + {{#if reviewInfo}}
  31 + <div class="review-info">
  32 + <ul class="clearfix">
  33 + {{#each reviewInfo}}
  34 + <li>{{@key}}:{{.}}</li>
  35 + {{/each}}
  36 + </ul>
  37 + </div>
  38 + {{/if}}
  39 +
  40 + {{#if detailScore}}
  41 + <div class="detail-score">
  42 + <ul class="clearfix">
  43 + {{#each detailScore}}
  44 + <li class="clearfix" score="{{.}}">
  45 + <label>{{@key}}</label>
  46 + <div class="score-select-wrap clearfix">
  47 + <a class="score-select" href="javascript:;"></a>
  48 + <a class="score-select" href="javascript:;"></a>
  49 + <a class="score-select" href="javascript:;"></a>
  50 + <a class="score-select" href="javascript:;"></a>
  51 + <a class="score-select" href="javascript:;"></a>
  52 + </div>
  53 + </li>
  54 + {{/each}}
  55 + </ul>
  56 + </div>
  57 + {{/if}}
  58 + <div class="review-class clearfix">
  59 + {{#if buyAgain}}
  60 + <div class="buy-again review-percent">
  61 + <h4>回購評分</h4>
  62 + <ul>
  63 + {{#each buyAgain}}
  64 + <li class="clearfix">
  65 + <span>{{text}}</span>
  66 + <em percent="{{percent}}"><i></i></em>
  67 + <span>{{num}}/{{percent}}</span>
  68 + </li>
  69 + {{/each}}
  70 + </ul>
  71 + </div>
  72 + {{/if}}
  73 + {{#if skin}}
  74 + <div class="review-percent">
  75 + <h4>參評網友膚質分佈</h4>
  76 + <ul>
  77 + {{#each skin}}
  78 + <li class="clearfix">
  79 + <span>{{text}}</span>
  80 + <em percent="{{percent}}"><i></i></em>
  81 + <span>{{num}}/{{percent}}</span>
  82 + </li>
  83 + {{/each}}
  84 + </ul>
  85 + </div>
  86 + {{/if}}
  87 + {{#if age}}
  88 + <div class="review-percent">
  89 + <h4>參評網友年齡分佈</h4>
  90 + <ul>
  91 + {{#each age}}
  92 + <li class="clearfix">
  93 + <span>{{text}}</span>
  94 + <em percent="{{percent}}"><i></i></em>
  95 + <span>{{num}}/{{percent}}</span>
  96 + </li>
  97 + {{/each}}
  98 + </ul>
  99 + </div>
  100 + {{/if}}
  101 + </div>
  102 + </form>
  103 + {{# trialStatus}}
  104 + {{> common/trial_status_hk}}
  105 + {{/ trialStatus}}
  106 + <div class="review-list-wrap" id="{{id}}">
  107 + <h2>試用報告</h2>
  108 + <div class="review-list">
  109 + {{> detail/review_item_hk320}}
  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 +
  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">
  178 + <a href="javascript:;"></a>
  179 + </div>
  180 + </div>
  181 + </div>
  182 +</div>
  183 +{{> layout/footer_hk320}}
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <span time="{{time}}" class="time-format"></span> 13 <span time="{{time}}" class="time-format"></span>
14 </div> 14 </div>
15 {{/ detailData}} 15 {{/ detailData}}
16 - <div class="detail-body"> 16 + <div class="detail-body" id="{{id}}">
17 {{# content}} 17 {{# content}}
18 {{> detail/trail_content}} 18 {{> detail/trail_content}}
19 {{/ content}} 19 {{/ content}}
  1 +{{> layout/writer_header_hk320}}
  2 +<div id="wx_pic" style="width:0px; height:0px; overflow:hidden"><img src="{{shareImg}}"/></div>
  3 +<div id="trial-detail" class="detail">
  4 + {{# detailData}}
  5 + <h2 class="share-h2">{{title}}</h2>
  6 + <h3 class="share-h3">{{subTitle}}</h3>
  7 + <div class="author-channel">
  8 + {{# author}}
  9 + <p><a class="detail_author" href="{{link}}" target="_blank">Text:&nbsp;{{name}}</a></p>
  10 + {{/ author}}
  11 + {{# channel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ channel}}
  12 + {{# twoChannel}}<a href="{{link}}">{{name}}</a>&nbsp;|&nbsp;{{/ twoChannel}}
  13 + <span time="{{time}}" class="time-format"></span>
  14 + </div>
  15 + {{/ detailData}}
  16 + <div class="detail-body" id="{{id}}">
  17 + {{# content}}
  18 + {{> detail/trail_content}}
  19 + {{/ content}}
  20 +
  21 + {{# trialStatus}}
  22 + {{> common/trial_status_hk}}
  23 + {{/ trialStatus}}
  24 +
  25 + {{#if formTip}}
  26 + {{> detail/application_form_hk}}
  27 + {{/if}}
  28 +
  29 + {{> detail/tooltip_hk}}
  30 + </div>
  31 +</div>
  32 +{{> layout/footer_hk320}}
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 \{{/if}} 31 \{{/if}}
32 </div> 32 </div>
33 <div class="normal-content"> 33 <div class="normal-content">
34 - \{{{content}}} 34 + \{{reviewContent}}
35 </div> 35 </div>
36 36
37 </div> 37 </div>
@@ -16,13 +16,13 @@ @@ -16,13 +16,13 @@
16 </p> 16 </p>
17 <div class="clearfix score-wrap"> 17 <div class="clearfix score-wrap">
18 <div class="final-score"> 18 <div class="final-score">
19 - <h2>总评</h2> 19 + <h2>總評</h2>
20 {{> common/final_score}} 20 {{> common/final_score}}
21 </div> 21 </div>
22 22
23 \{{#if sub}} 23 \{{#if sub}}
24 <div class="detail-score"> 24 <div class="detail-score">
25 - <h4>细项评分:</h4> 25 + <h4>細項評分:</h4>
26 <ul> 26 <ul>
27 \{{#each sub}} 27 \{{#each sub}}
28 <li>\{{aName}} \{{t_score}}</li> 28 <li>\{{aName}} \{{t_score}}</li>
  1 +<script id="review-list-template" type="text/x-handlebars-template">
  2 +\{{#each reviewList}}
  3 +<div class="review-item">
  4 + <div class="item-top clearfix">
  5 + <div class="user-avatar">
  6 + <img src="\{{titlePic}}" alt="">
  7 + <i class="\{{partnerType}}"></i>
  8 + </div>
  9 + <div class="user-info clearfix">
  10 + <span class="name">\{{nick}}</span>
  11 + <p class="clearfix">
  12 + <span>\{{buyAgain}}&nbsp;/&nbsp;</span>
  13 + <span>\{{age}}&nbsp;/&nbsp;</span>
  14 + <span>\{{skin}}&nbsp;/&nbsp;</span>
  15 + <span>\{{update_time}}</span>
  16 + </p>
  17 + </div>
  18 + </div>
  19 + <div class="review-content">
  20 + <h2>\{{title}}</h2>
  21 + <div class="min-content">
  22 + <div class="text-wrap">
  23 + <p>\{{summary}}<a class="more-content" href="javascript:;">展開</a></p>
  24 + </div>
  25 + \{{#if pics}}
  26 + <div class="min-img clearfix">
  27 + \{{#each pics}}
  28 + <img src="\{{.}}" alt="">
  29 + \{{/each}}
  30 + </div>
  31 + \{{/if}}
  32 + </div>
  33 + <div class="normal-content">
  34 + \{{reviewContent}}
  35 + </div>
  36 +
  37 + </div>
  38 + <div class="score-wrap clearfix">
  39 + \{{#if sub}}
  40 + <div class="detail-score">
  41 + <h4>細項評分:</h4>
  42 + <ul class="clearfix">
  43 + \{{#each sub}}
  44 + <li>\{{aName}} \{{t_score}}</li>
  45 + \{{/each}}
  46 + <li class="more-score-btn">
  47 + <span class="show-icon iconfont">更多&#xe604;</span>
  48 + <span class="put-away iconfont">收起&#xe603;</span>
  49 + </li>
  50 + </ul>
  51 + </div>
  52 + \{{/if}}
  53 + <div class="final-score">
  54 + <h2>總評星</h2>
  55 + {{> common/final_score}}
  56 + </div>
  57 + </div>
  58 +</div>
  59 +\{{/each}}
  60 +</script>