dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

9.24

Browse Source
This commit is contained in:
cun-nan 2024-09-24 16:49:13 +08:00
parent 368b3be39d
commit d6b86ab8e4
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java
View File

@ -2,6 +2,7 @@ package com.fuint.business.marketingActivity.cardCoupon.entity;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -32,8 +33,10 @@ public class CardCouponUser extends Model<CardCouponUser> {
//优惠券id //优惠券id
private Integer cardCouponId; private Integer cardCouponId;
//有效期开始时间 //有效期开始时间
@JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
private Date startTime; private Date startTime;
//有效期结束时间 //有效期结束时间
@JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
private Date endTime; private Date endTime;
//0未使用1已核销 //0未使用1已核销
private String status; private String status;

38
gasStation-uni/pagesMy/Coupons/Coupons.vue
View File

@ -16,25 +16,15 @@
<view class="">{{item.name}}</view> <view class="">{{item.name}}</view>
</view> </view>
</view> </view>
<view class="card-box" v-for="(item,index) in cardsList" :key="index"> <view class="card-box" v-for="(item,index) in cardsList" :key="index"
<view class="left-img"> :style="'background: url('+item.bgImg+') no-repeat;background-size: 100% 100%; '"
<view class="huiz" v-if="item.couponType == '优惠券'">￥{{item.couponAmount}}</view> @click="goRecharge(item.id,item.cardRecordId)">
<view class="hui-icon" v-if="item.couponType != '优惠券'"> <view style="width: 20%;"></view>
<image src="../../static/imgs/iconcar.png" mode="aspectFit"></image>
</view>
<view class="cbai">{{item.couponType}}</view>
</view>
<view class="right-box"> <view class="right-box">
<view class="title">{{item.couponName}}</view> <view class="title">{{item.couponName}}</view>
<view class="hui-size">{{item.couponContent}}</view> <view class="hui-size">{{item.useCondition}}</view>
<view class="hui-size">使用条件:{{item.couponContent}}</view>
<view class="hui-size">使用说明:{{item.instruction}}</view>
<view class="dis-bt"> <view class="dis-bt">
<view class="hui-size">有效期：{{item.endTime || ''}}</view> 有效期：{{item.startTime}} ~ {{item.endTime}}
<view class="anniu" v-if="item.couponType == '优惠券'" <!--
@click="goRecharge(item.id,item.cardRecordId)">
<text>立即使用</text> -->
</view>
</view> </view>
</view> </view>
</view> </view>
@ -266,9 +256,10 @@
.card-box { .card-box {
width: 95%; width: 95%;
background: #ffffff; background: #ffffff;
border-radius: 8px; height: 90px;
box-sizing: border-box; box-sizing: border-box;
padding: 15px; padding: 15px;
margin: 10px auto; margin: 10px auto;
display: flex; display: flex;
} }
@ -287,22 +278,17 @@
} }
.dis-bt { .dis-bt {
display: flex; font-size: 12px;
align-items: center; color: #E02020;
justify-content: space-between;
box-sizing: border-box;
padding-top: 5px;
border-top: 1px solid #f4f5f6;
margin-top: 5px;
} }
.hui-size { .hui-size {
font-size: 14px; font-size: 12px;
color: #999999; color: #999999;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
margin: 5px 0;
} }
.title { .title {