diff --git a/src/components/sp-coupon/index.js b/src/components/sp-coupon/index.js index a5475d8..eea2d62 100755 --- a/src/components/sp-coupon/index.js +++ b/src/components/sp-coupon/index.js @@ -50,7 +50,15 @@ function SpCoupon (props) { 'background-size': '100% 100%' })}> - ¥{reduceCost || 0} + + {cardType === 'cash' && + <>¥{reduceCost || 0} + } + {cardType === 'discount' && <> + {discount || 0} + + } + 满{leastCost}可用 diff --git a/src/pages/home/index.scss b/src/pages/home/index.scss index b1cd05d..ba6fe87 100755 --- a/src/pages/home/index.scss +++ b/src/pages/home/index.scss @@ -214,6 +214,7 @@ page { align-items: center; font-size: 22px; line-height: 1; + transition: all 0.3s ease-in-out; .icon-my { font-size: 28px; font-weight: bold; diff --git a/src/subpages/marketing/coupon-center.js b/src/subpages/marketing/coupon-center.js index b188bd3..d0bd95c 100755 --- a/src/subpages/marketing/coupon-center.js +++ b/src/subpages/marketing/coupon-center.js @@ -38,7 +38,8 @@ function CouponCenter (props) { end_date: 1, card_id, distributor_id, - item_id: item_id || itemid + item_id: item_id || itemid, + receive: true } const { list, diff --git a/src/subpages/marketing/coupon.js b/src/subpages/marketing/coupon.js index 025466e..95237fa 100755 --- a/src/subpages/marketing/coupon.js +++ b/src/subpages/marketing/coupon.js @@ -33,7 +33,7 @@ function CouponIndex () { status: '1', page: pageIndex, pageSize, - card_type: couponType, + // card_type: couponType, scope_type: 'all' } const { list, total_count: total } = await api.member.getUserCardList(params)