diff --git a/src/coupon-list/index.js b/src/coupon-list/index.js index 97ed343e2..4cae999f8 100644 --- a/src/coupon-list/index.js +++ b/src/coupon-list/index.js @@ -182,7 +182,7 @@ export default createComponent({ const CouponTab = ( -
+
{coupons.map((coupon, index) => ( -
+
{disabledCoupons.map(coupon => ( -
); } diff --git a/src/coupon-list/index.less b/src/coupon-list/index.less index be1ebf9b9..a1905e6dd 100644 --- a/src/coupon-list/index.less +++ b/src/coupon-list/index.less @@ -33,13 +33,27 @@ padding: @padding-md 0; overflow-y: auto; -webkit-overflow-scrolling: touch; + + &--with-bottom { + padding-bottom: @padding-md + 50px; + } } - &__close { + &__bottom { position: absolute; bottom: 0; left: 0; + z-index: 999; + box-sizing: border-box; + width: 100%; + padding: 5px @padding-md; font-weight: @font-weight-bold; + background-color: @white; + } + + &__close { + height: 40px; + line-height: 38px; } &__empty { diff --git a/src/coupon-list/test/__snapshots__/index.spec.js.snap b/src/coupon-list/test/__snapshots__/index.spec.js.snap index c36470abd..e148f979d 100644 --- a/src/coupon-list/test/__snapshots__/index.spec.js.snap +++ b/src/coupon-list/test/__snapshots__/index.spec.js.snap @@ -19,7 +19,7 @@ exports[`empty-image prop 1`] = `
-
+

暂无优惠券

@@ -29,7 +29,8 @@ exports[`empty-image prop 1`] = `
-
+
+
`; @@ -68,7 +69,7 @@ exports[`render coupon list 1`] = `
-
+
@@ -174,7 +175,8 @@ exports[`render coupon list 1`] = `
-
+
+
`; @@ -213,20 +215,21 @@ exports[`render empty coupon list 1`] = `
+
+
`;