wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 18:43:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

【优化】移除【我的优惠券】券码编码的展示，使用图片替代效果，修复【已使用】优惠券在【已过期】列表也展示的问题。

Browse Source
This commit is contained in:
jianweie
2023-05-06 16:23:12 +08:00
parent 2aeedc5e75
commit 66e52c5376
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreCms.Net.Repository/Promotion/CoreCmsCouponRepository.cs
View File

@@ -144,7 +144,7 @@ namespace CoreCms.Net.Repository
.Where((coupon, promotion) => promotion.type == (int)GlobalEnumVars.PromotionType.Coupon) .Where((coupon, promotion) => promotion.type == (int)GlobalEnumVars.PromotionType.Coupon)
.WhereIF(display == GlobalEnumVars.CouponIsUsedStatusText.noUsed.ToString(), (coupon, promotion) => coupon.isUsed == false && coupon.endTime >= dt) .WhereIF(display == GlobalEnumVars.CouponIsUsedStatusText.noUsed.ToString(), (coupon, promotion) => coupon.isUsed == false && coupon.endTime >= dt)
.WhereIF(display == GlobalEnumVars.CouponIsUsedStatusText.yesUsed.ToString(), (coupon, promotion) => coupon.isUsed == true) .WhereIF(display == GlobalEnumVars.CouponIsUsedStatusText.yesUsed.ToString(), (coupon, promotion) => coupon.isUsed == true)
.WhereIF(display == GlobalEnumVars.CouponIsUsedStatusText.invalid.ToString(), (coupon, promotion) => coupon.endTime < dt) .WhereIF(display == GlobalEnumVars.CouponIsUsedStatusText.invalid.ToString(), (coupon, promotion) => coupon.endTime < dt && coupon.isUsed == false)
.WhereIF(promotionId > 0, (coupon, promotion) => coupon.promotionId == promotionId) .WhereIF(promotionId > 0, (coupon, promotion) => coupon.promotionId == promotionId)
.WhereIF(promotionId == 0, (coupon, promotion) => promotion.isEnable == true) .WhereIF(promotionId == 0, (coupon, promotion) => promotion.isEnable == true)
.Select((coupon, promotion) => new CoreCmsCoupon .Select((coupon, promotion) => new CoreCmsCoupon

4
CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue
View File

@@ -19,12 +19,12 @@
<view class="coreshop-coupon-card-view" :class="item.isExpire || item.isUsed ?' grayscale':''"> <view class="coreshop-coupon-card-view" :class="item.isExpire || item.isUsed ?' grayscale':''">
<view class="card-price-view"> <view class="card-price-view">
<view class="coreshop-text-red price-left-view"> <view class="coreshop-text-red price-left-view">
<text class="coreshop-font-xs">{{item.couponCode}}</text> <image class="icon" src="/static/images/coupon/coupon-element.png" mode=""></image>
</view> </view>
<view class="name-content-view"> <view class="name-content-view">
<view class="u-line-1 coreshop-text-red">{{item.couponName}}</view> <view class="u-line-1 coreshop-text-red">{{item.couponName}}</view>
<view class="coreshop-font-xs"> <view class="coreshop-font-xs">
<text v-for="(itemResult, index) in item.results" :key="index">{{itemResult}}</text> 说明：<text v-for="(itemResult, index) in item.results" :key="index">{{itemResult}}</text>
</view> </view>
<view class="coreshop-font-xs">有效期：{{item.stime}} - {{item.etime}}</view> <view class="coreshop-font-xs">有效期：{{item.stime}} - {{item.etime}}</view>
</view> </view>