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

@@ -52,13 +52,13 @@ goodsSwiper = new Swiper('.banner-swiper', {
 
 
 
 
 //初始化goods-discount
 //初始化goods-discount
-if (0 === $('.goodsDiscount .discount-folder').children().length) {
+if (0 === $discountFolder.children().length) {
     $discountFolder.css('display', 'none');
     $discountFolder.css('display', 'none');
     $discountArrow.html('');
     $discountArrow.html('');
 }
 }
 
 
 //goods-discount下拉按钮点击事件
 //goods-discount下拉按钮点击事件
-if (goodsDiscountHammer) {
+if (goodsDiscountHammer && $discountFolder.children().length > 0) {
     goodsDiscountHammer.on('tap', function(e) {
     goodsDiscountHammer.on('tap', function(e) {
         if ($discountFolder.is(':hidden')) {
         if ($discountFolder.is(':hidden')) {
             $discountArrow.removeClass('icon-down').addClass('icon-up').html('');
             $discountArrow.removeClass('icon-down').addClass('icon-up').html('');
@@ -67,7 +67,6 @@ if (goodsDiscountHammer) {
             $discountArrow.removeClass('icon-up').addClass('icon-down').html('');
             $discountArrow.removeClass('icon-up').addClass('icon-down').html('');
             $discountFolder.slideUp();
             $discountFolder.slideUp();
         }
         }
-        return false;
     });
     });
 }
 }