Authored by 姜枫

Merge branch 'master' into feature/wechat-pay

日志目录
\ No newline at end of file
... ...
... ... @@ -360,7 +360,7 @@ var YohoListPage = {
},
filterBrand: function(letter) {
$('.yoho-product-list .brand-list .input-radio').each(function() {
var first = $(this).data('word').toString(); // eslint-disable-line
var first = $(this).data('word').toString(); // eslint-disable-line
var name = $(this).find('label').text().toLowerCase();
first = first.toLowerCase();
... ... @@ -406,14 +406,14 @@ var YohoListPage = {
url = $(e.currentTarget).data('url');
YohoListPage.productId = productId;
pos.top = position.top + 10;
pos.top = position.top + 18;
if (position.left > 500) {
pos.right = 0;
pos.left = 'auto';
} else {
pos.right = 'auto';
pos.left = position.left;
pos.left = position.left-12;
}
$(this.goodsWrapper).css(pos);
... ...
... ... @@ -384,6 +384,7 @@
top: 10px;
min-width: 368px;
display: none;
padding: 10px 0 0 10px;
.goods {
margin: 0;
... ... @@ -391,7 +392,7 @@
}
.goods-img-list {
margin: 0 0 2px 5px;
margin: 0 0 0 20px;
float: left;
.goods-img-col {
... ... @@ -406,7 +407,7 @@
}
img {
margin-top: 10px;
margin-bottom: 10px;
cursor: pointer;
&:nth-child(4n) {
... ...