Authored by 姜枫

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

... ... @@ -212,7 +212,7 @@ const setPathNav = (data, name, channel) => {
if (!_.isEmpty(sort)) {
navs.push({
link: helpers.urlFormat('/list', {
link: helpers.urlFormat('/product/list', {
msort: sort.sort_id,
gender: gender
}),
... ... @@ -223,7 +223,7 @@ const setPathNav = (data, name, channel) => {
// 二级分类
if (!_.isEmpty(sort.sub)) {
navs.push({
link: helpers.urlFormat('/list', {
link: helpers.urlFormat('/product/list', {
msort: sort.sort_id,
misort: sort.sub.sort_id,
gender: gender
... ... @@ -379,6 +379,11 @@ const setProductData = base => {
// 默认第一张图片
if (!_.has(resData, 'img')) {
resData.img = value.colorImage;
// 只有一张图时不显示左右切换箭头
if (thumbs.length < 2) {
resData.btnsHide = true;
}
}
// 商品尺码列表
... ...
... ... @@ -11,7 +11,7 @@
<div class="thumbs left clearfix">
<div class="thumb-show right">
<img id="main-thumb" src="{{image img 482 643}}" style="display: block;">
<div class="check-btns">
<div class="check-btns{{#if btnsHide}} hide{{/if}}">
<span class="iconfont pre-thumb">&#xe62c;</span>
<span class="iconfont next-thumb">&#xe629;</span>
</div>
... ... @@ -202,7 +202,7 @@
{{# basic}}
<li>
<label class="title">{{key}}<span></span></label>
: {{value}}
: <span class="info">{{value}}</span>
</li>
{{/ basic}}
</ul>
... ... @@ -211,7 +211,7 @@
{{# comfort}}
<li>
<label class="title">{{name}}<span></span></label>
: <span class="min-des">{{minDes}}</span>
: <span class="min-des info">{{minDes}}</span>
{{# blocks}}
<span class="comfort-block{{#if cur}} cur{{/if}}"></span>
{{/ blocks}}
... ...
... ... @@ -62,7 +62,7 @@ function changeThumb($dom) {
}
function chooseDefaultSize() {
var $item = $sizeList.not('.hide').children();
var $item = $sizeList.not('.hide').children().not('.disable');
if ($colorItem && $colorItem.length === 1 &&
$item && $item.length === 1) {
... ...
... ... @@ -289,6 +289,10 @@
padding-left: 100%;
}
}
.info {
margin-left: 4px;
}
}
.des-basic {
... ... @@ -315,6 +319,9 @@
height: 12px;
border: 1px solid #1d1d1d;
display: inline-block;
margin: 0 4px;
position: relative;
top: 1px;
}
.comfort-block.cur {
... ...