Authored by htoooth

Merge branch 'feature/detail-comment-plus' into feature/recommend

... ... @@ -264,7 +264,7 @@
</span>
</p>
</div>
<div data-comment-list="6">
<div data-comment-list="6" class="m-hide">
<ul></ul>
<p class="more-wrap">
<span class="load-more-comments load-more">
... ...
No preview for this file type
... ... @@ -2,7 +2,7 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>
Created by FontForge 20120731 at Fri Nov 4 10:22:25 2016
Created by FontForge 20120731 at Fri Nov 4 18:16:33 2016
By admin
</metadata>
<defs>
... ...
No preview for this file type
No preview for this file type
... ... @@ -19,8 +19,8 @@
{{#if_cond comfort "===" "SMALL"}}偏小{{/if_cond}}
{{#if_cond comfort "===" "BIG"}}偏大{{/if_cond}}
</dd>
{{#if height}}<dd>身高:{{height}} cm</dd>{{/if}}
{{#if weight}}<dd>体重:{{weight}} kg</dd>{{/if}}
<dd>{{#if height}}身高:{{height}} 厘米{{/if}}</dd>
<dd>{{#if weight}}体重:{{weight}} 公斤{{/if}}</dd>
</dl>
</div>
... ... @@ -33,12 +33,12 @@
</a>
<div class="img-detail">
<dl class="toolbar">
<dd data-role="preview-close"><i class="iconfong">&#xe63b;</i>收起</dd>
<dd data-role="preview-left"><i class="iconfong">&#xe639;</i>向左旋转</dd>
<dd data-role="preview-right"><i class="iconfong">&#xe63a;</i>向右旋转</dd>
<dd data-role="preview-close"><i class="iconfont">&#xe63b;</i>收起</dd>
<dd data-role="preview-left"><i class="iconfont">&#xe639;</i>向左旋转</dd>
<dd data-role="preview-right"><i class="iconfont">&#xe63a;</i>向右旋转</dd>
</dl>
<div class="img-wrap">
<img src="{{image url 400 400}}" />
<img src="{{image url 345 345}}" />
</div>
</div>
</div>
... ...
... ... @@ -738,7 +738,8 @@ lazyLoad($('#details-html img'));
function fetchComment() {
var commentPage = {}, // 每个类型的分页页码
currentType = '7', // 当前评论展示的类型
consultPage = 1;
consultPage = 1,
cNumReady = false; // 只第一次请求后更新数量
var commentsTpl = require('hbs/product/comment-item.hbs'),
consultsTpl = require('hbs/product/consult-item.hbs'),
... ... @@ -783,6 +784,9 @@ function fetchComment() {
// 更新总数显示
// $commentNum.text(res[0].total);
if (filter && filter.length && !cNumReady) {
cNumReady = true;
$(filter).each(function(idx, fit) {
if (fit.num) {
$('.comments [data-comment-type=' + fit.filterId + '] em').text(fit.num);
... ... @@ -792,6 +796,7 @@ function fetchComment() {
}
}
});
}
$ul.append(commentsTpl({
comments: res
... ...
.product-detail-page {
.m-hide{
display:none;
}
.brand-banner {
height: 45px;
width: 100%;
... ... @@ -877,7 +880,7 @@
height:20px;
width:90px;
cursor:pointer;
background: resolve(img/home/star.png) 0 -20px repeat-x;
background: resolve("home/star.png") 0 -20px repeat-x;
.star-1, .star-2, .star-3, .star-4, .star-5{
position: absolute;
... ... @@ -888,7 +891,7 @@
width: 18px;
&.active {
background: resolve(img/home/star.png) repeat-x;
background: resolve("home/star.png") repeat-x;
}
}
.star-2{
... ... @@ -906,7 +909,7 @@
&.editable > span{
&:hover{
background: resolve(img/home/star.png) repeat-x;
background: resolve("home/star.png") repeat-x;
}
}
}
... ... @@ -990,9 +993,9 @@
}
.img-wrap{
width:400px;
height:400px;
width:345px;
height:345px;
overflow:hidden;
}
}
... ... @@ -1012,6 +1015,8 @@
&.horizontal-list{
dd {
float:left;
width: 100px;
text-align: center;
}
}
}
... ... @@ -1073,6 +1078,7 @@
float:left;
margin-right:30px;
cursor: pointer;
margin-bottom:0;
&.active{
font-weight:bold;
... ...