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 46 additions and 14 deletions
... ... @@ -95,7 +95,7 @@
{{# trialStatus}}
{{> common/trial_status}}
{{/ trialStatus}}
<div class="review-list">
<div class="review-list" id="{{id}}">
<h2>试用报告</h2>
{{#each reviewList}}
<div class="review-item">
... ...
... ... @@ -20,7 +20,7 @@
<form class="review-form" action="">
<h2 class="form-title">试用网站评鉴结果分析</h2>
<div class="chart-score clearfix">
<div class="final-score">
<div class="final-score form-final">
<h2>总体评价</h2>
{{> common/final_score}}
</div>
... ... @@ -41,7 +41,7 @@
<div class="detail-score">
<ul class="clearfix">
{{#each detailScore}}
<li class="clearfix" core="{{.}}">
<li class="clearfix" score="{{.}}">
<label>{{@key}}</label>
<div class="score-select-wrap clearfix">
<a class="score-select" href="javascript:;"></a>
... ... @@ -63,7 +63,7 @@
{{#each buyAgain}}
<li class="clearfix">
<span>{{text}}</span>
<em><i>{{percent}}</i></em>
<em percent="{{percent}}"><i></i></em>
<span>{{num}}/{{percent}}</span>
</li>
{{/each}}
... ... @@ -77,7 +77,7 @@
{{#each skin}}
<li class="clearfix">
<span>{{text}}</span>
<em><i>{{percent}}</i></em>
<em percent="{{percent}}"><i></i></em>
<span>{{num}}/{{percent}}</span>
</li>
{{/each}}
... ... @@ -91,7 +91,7 @@
{{#each age}}
<li class="clearfix">
<span>{{text}}</span>
<em><i>{{percent}}</i></em>
<em percent="{{percent}}"><i></i></em>
<span>{{num}}/{{percent}}</span>
</li>
{{/each}}
... ... @@ -103,7 +103,7 @@
{{# trialStatus}}
{{> common/trial_status}}
{{/ trialStatus}}
<div class="review-list">
<div class="review-list" id="{{id}}">
<h2>试用报告</h2>
{{#each reviewList}}
<div class="review-item">
... ... @@ -124,6 +124,19 @@
</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="">
... ... @@ -133,6 +146,8 @@
{{/if}}
{{/each}}
</div>
</div>
<div class="score-wrap clearfix">
{{#if detailScore}}
<div class="detail-score">
... ... @@ -141,10 +156,11 @@
{{#each detailScore}}
<li>{{@key}} {{.}}</li>
{{/each}}
<li class="more-score-btn">
<span class="show-icon iconfont">更多&#xe604;</span>
<span class="put-away iconfont">收起&#xe603;</span>
</li>
</ul>
<div class="more-score">
<a class="more-btn" href="javascript:;">更多></a>
</div>
</div>
{{/if}}
... ... @@ -161,3 +177,4 @@
</div>
</div>
</div>
{{> layout/footer320}}
\ No newline at end of file
... ...
... ... @@ -26,9 +26,7 @@
{{> detail/application_form}}
{{/if}}
{{#if toolTip}}
{{> detail/tooltip}}
{{/if}}
</div>
</div>
{{> layout/footer320}}
... ...
{{# devEnvironment}}
<script src="http://cmsres.dev.yoho.cn/js/lib/sea-debug.js?nowrap"></script>
<script src="http://localhost:8000/js/lib/sea-debug.js?nowrap"></script>
{{/ devEnvironment}}
{{# testEnvironment}}
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
... ...
... ... @@ -46,3 +46,15 @@
});
</script>
{{/ about}}
{{# detailTrial}}
<script type="text/javascript">
seajs.use(['js/channel/detail-trial']);
</script>
{{/ detailTrial}}
{{# review}}
<script type="text/javascript">
seajs.use(['js/channel/review']);
</script>
{{/ review}}
\ No newline at end of file
... ...
... ... @@ -132,7 +132,12 @@
{{/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="免费申请">
... ...
... ... @@ -5,6 +5,6 @@
{{/ bigImg}}
</div>
<div class="main-content">
{{mainHtml}}
{{{mainHtml}}}
</div>
</div>
\ No newline at end of file
... ...