From 66e52c5376efc56b8bd23d48a1fd7de35b262b52 Mon Sep 17 00:00:00 2001
From: jianweie <jianweie@163.com>
Date: Sat, 6 May 2023 16:23:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E3=80=90=E6=88=91=E7=9A=84=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E3=80=91=E5=88=B8=E7=A0=81=E7=BC=96=E7=A0=81=E7=9A=84=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=9B=BE=E7=89=87=E6=9B=BF?=
 =?UTF-8?q?=E4=BB=A3=E6=95=88=E6=9E=9C=EF=BC=8C=E4=BF=AE=E5=A4=8D=E3=80=90?=
 =?UTF-8?q?=E5=B7=B2=E4=BD=BF=E7=94=A8=E3=80=91=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E5=9C=A8=E3=80=90=E5=B7=B2=E8=BF=87=E6=9C=9F=E3=80=91=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B9=9F=E5=B1=95=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.Repository/Promotion/CoreCmsCouponRepository.cs | 2 +-
 CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CoreCms.Net.Repository/Promotion/CoreCmsCouponRepository.cs b/CoreCms.Net.Repository/Promotion/CoreCmsCouponRepository.cs
index b1e3a358..51b6bfd2 100644
--- a/CoreCms.Net.Repository/Promotion/CoreCmsCouponRepository.cs
+++ b/CoreCms.Net.Repository/Promotion/CoreCmsCouponRepository.cs
@@ -144,7 +144,7 @@ namespace CoreCms.Net.Repository
                 .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.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) => promotion.isEnable == true)
                 .Select((coupon, promotion) => new CoreCmsCoupon
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue
index 18beafa7..47ab8959 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/coupon/index.vue
@@ -19,12 +19,12 @@
                     <view class="coreshop-coupon-card-view" :class="item.isExpire || item.isUsed ?' grayscale':''">
                         <view class="card-price-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 class="name-content-view">
                                 <view class="u-line-1 coreshop-text-red">{{item.couponName}}</view>
                                 <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 class="coreshop-font-xs">有效期：{{item.stime}} - {{item.etime}}</view>
                             </view>