Authored by xuqi

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

... ... @@ -139,7 +139,7 @@ $('.maybe-like p').on('touchstart', function (e) {
//srcoll to load more
$(window).scroll(function () {
if ($(window).scrollTop() + winH >= $(document).height()) {
if ($(window).scrollTop() + winH >= $(document).height() - 50) {
search();
}
});
\ No newline at end of file
... ...
... ... @@ -41,7 +41,7 @@ if ($('#float-layer-btn') && $('#float-layer-btn')[0]) {
e.srcEvent.stopPropagation();
});
if (!window.cookie('_float-layer-app')) {
if (typeof window.cookie === 'function' && !window.cookie('_float-layer-app')) {
$('#float-layer-app').show();
} else {
$('#float-layer-app').hide();
... ...
... ... @@ -56,9 +56,7 @@
.good-detail-img {
position: relative;
display: table-cell;
height: 368rem / $pxConvertRem;
vertical-align: middle;
.good-islike {
position: absolute;
... ... @@ -79,7 +77,7 @@
img {
display: block;
width: 100%;
max-height: 368rem / $pxConvertRem;
height: 368rem / $pxConvertRem;
}
.few-tag {
... ...