Merge branch 'develop' into 'develop'

Develop

1:优惠活动只有一条时取消下拉

See merge request !57

@@ -32,6 +32,9 @@ function showFooter() {
     }, 200);
     }, 200);
 }
 }
 
 
+if ($('#goodsDiscount h1').length < 1) {
+    $('.dropdown').remove();
+}
 showFooter();
 showFooter();
 
 
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));