Authored by 毕凯

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

... ... @@ -10,6 +10,8 @@ var $footer = $('#yoho-footer'),
$yohoPage = $('.yoho-page'),
$header = $('.yoho-header');
var backToTopHammer;
function cookie(name) {
var cookies = document.cookie,
cookieVal,
... ... @@ -158,6 +160,15 @@ function reMarginFooter(fixedElement) {
e.srcEvent.preventDefault();
return false;
});
if ($op.find('.back-to-top').length > 0) {
backToTopHammer = new Hammer(document.getElementsByClassName('back-to-top')[0]);
backToTopHammer.on('tap', function(e) {
$(window).scrollTop(0);
return false;
});
}
$footer.removeClass('hide');
}());
... ...
... ... @@ -20,12 +20,12 @@
{{#if cartNav}}
<ul class="cart-nav clearfix">
<li class="active">
<span>
<span id="common-cart-nav">
普通商品({{commonGoodsCount}})
</span>
</li>
<li>
<span>
<span id="presell-cart-nav">
预售商品({{presellGoodsCount}})
</span>
<div id="presell-tip" class="presell-tip">
... ...