Authored by hf

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

... ... @@ -71,8 +71,8 @@ $('#search').on('touchend', function() {
if (historys && historys.length > 0) {
historys = historys.split(ranToken);
for (i = 0; i < historys.length; i++) {
history = historys[i];
for (i = historys.length; i > 0; i--) {
history = historys[i - 1];
if (history === '') {
continue;
... ...
... ... @@ -82,6 +82,8 @@ $.ajax({
}
});
if ($('.good-detail-page').length > 0) {
$('#yoho-footer').css('border-top', '1px solid #e0e0e0');
}
require('./like');
... ...
... ... @@ -14,15 +14,19 @@ var recommendSwiper,
if (preferenceUrl) {
$.get(preferenceUrl).then(function(html) {
$recommendForYou.html(html).show();
if ($('#swiper-recommend').length) {
recommendSwiper = new Swiper('#swiper-recommend', {
slidesPerView: 'auto',
grabCursor: true,
slideElement: 'a',
lazyLoading: true,
watchSlidesVisibility: true
});
if (html.length < 5) {
$recommendForYou.css('display', 'none');
} else {
$recommendForYou.html(html).show();
if ($('#swiper-recommend').length) {
recommendSwiper = new Swiper('#swiper-recommend', {
slidesPerView: 'auto',
grabCursor: true,
slideElement: 'a',
lazyLoading: true,
watchSlidesVisibility: true
});
}
}
window.rePosFooter();
... ...
... ... @@ -402,6 +402,7 @@ $basicBtnC:#eb0313;
z-index: 2;
padding: pxToRem(20px) pxToRem(28px);
text-align: center;
border-top: 1px solid $borderC;
a {
display: inline-block;
&.num-incart {
... ... @@ -447,9 +448,9 @@ $basicBtnC:#eb0313;
}
}
}
// .recommend-for-you {
// margin-bottom: pxToRem(30px);
// }
.recommend-for-you{
border-bottom: none;
}
.yoho-tip{
top:40%;
}
... ...