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

@@ -7,7 +7,10 @@
     Swiper = require('yoho.iswiper'),
     lazyLoad = require('yoho.lazyload');
 
-var goodsSwiper;
+var goodsSwiper,
+    $discountFolder = $('.goods-discount .discount-folder'),
+    $discountArrow = $('.goodsDiscount .first-item span');
+
 
 require('./desc');
 require('./comments-consults');
@@ -29,18 +32,18 @@ goodsSwiper = new Swiper('.banner-swiper', {
 
 //初始化goods-discount
 if (0 === $('.goods-discount .discount-folder').children().length) {
-    $('.goods-discount .discount-folder').css('display', 'none');
-    $('.goods-discount .first-item span').html('');
+    $discountFolder.css('display', 'none');
+    $discountArrow.html('');
 }
 
 //goods-discount下拉按钮点击事件
 $('.goodsDiscount .dropdown').on('click', function() {
-    if ($('.goodsDiscount .discount-folder').is(':hidden')) {
-        $('.goodsDiscount .first-item span').removeClass('icon-down').addClass('icon-up').html('');
-        $('.goodsDiscount .discount-folder').slideDown();
+    if ($discountFolder.is(':hidden')) {
+        $discountArrow.removeClass('icon-down').addClass('icon-up').html('');
+        $discountFolder.slideDown();
     } else {
-        $('.goodsDiscount .first-item span').removeClass('icon-up').addClass('icon-down').html('');
-        $('.goodsDiscount .discount-folder').slideUp();
+        $discountArrow.removeClass('icon-up').addClass('icon-down').html('');
+        $discountFolder.slideUp();
     }
 });
 require('./like');
\ No newline at end of file

@@ -104,7 +104,7 @@ $basicBtnC:#eb0313;
             font-size: pxToRem(18px);
             text-align: center;
             line-height: pxToRem(30px);
-            padding: 0 15px;
+            padding: 0 8px;
         }
         .new-tag {
             background-color: #78dc7e;