ued / yohogirls_mustache · Commits

Go to a project

Authored by lore-w
Commit b6f0b9114ee07172f88023cdeb7768f534dee522 2 parents 0460973a 0c0ea29e

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

Inline Side-by-side
Showing 7 changed files with 58 additions and 26 deletions
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 {{# trialStatus}} 95 {{# trialStatus}}
96 {{> common/trial_status}} 96 {{> common/trial_status}}
97 {{/ trialStatus}} 97 {{/ trialStatus}}
98 - <div class="review-list"> 98 + <div class="review-list" id="{{id}}">
99 <h2>试用报告</h2> 99 <h2>试用报告</h2>
100 {{#each reviewList}} 100 {{#each reviewList}}
101 <div class="review-item"> 101 <div class="review-item">
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <form class="review-form" action=""> 20 <form class="review-form" action="">
21 <h2 class="form-title">试用网站评鉴结果分析</h2> 21 <h2 class="form-title">试用网站评鉴结果分析</h2>
22 <div class="chart-score clearfix"> 22 <div class="chart-score clearfix">
23 - <div class="final-score"> 23 + <div class="final-score form-final">
24 <h2>总体评价</h2> 24 <h2>总体评价</h2>
25 {{> common/final_score}} 25 {{> common/final_score}}
26 </div> 26 </div>
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <div class="detail-score"> 41 <div class="detail-score">
42 <ul class="clearfix"> 42 <ul class="clearfix">
43 {{#each detailScore}} 43 {{#each detailScore}}
44 - <li class="clearfix" core="{{.}}"> 44 + <li class="clearfix" score="{{.}}">
45 <label>{{@key}}</label> 45 <label>{{@key}}</label>
46 <div class="score-select-wrap clearfix"> 46 <div class="score-select-wrap clearfix">
47 <a class="score-select" href="javascript:;"></a> 47 <a class="score-select" href="javascript:;"></a>
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 {{#each buyAgain}} 63 {{#each buyAgain}}
64 <li class="clearfix"> 64 <li class="clearfix">
65 <span>{{text}}</span> 65 <span>{{text}}</span>
66 - <em><i>{{percent}}</i></em> 66 + <em percent="{{percent}}"><i></i></em>
67 <span>{{num}}/{{percent}}</span> 67 <span>{{num}}/{{percent}}</span>
68 </li> 68 </li>
69 {{/each}} 69 {{/each}}
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 {{#each skin}} 77 {{#each skin}}
78 <li class="clearfix"> 78 <li class="clearfix">
79 <span>{{text}}</span> 79 <span>{{text}}</span>
80 - <em><i>{{percent}}</i></em> 80 + <em percent="{{percent}}"><i></i></em>
81 <span>{{num}}/{{percent}}</span> 81 <span>{{num}}/{{percent}}</span>
82 </li> 82 </li>
83 {{/each}} 83 {{/each}}
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 {{#each age}} 91 {{#each age}}
92 <li class="clearfix"> 92 <li class="clearfix">
93 <span>{{text}}</span> 93 <span>{{text}}</span>
94 - <em><i>{{percent}}</i></em> 94 + <em percent="{{percent}}"><i></i></em>
95 <span>{{num}}/{{percent}}</span> 95 <span>{{num}}/{{percent}}</span>
96 </li> 96 </li>
97 {{/each}} 97 {{/each}}
@@ -103,7 +103,7 @@ @@ -103,7 +103,7 @@
103 {{# trialStatus}} 103 {{# trialStatus}}
104 {{> common/trial_status}} 104 {{> common/trial_status}}
105 {{/ trialStatus}} 105 {{/ trialStatus}}
106 - <div class="review-list"> 106 + <div class="review-list" id="{{id}}">
107 <h2>试用报告</h2> 107 <h2>试用报告</h2>
108 {{#each reviewList}} 108 {{#each reviewList}}
109 <div class="review-item"> 109 <div class="review-item">
@@ -124,14 +124,29 @@ @@ -124,14 +124,29 @@
124 </div> 124 </div>
125 <div class="review-content"> 125 <div class="review-content">
126 <h2>{{title}}</h2> 126 <h2>{{title}}</h2>
127 - {{#each content}}  
128 - {{#if img}}  
129 - <img src="{{img}}" alt="">  
130 - {{/if}}  
131 - {{#if text}}  
132 - <p>{{text}}</p>  
133 - {{/if}}  
134 - {{/each}} 127 + <div class="min-content">
  128 + {{# minContent}}
  129 + <div class="text-wrap">
  130 + <p>{{text}}<a class="more-content" href="javascript:;">展开</a></p>
  131 + </div>
  132 + <div class="min-img clearfix">
  133 + {{#each imgBox}}
  134 + <img src="{{img}}" alt="">
  135 + {{/each}}
  136 + </div>
  137 + {{/ minContent}}
  138 + </div>
  139 + <div class="normal-content">
  140 + {{#each content}}
  141 + {{#if img}}
  142 + <img src="{{img}}" alt="">
  143 + {{/if}}
  144 + {{#if text}}
  145 + <p>{{text}}</p>
  146 + {{/if}}
  147 + {{/each}}
  148 + </div>
  149 +
135 </div> 150 </div>
136 <div class="score-wrap clearfix"> 151 <div class="score-wrap clearfix">
137 {{#if detailScore}} 152 {{#if detailScore}}
@@ -141,10 +156,11 @@ @@ -141,10 +156,11 @@
141 {{#each detailScore}} 156 {{#each detailScore}}
142 <li>{{@key}} {{.}}</li> 157 <li>{{@key}} {{.}}</li>
143 {{/each}} 158 {{/each}}
  159 + <li class="more-score-btn">
  160 + <span class="show-icon iconfont">更多&#xe604;</span>
  161 + <span class="put-away iconfont">收起&#xe603;</span>
  162 + </li>
144 </ul> 163 </ul>
145 - <div class="more-score">  
146 - <a class="more-btn" href="javascript:;">更多></a>  
147 - </div>  
148 </div> 164 </div>
149 {{/if}} 165 {{/if}}
150 166
@@ -160,4 +176,5 @@ @@ -160,4 +176,5 @@
160 </div> 176 </div>
161 </div> 177 </div>
162 </div> 178 </div>
163 -</div>  
  179 +</div>
  180 +{{> layout/footer320}}
@@ -25,10 +25,8 @@ @@ -25,10 +25,8 @@
25 {{#if formTip}} 25 {{#if formTip}}
26 {{> detail/application_form}} 26 {{> detail/application_form}}
27 {{/if}} 27 {{/if}}
28 -  
29 - {{#if toolTip}}  
30 - {{> detail/tooltip}}  
31 - {{/if}} 28 +
  29 + {{> detail/tooltip}}
32 </div> 30 </div>
33 </div> 31 </div>
34 {{> layout/footer320}} 32 {{> layout/footer320}}
1 {{# devEnvironment}} 1 {{# devEnvironment}}
2 -<script src="http://cmsres.dev.yoho.cn/js/lib/sea-debug.js?nowrap"></script> 2 +<script src="http://localhost:8000/js/lib/sea-debug.js?nowrap"></script>
3 {{/ devEnvironment}} 3 {{/ devEnvironment}}
4 {{# testEnvironment}} 4 {{# testEnvironment}}
5 <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script> 5 <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
@@ -45,4 +45,16 @@ @@ -45,4 +45,16 @@
45 feedback.init(); 45 feedback.init();
46 }); 46 });
47 </script> 47 </script>
48 -{{/ about}}  
  48 +{{/ about}}
  49 +
  50 +{{# detailTrial}}
  51 +<script type="text/javascript">
  52 + seajs.use(['js/channel/detail-trial']);
  53 +</script>
  54 +{{/ detailTrial}}
  55 +
  56 +{{# review}}
  57 +<script type="text/javascript">
  58 + seajs.use(['js/channel/review']);
  59 +</script>
  60 +{{/ review}}
@@ -132,7 +132,12 @@ @@ -132,7 +132,12 @@
132 {{/each}} 132 {{/each}}
133 </p> 133 </p>
134 <div class="application-reason" contentEditable="true"> 134 <div class="application-reason" contentEditable="true">
  135 + {{# reason}}
  136 + {{.}}
  137 + {{/ reason}}
  138 + {{^ reason}}
135 <span class="placeholder">你可以从肌肤现有问题，钟爱哪些产品等方面提交申请理由</span> 139 <span class="placeholder">你可以从肌肤现有问题，钟爱哪些产品等方面提交申请理由</span>
  140 + {{/ reason}}
136 </div> 141 </div>
137 <p class="clearfix"> 142 <p class="clearfix">
138 <input id="submit-btn" class="submit-btn" type="submit" value="免费申请"> 143 <input id="submit-btn" class="submit-btn" type="submit" value="免费申请">
@@ -5,6 +5,6 @@ @@ -5,6 +5,6 @@
5 {{/ bigImg}} 5 {{/ bigImg}}
6 </div> 6 </div>
7 <div class="main-content"> 7 <div class="main-content">
8 - {{mainHtml}} 8 + {{{mainHtml}}}
9 </div> 9 </div>
10 </div> 10 </div>