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

@@ -38,7 +38,7 @@ if (0 === $('.goodsDiscount .discount-folder').children().length) {
 }
 
 //goods-discount下拉按钮点击事件
-$('.goodsDiscount .dropdown').on('touchend', function(e) {
+$('.goodsDiscount').on('touchend', function(e) {
     if ($discountFolder.is(':hidden')) {
         $discountArrow.removeClass('icon-down').addClass('icon-up').html('');
         $discountFolder.slideDown();

@@ -31,6 +31,8 @@ $basicBtnC:#eb0313;
             margin-bottom: pxToRem(20px);
             font-size: pxToRem(24px);
             line-height: pxToRem(36px);
+            display: flex;
+            flex-wrap: wrap;
             &.table {
                 width: 100%;
                 .column {
@@ -42,6 +44,8 @@ $basicBtnC:#eb0313;
                     font-size: pxToRem(24px);
                     background-color: $tableCellC;
                     float: left;
+                    display: flex;
+                    align-items: center;
                 }
             }
         }