ued / yohogirls_mustache · Commits

Go to a project

Authored by unknown
Commit 9b2f61ade6d9c01d7b34322cc554a28efad60c1c 2 parents 1d4a3c71 96b75731

Merge branch 'develop' into test

Inline Side-by-side
Showing 9 changed files with 391 additions and 8 deletions
@@ -27,7 +27,10 @@ @@ -27,7 +27,10 @@
27 </div> 27 </div>
28 {{/if}} 28 {{/if}}
29 <div class="chart-score clearfix"> 29 <div class="chart-score clearfix">
30 - <div id="chart"></div> 30 + {{#if chart}}
  31 + <div id="chart" {{#each chart}}data-chart{{@key}}="{{.}}"{{/each}}>
  32 + </div>
  33 + {{/if}}
31 {{#if detailScore}} 34 {{#if detailScore}}
32 <div class="detail-score"> 35 <div class="detail-score">
33 <ul class="clearfix"> 36 <ul class="clearfix">
  1 +{{> layout/header_fan}}
  2 +<div class="detail-container clearfix">
  3 + {{#if trialStep}}
  4 + {{> common/trial_step}}
  5 + {{/if}}
  6 +
  7 + {{# header}}
  8 + {{> detail/detail_title}}
  9 + {{/ header}}
  10 + <div class="detail-body">
  11 + {{# content}}
  12 + {{> detail/trail_content}}
  13 + {{/ content}}
  14 + <form class="review-form" action="">
  15 + <h2 class="form-title">試用網站評鑒結果分析</h2>
  16 + <div class="final-score form-final">
  17 + <h2>總體評價</h2>
  18 + {{> common/final_score}}
  19 + </div>
  20 + {{#if reviewInfo}}
  21 + <div class="review-info">
  22 + <ul class="clearfix">
  23 + {{#each reviewInfo}}
  24 + <li>{{@key}}：{{.}}</li>
  25 + {{/each}}
  26 + </ul>
  27 + </div>
  28 + {{/if}}
  29 + <div class="chart-score clearfix">
  30 + {{#if chart}}
  31 + <div id="chart" {{#each chart}}data-chart{{@key}}="{{.}}"{{/each}}>
  32 + </div>
  33 + {{/if}}
  34 + {{#if detailScore}}
  35 + <div class="detail-score">
  36 + <ul class="clearfix">
  37 + {{#each detailScore}}
  38 + <li class="clearfix" score="{{.}}">
  39 + <label>{{@key}}</label>
  40 + <div class="score-select-wrap clearfix">
  41 + <a class="score-select" href="javascript:;"></a>
  42 + <a class="score-select" href="javascript:;"></a>
  43 + <a class="score-select" href="javascript:;"></a>
  44 + <a class="score-select" href="javascript:;"></a>
  45 + <a class="score-select" href="javascript:;"></a>
  46 + </div>
  47 + </li>
  48 + {{/each}}
  49 + </ul>
  50 + </div>
  51 + {{/if}}
  52 + </div>
  53 + <div class="review-class clearfix">
  54 + {{#if buyAgain}}
  55 + <div class="buy-again review-percent">
  56 + <h4>回購評分</h4>
  57 + <ul>
  58 + {{#each buyAgain}}
  59 + <li class="clearfix">
  60 + <span>{{text}}</span>
  61 + <em percent="{{percent}}"><i></i></em>
  62 + <span>{{num}}/{{percent}}</span>
  63 + </li>
  64 + {{/each}}
  65 + </ul>
  66 + </div>
  67 + {{/if}}
  68 + {{#if skin}}
  69 + <div class="review-percent">
  70 + <h4>參評網友膚質分佈</h4>
  71 + <ul>
  72 + {{#each skin}}
  73 + <li class="clearfix">
  74 + <span>{{text}}</span>
  75 + <em percent="{{percent}}"><i>{{percent}}</i></em>
  76 + <span>{{num}}/{{percent}}</span>
  77 + </li>
  78 + {{/each}}
  79 + </ul>
  80 + </div>
  81 + {{/if}}
  82 + {{#if age}}
  83 + <div class="review-percent">
  84 + <h4>參評網友年齡分佈</h4>
  85 + <ul>
  86 + {{#each skin}}
  87 + <li class="clearfix">
  88 + <span>{{text}}</span>
  89 + <em percent="{{percent}}"><i>{{percent}}</i></em>
  90 + <span>{{num}}/{{percent}}</span>
  91 + </li>
  92 + {{/each}}
  93 + </ul>
  94 + </div>
  95 + {{/if}}
  96 + </div>
  97 + </form>
  98 + {{# trialStatus}}
  99 + {{> common/trial_status_hk}}
  100 + {{/ trialStatus}}
  101 + <div class="review-list-wrap" id="{{id}}">
  102 + <h2>試用報告</h2>
  103 + <div class="review-list" id="{{id}}">
  104 + {{> detail/review_item_hk}}
  105 + </div>
  106 + <!-- {{#each reviewList}}
  107 + <div class="review-item">
  108 + <div class="item-top clearfix">
  109 + <div class="user-avatar">
  110 + <img src="{{avatar}}" alt="">
  111 + <i class="{{type}}"></i>
  112 + </div>
  113 + <div class="user-info">
  114 + <p class="info-detail clearfix" class="clearfix">
  115 + <span class="name">{{nickname}}</span>
  116 + <span>{{isBuy}}&nbsp;/&nbsp;</span>
  117 + <span>{{age}}&nbsp;/&nbsp;</span>
  118 + <span>{{skin}}&nbsp;/&nbsp;</span>
  119 + <span>{{time}}</span>
  120 + </p>
  121 + <div class="clearfix score-wrap">
  122 + <div class="final-score">
  123 + <h2>总评星</h2>
  124 + {{> common/final_score}}
  125 + </div>
  126 +
  127 + {{#if detailScore}}
  128 + <div class="detail-score">
  129 + <h4>细项评分：</h4>
  130 + <ul>
  131 + {{#each detailScore}}
  132 + <li>{{@key}} {{.}}</li>
  133 + {{/each}}
  134 + </ul>
  135 + {{#if moreDetailScore}}
  136 + <div class="more-score">
  137 + <a class="more-btn" href="javascript:;">更多</a>
  138 + <div class="more-score-list">
  139 + <div class="more-score-top"></div>
  140 + <div class="more-score-bottom"></div>
  141 + <ul>
  142 + {{#each moreDetailScore}}
  143 + <li>{{@key}} {{.}}</li>
  144 + {{/each}}
  145 + </ul>
  146 + </div>
  147 + </div>
  148 + {{/if}}
  149 + </div>
  150 + {{/if}}
  151 + </div>
  152 + </div>
  153 + </div>
  154 + <div class="review-content">
  155 + <h2>{{title}}</h2>
  156 + <div class="min-content">
  157 + {{# minContent}}
  158 + <div class="text-wrap">
  159 + <p>{{text}}<a class="more-content" href="javascript:;">展开</a></p>
  160 + </div>
  161 + <div class="min-img clearfix">
  162 + {{#each imgBox}}
  163 + <img src="{{img}}" alt="">
  164 + {{/each}}
  165 + </div>
  166 + {{/ minContent}}
  167 + </div>
  168 + <div class="normal-content">
  169 + {{#each content}}
  170 + {{#if img}}
  171 + <img src="{{img}}" alt="">
  172 + {{/if}}
  173 + {{#if text}}
  174 + <p>{{text}}</p>
  175 + {{/if}}
  176 + {{/each}}
  177 + </div>
  178 +
  179 + </div>
  180 + </div>
  181 + {{/each}} -->
  182 + <div class="load-more">
  183 + <a href="javascript:;"></a>
  184 + </div>
  185 + </div>
  186 + <div class="review-pagination" style="display:none">
  187 + {{> channel/pager}}
  188 + </div>
  189 + </div>
  190 +</div>
  191 +{{> layout/footer_fan}}
  1 +{{> layout/header_fan}}
  2 +<div class="detail-container clearfix">
  3 + {{#if trialStep}}
  4 + {{> common/trial_step}}
  5 + {{/if}}
  6 +
  7 + {{# header}}
  8 + {{> detail/detail_title}}
  9 + {{/ header}}
  10 + <div class="detail-body">
  11 + {{# content}}
  12 + {{> detail/trail_content}}
  13 + {{/ content}}
  14 +
  15 + {{# trialStatus}}
  16 + {{> common/trial_status_hk}}
  17 + {{/ trialStatus}}
  18 +
  19 + {{#unless toolTip}}
  20 + {{> detail/application_form_hk}}
  21 + {{/unless}}
  22 +
  23 + {{> detail/tooltip_hk}}
  24 + </div>
  25 +</div>
  26 +{{> common/share_hk}}
  27 +{{> layout/footer_fan}}
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 {{#if passCheck}} 2 {{#if passCheck}}
3 <p class="pass-tip">您已经通过审核，发点试用心得吧～</p> 3 <p class="pass-tip">您已经通过审核，发点试用心得吧～</p>
4 {{/if}} 4 {{/if}}
5 - {{#if publishUrl}} 5 + {{#if isEnd}}
6 <a class="end-btn" href="javascript:;">活动已结束</a> 6 <a class="end-btn" href="javascript:;">活动已结束</a>
7 {{/if}} 7 {{/if}}
8 {{# like}} 8 {{# like}}
@@ -11,7 +11,4 @@ @@ -11,7 +11,4 @@
11 <b class="like-num {{# isLike}}apply-dislike{{/ isLike}}">{{#if num}}{{num}}{{/if}}</b> 11 <b class="like-num {{# isLike}}apply-dislike{{/ isLike}}">{{#if num}}{{num}}{{/if}}</b>
12 </a> 12 </a>
13 {{/ like}} 13 {{/ like}}
14 - {{#if publishUrl}}  
15 - <a class="publish-btn" href="{{publishUrl}}">发试用心得</a>  
16 - {{/if}}  
17 </div> 14 </div>
  1 +<div class="trial-status clearfix">
  2 + {{#if passCheck}}
  3 + <p class="pass-tip">您已經通過審核，發點試用心得吧～</p>
  4 + {{/if}}
  5 + {{#if isEnd}}
  6 + <a class="end-btn" href="javascript:;">活動已結束</a>
  7 + {{/if}}
  8 + {{# like}}
  9 + <a class="user-like" href="javascript:;">
  10 + <span class="iconfont">&#xe600;</span>
  11 + <b class="like-num {{# isLike}}apply-dislike{{/ isLike}}">{{#if num}}{{num}}{{/if}}</b>
  12 + </a>
  13 + {{/ like}}
  14 +</div>
  1 +<div class="application-form">
  2 + <div class="application-tips">
  3 + <h2>TIPS</h2>
  4 + <p>{{formTip}}</p>
  5 + </div>
  6 + <div class="form">
  7 + {{# form}}
  8 + <form id="application-form" c-id="{{id}}" action="" onsubmit="return false;">
  9 + <p class="clearfix">
  10 + <label for="user-name">姓名：</label>
  11 + <input id="userName" name="userName" class="char required" type="text" value="{{name}}">
  12 + </p>
  13 + <p class="clearfix">
  14 + <label for="user-tell">手機：</label>
  15 + <input id="userTell" name="userTell" class="char required" type="text" value="{{tell}}">
  16 + <i class="verification-btn">獲取驗證碼</i>
  17 + </p>
  18 + <p class="clearfix">
  19 + <label for="user-verification">驗證碼：</label>
  20 + <input id="userVerification" name="verification" class="char" type="text">
  21 + <i class="verification-icon">驗證碼錯誤</i>
  22 + </p>
  23 + <p class="address-char clearfix">
  24 + <label for="user-address">地址：</label>
  25 + <span id="userAddress" class="varchar" contentEditable="true">{{address}}</span>
  26 + </p>
  27 + <p class="clearfix">
  28 + <label for="user-age">年齡：</label>
  29 + <input id="userAge" name="age" class="char required" type="text" value="{{age}}">
  30 + </p>
  31 + <p class="gender-select clearfix">
  32 + <label>性別：</label>
  33 + {{#each gender}}
  34 + <span class="select-item clearfix">
  35 + <input id="gender{{@index}}" class="gender radio" name="user-gender" type="radio" value="{{value}}" {{#if default}}checked{{/if}}>
  36 + <label class="radio-label {{#if default}}current{{/if}}" for="gender{{@index}}">{{value}}</label>
  37 + </span>
  38 + {{/each}}
  39 + </p>
  40 + <p class="skin-select clearfix">
  41 + <label>膚質：</label>
  42 + {{#each skin}}
  43 + <span class="select-item clearfix">
  44 + <input id="skin{{@index}}" class="radio" name="user-skin" type="radio" value="{{text}}" {{#if default}}checked{{/if}}>
  45 + <label class="radio-label radio-long-label {{#if default}}current{{/if}}" for="skin{{@index}}">{{text}}</label>
  46 + </span>
  47 + {{/each}}
  48 + </p>
  49 + <p class="clearfix">
  50 + <label>您的問題</label>
  51 + </p>
  52 + <p class="trouble-wrap clearfix">
  53 + {{#each problem}}
  54 + <span class="select-item clearfix">
  55 + <input id="trouble{{@index}}" class="checkbox" name="user-trouble" type="checkbox" value="{{text}}" {{#if default}}checked{{/if}}>
  56 + <em class="{{#if default}}current{{/if}}"></em>
  57 + <label class="checkbox-label" for="trouble{{@index}}">{{text}}</label>
  58 + </span>
  59 + {{/each}}
  60 + </p>
  61 + <div class="application-reason" contentEditable="true">
  62 + {{# reason}}
  63 + {{.}}
  64 + {{/ reason}}
  65 + {{^ reason}}
  66 + <span class="placeholder">你可以從肌膚現有問題，鐘愛哪些產品等方面提交申請理由</span>
  67 + {{/ reason}}
  68 + </div>
  69 + <p class="clearfix">
  70 + <input id="submit-btn" class="submit-btn" type="submit" value="免費申請">
  71 + </p>
  72 + </form>
  73 + {{/ form}}
  74 + </div>
  75 +</div>
@@ -34,9 +34,6 @@ @@ -34,9 +34,6 @@
34 <div class="more-score-top"></div> 34 <div class="more-score-top"></div>
35 <div class="more-score-bottom"></div> 35 <div class="more-score-bottom"></div>
36 <ul> 36 <ul>
37 - \{{#each sub}}  
38 - <li>\{{aName}} \{{t_score}}</li>  
39 - \{{/each}}  
40 </ul> 37 </ul>
41 </div> 38 </div>
42 </div> 39 </div>
  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">
  10 + <p class="info-detail clearfix" class="clearfix">
  11 + <span class="name">\{{nick}}</span>
  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 class="clearfix score-wrap">
  18 + <div class="final-score">
  19 + <h2>总评星</h2>
  20 + {{> common/final_score}}
  21 + </div>
  22 +
  23 + \{{#if sub}}
  24 + <div class="detail-score">
  25 + <h4>细项评分：</h4>
  26 + <ul>
  27 + \{{#each sub}}
  28 + <li>\{{aName}} \{{t_score}}</li>
  29 + \{{/each}}
  30 + </ul>
  31 + <div class="more-score">
  32 + <a class="more-btn" href="javascript:;">更多</a>
  33 + <div class="more-score-list">
  34 + <div class="more-score-top"></div>
  35 + <div class="more-score-bottom"></div>
  36 + <ul>
  37 + </ul>
  38 + </div>
  39 + </div>
  40 + </div>
  41 + \{{/if}}
  42 + </div>
  43 + </div>
  44 + </div>
  45 + <div class="review-content">
  46 + <h2>\{{title}}</h2>
  47 + <div class="min-content">
  48 + <div class="text-wrap">
  49 + <p>\{{summary}}<a class="more-content" href="javascript:;">展開</a></p>
  50 + </div>
  51 + \{{#if pics}}
  52 + <div class="min-img clearfix">
  53 + \{{#each pics}}
  54 + <img src="\{{.}}" alt="">
  55 + \{{/each}}
  56 + </div>
  57 + \{{/if}}
  58 + </div>
  59 + <div class="normal-content">
  60 + \{{{content}}}
  61 + </div>
  62 +
  63 + </div>
  64 +</div>
  65 +\{{/each}}
  66 +</script>
  1 +{{^ toolTip}}
  2 +<div class="tooltip" style="display:none;">
  3 + <p class="trial-tip">恭喜您申請提交成功！</p>
  4 + <p>請耐心等待系統審核</p>
  5 + <p>我們會短信通知您申請結果</p>
  6 +</div>
  7 +{{/ toolTip}}
  8 +{{# toolTip}}
  9 +<div class="tooltip">
  10 + <p class="trial-tip">{{title}}</p>
  11 + <p>{{content}}</p>
  12 +</div>
  13 +{{/ toolTip}}