wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit de6038acd2729727889917ee8d6188b05f66a8cb 2 parents bd919f7e 4feb015d

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

Inline Side-by-side
Showing 2 changed files with 5 additions and 1 deletions
@@ -38,7 +38,7 @@ if (0 === $('.goodsDiscount .discount-folder').children().length) { @@ -38,7 +38,7 @@ if (0 === $('.goodsDiscount .discount-folder').children().length) {
38 } 38 }
39 39
40 //goods-discount下拉按钮点击事件 40 //goods-discount下拉按钮点击事件
41 -$('.goodsDiscount .dropdown').on('touchend', function(e) { 41 +$('.goodsDiscount').on('touchend', function(e) {
42 if ($discountFolder.is(':hidden')) { 42 if ($discountFolder.is(':hidden')) {
43 $discountArrow.removeClass('icon-down').addClass('icon-up').html(''); 43 $discountArrow.removeClass('icon-down').addClass('icon-up').html('');
44 $discountFolder.slideDown(); 44 $discountFolder.slideDown();
@@ -31,6 +31,8 @@ $basicBtnC:#eb0313; @@ -31,6 +31,8 @@ $basicBtnC:#eb0313;
31 margin-bottom: pxToRem(20px); 31 margin-bottom: pxToRem(20px);
32 font-size: pxToRem(24px); 32 font-size: pxToRem(24px);
33 line-height: pxToRem(36px); 33 line-height: pxToRem(36px);
  34 + display: flex;
  35 + flex-wrap: wrap;
34 &.table { 36 &.table {
35 width: 100%; 37 width: 100%;
36 .column { 38 .column {
@@ -42,6 +44,8 @@ $basicBtnC:#eb0313; @@ -42,6 +44,8 @@ $basicBtnC:#eb0313;
42 font-size: pxToRem(24px); 44 font-size: pxToRem(24px);
43 background-color: $tableCellC; 45 background-color: $tableCellC;
44 float: left; 46 float: left;
  47 + display: flex;
  48 + align-items: center;
45 } 49 }
46 } 50 }
47 } 51 }