From ad7de47a473f1c999e58264b3e8640958078bff8 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 1 May 2025 08:51:50 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E3=80=91=E5=BA=97=E9=93=BA=E8=A3=85=E4=BF=AE-=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=8A=B5=EF=BC=9A=E5=B1=95=E7=A4=BA=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E3=80=81=E5=89=A9=E4=BD=99=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/s-coupon-block/s-coupon-block.vue  | 15 +++++++++++++--
 sheep/ui/su-coupon/su-coupon.vue                  |  3 ++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index 305fc128..59c19b4d 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -21,10 +21,11 @@
           :textColor="data.textColor"
           background=""
           :couponId="item.id"
-          :title="item.name"
+          :title="formatCouponTitle(item)"
           :type="formatCouponDiscountType(item)"
           :value="formatCouponDiscountValue(item)"
           :sellBy="formatValidityType(item)"
+          :surplus="item.totalCount === -1 ? -1 : item.totalCount - item.takeCount"
         >
           <template v-slot:btn>
             <!-- 两列时，领取按钮坚排 -->
@@ -57,6 +58,7 @@
   import { ref, onMounted, computed } from 'vue';
   import { CouponTemplateValidityTypeEnum, PromotionDiscountTypeEnum } from '@/sheep/helper/const';
   import { floatToFixed2, formatDate } from '@/sheep/helper/utils';
+  import { formatDiscountPercent, fen2yuanSimple } from '@/sheep/hooks/useGoods';
 
   const props = defineProps({
     data: {
@@ -114,7 +116,7 @@
       return floatToFixed2(coupon.discountPrice);
     }
     if (coupon.discountType === PromotionDiscountTypeEnum.PERCENT.type) {
-      return coupon.discountPercent;
+      return formatDiscountPercent(coupon.discountPercent);
     }
     return `未知【${coupon.discountType}】`;
   };
@@ -130,6 +132,15 @@
     return '未知【' + row.validityType + '】';
   };
 
+  // 格式化【优惠券标题】
+  const formatCouponTitle = (coupon) => {
+    return `满${floatToFixed2(coupon.usePrice)}元${
+      coupon.discountType === PromotionDiscountTypeEnum.PRICE.type
+        ? ',减' + floatToFixed2(coupon.discountPrice) + '元'
+        : ',打' + formatDiscountPercent(coupon.discountPercent) + '折'
+    }`;
+  };
+
   const couponList = ref([]);
   // 立即领取优惠券
   async function onGetCoupon(id) {
diff --git a/sheep/ui/su-coupon/su-coupon.vue b/sheep/ui/su-coupon/su-coupon.vue
index 472d17fe..23a76de1 100644
--- a/sheep/ui/su-coupon/su-coupon.vue
+++ b/sheep/ui/su-coupon/su-coupon.vue
@@ -43,7 +43,8 @@
         </view>
         <view class="ss-m-b-28">
           <view class="title-text ss-m-b-10">{{ props.title }}</view>
-          <view class="surplus-text" v-if="props.surplus">仅剩：{{ props.surplus }}张</view>
+          <view class="surplus-text" v-if="props.surplus >= 0">仅剩：{{ props.surplus }}张</view>
+          <view class="surplus-text" v-else-if="props.surplus === -1">仅限：不限制</view>
         </view>
       </view>
       <view class="card-right ss-flex ss-row-center">