Authored by biao

merge detail page update. code review by XWG

@@ -12,13 +12,17 @@ var goodsSwiper, @@ -12,13 +12,17 @@ var goodsSwiper,
12 $discountFolder = $('.goodsDiscount .discount-folder'), 12 $discountFolder = $('.goodsDiscount .discount-folder'),
13 $discountArrow = $('.goodsDiscount .first-item span'); 13 $discountArrow = $('.goodsDiscount .first-item span');
14 14
15 -var goodsDiscountHammer = new Hammer(document.getElementById('goodsDiscount')); 15 +var goodsDiscountEl = document.getElementById('goodsDiscount'),
  16 + goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl);
16 17
17 require('./desc'); 18 require('./desc');
18 require('./comments-consults'); 19 require('./comments-consults');
19 20
20 //add extra marign-bottom for footer to show the yoho copyright 21 //add extra marign-bottom for footer to show the yoho copyright
21 -window.reMarginFooter('.cart-bar'); 22 +
  23 +function showFooter() {
  24 + window.reMarginFooter('.cart-bar');
  25 +}
22 26
23 lazyLoad($('img.lazy')); 27 lazyLoad($('img.lazy'));
24 28
@@ -40,7 +44,8 @@ if (0 === $('.goodsDiscount .discount-folder').children().length) { @@ -40,7 +44,8 @@ if (0 === $('.goodsDiscount .discount-folder').children().length) {
40 } 44 }
41 45
42 //goods-discount下拉按钮点击事件 46 //goods-discount下拉按钮点击事件
43 -goodsDiscountHammer.on('tap', function(e) { 47 +if (goodsDiscountHammer) {
  48 + goodsDiscountHammer.on('tap', function(e) {
44 if ($discountFolder.is(':hidden')) { 49 if ($discountFolder.is(':hidden')) {
45 $discountArrow.removeClass('icon-down').addClass('icon-up').html(''); 50 $discountArrow.removeClass('icon-down').addClass('icon-up').html('');
46 $discountFolder.slideDown(); 51 $discountFolder.slideDown();
@@ -49,6 +54,9 @@ goodsDiscountHammer.on('tap', function(e) { @@ -49,6 +54,9 @@ goodsDiscountHammer.on('tap', function(e) {
49 $discountFolder.slideUp(); 54 $discountFolder.slideUp();
50 } 55 }
51 return false; 56 return false;
52 -}); 57 + });
  58 +}
53 59
54 require('./like'); 60 require('./like');
  61 +
  62 +$(document).ready(showFooter);