diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java index a664367bb..2de072d41 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java @@ -2,6 +2,7 @@ package com.fuint.business.marketingActivity.cardCoupon.entity; import java.util.Date; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -32,8 +33,10 @@ public class CardCouponUser extends Model { //优惠券id private Integer cardCouponId; //有效期开始时间 + @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8") private Date startTime; //有效期结束时间 + @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8") private Date endTime; //0未使用1已核销 private String status; diff --git a/gasStation-uni/pagesMy/Coupons/Coupons.vue b/gasStation-uni/pagesMy/Coupons/Coupons.vue index b552665ac..d9c7248c0 100644 --- a/gasStation-uni/pagesMy/Coupons/Coupons.vue +++ b/gasStation-uni/pagesMy/Coupons/Coupons.vue @@ -16,25 +16,15 @@ {{item.name}} - - - ¥{{item.couponAmount}} - - - - {{item.couponType}} - + + {{item.couponName}} - {{item.couponContent}} - 使用条件:{{item.couponContent}} - 使用说明:{{item.instruction}} + {{item.useCondition}} - 有效期:{{item.endTime || ''}} - - 立即使用 --> - + 有效期:{{item.startTime}} ~ {{item.endTime}} @@ -266,9 +256,10 @@ .card-box { width: 95%; background: #ffffff; - border-radius: 8px; + height: 90px; box-sizing: border-box; padding: 15px; + margin: 10px auto; display: flex; } @@ -287,22 +278,17 @@ } .dis-bt { - display: flex; - align-items: center; - justify-content: space-between; - box-sizing: border-box; - padding-top: 5px; - border-top: 1px solid #f4f5f6; - margin-top: 5px; + font-size: 12px; + color: #E02020; } .hui-size { - font-size: 14px; + font-size: 12px; color: #999999; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; - + margin: 5px 0; } .title {