Authored by Rock Zhang

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

... ... @@ -34,6 +34,20 @@
</div>
{{/if}}
{{#if gender}}
<div class="channel section">
<span class="title">性别:</span>
<div class="attr-content clearfix">
{{#each channel}}
<a class="attr {{#if checked}}checked{{/if}}" href="{{href}}">
{{name}}
</a>
{{/each}}
</div>
</div>
{{/if}}
{{#if sort}}
<div class="sort section">
<span class="title">分类:</span>
... ...
... ... @@ -135,7 +135,6 @@ exports.init = function(num) {
// 鼠标悬浮获取到商品信息后显示第一张图片
if (data[0] && data[0].src) {
$(event.target).find('.good-thumb img').attr('src', data[0].src);
$goodInfoMain.find('.good-thumb img').attr('src', data[0].src);
}
... ...
... ... @@ -82,6 +82,7 @@
width: 14px;
border: 1px solid #fff;
margin-bottom: -3px;
background-size: 100% !important;
}
.clear-checked {
... ... @@ -283,6 +284,7 @@
border: 1px solid #ccc;
margin-bottom: -6px;
margin-right: 5px;
background-size: 100% !important;
}
.senior {
... ...
... ... @@ -125,9 +125,20 @@
}
}
@keyframes slideRight {
from {
width: 0;
}
to {
width: 50px;
}
}
.good-select-color {
float: left;
margin-top: 22px;
overflow: hidden;
animation: slideRight 200ms 1;
ul {
display: block;
... ...