wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 587a574d29210a53acd4360e16a538be9f6ff064 2 parents 62c0493e 3af47c95

Merge remote-tracking branch 'origin/develop' into beta

Inline Side-by-side
Showing 2 changed files with 23 additions and 21 deletions
... ... @@ -50,31 +50,33 @@ module.exports = function(specificGender) {
$curNav = $navList.children('.focus');
if (lifestyleType) {
navHammer = new Hammer($navList[0]);
navHammer.on('tap', function(e) {
var $this = $(e.target).closest('li'),
$goods = $('.goods-list'),
$content;
e.preventDefault();
if ($this.hasClass('focus')) {
return;
}
navHammer = $navList[0] ? new Hammer($navList[0]) : undefined;
if (navHammer) {
navHammer.on('tap', function(e) {
var $this = $(e.target).closest('li'),
$goods = $('.goods-list'),
$content;
e.preventDefault();
if ($this.hasClass('focus')) {
return;
}
index = $this.index();
index = $this.index();
$this.addClass('focus');
$curNav.removeClass('focus');
$this.addClass('focus');
$curNav.removeClass('focus');
$goods.not('.hide').addClass('hide');
$content = $goods.eq(index);
$content.removeClass('hide');
$goods.not('.hide').addClass('hide');
$content = $goods.eq(index);
$content.removeClass('hide');
$curNav = $this;
$curNav = $this;
$(document).trigger('scroll'); //Trigger lazyLoad
e.srcEvent.stopPropagation();
});
$(document).trigger('scroll'); //Trigger lazyLoad
e.srcEvent.stopPropagation();
});
}
}
loading.init($('.maybe-like'));
... ...
... ... @@ -96,7 +96,7 @@
{{#branditems}}
<li class="category-
item thirdnavbar">
<a href="" hot={{hot}}>{{brandname}}</a>
<a href="{{link}}" hot={{hot}}>{{brandname}}</a>
</li>
{{/branditems}}
</ul>
... ...