From b72d3589099e7938eb3c526dc006dd602c5bb880 Mon Sep 17 00:00:00 2001
From: kele <1184860403@qq.com>
Date: Tue, 7 Feb 2023 15:56:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E6=83=A0=E5=88=B8=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../s-coupon-block/s-coupon-block.vue         |  3 +++
 .../components/s-order-card/s-order-card.vue  |  1 +
 .../s-score-block/s-score-block.vue           |  2 +-
 sheep/ui/su-coupon/su-coupon.vue              | 24 +++++++++++--------
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index c5b2f2f8..d8060bce 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/sheep/components/s-coupon-block/s-coupon-block.vue
@@ -19,6 +19,7 @@
               :title="item.amount_text"
               :value="item.amount"
               :surplus="item.stock"
+              :type="item.type"
               :sellBy="`${item.get_start_time.substring(0, 10)} 至 ${item.get_end_time.substring(
                 0,
                 10,
@@ -56,6 +57,7 @@
               :value="item.amount"
               :surplus="item.stock"
               :couponId="item.id"
+              :type="item.type"
               :sellBy="`${item.get_start_time.substring(0, 10)} 至 ${item.get_end_time.substring(
                 0,
                 10,
@@ -93,6 +95,7 @@
               :value="item.amount"
               :surplus="item.stock"
               :couponId="item.id"
+              :type="item.type"
               :sellBy="`${item.get_start_time.substring(0, 10)} 至 ${item.get_end_time.substring(
                 0,
                 10,
diff --git a/sheep/components/s-order-card/s-order-card.vue b/sheep/components/s-order-card/s-order-card.vue
index f7d8b9f1..66f80722 100644
--- a/sheep/components/s-order-card/s-order-card.vue
+++ b/sheep/components/s-order-card/s-order-card.vue
@@ -71,6 +71,7 @@
     .menu-item {
       height: 160rpx;
       position: relative;
+      z-index: 10;
       .menu-title {
         font-size: 24rpx;
         line-height: 24rpx;
diff --git a/sheep/components/s-score-block/s-score-block.vue b/sheep/components/s-score-block/s-score-block.vue
index 9472b2ed..09658a01 100644
--- a/sheep/components/s-score-block/s-score-block.vue
+++ b/sheep/components/s-score-block/s-score-block.vue
@@ -189,7 +189,7 @@
     .cart-btn {
       position: absolute;
       bottom: 10rpx;
-      right: 10rpx;
+      right: 20rpx;
       z-index: 11;
       height: 50rpx;
       line-height: 50rpx;
diff --git a/sheep/ui/su-coupon/su-coupon.vue b/sheep/ui/su-coupon/su-coupon.vue
index a48d1583..2736c891 100644
--- a/sheep/ui/su-coupon/su-coupon.vue
+++ b/sheep/ui/su-coupon/su-coupon.vue
@@ -11,10 +11,10 @@
         })
       "
     >
-      <view class=" ss-flex ss-flex-col ss-row-center ss-col-center">
+      <view class="ss-flex ss-flex-col ss-row-center ss-col-center">
         <view class="face-value-box ss-flex ss-col-bottom ss-m-t-50 ss-m-b-28">
-          <view class="value-text ss-m-r-4">{{ props.value }}</view>
-          <view class="value-unit">元</view>
+          <view class="value-text ss-m-r-4">{{ type === 'reduce' ? value : Number(value) }}</view>
+          <view class="value-unit">{{ type === 'reduce' ? '元' : '折' }}</view>
         </view>
         <view class="title-text">{{ props.title }}</view>
       </view>
@@ -38,8 +38,8 @@
     >
       <view class="card-left ss-flex ss-flex-col ss-row-between ss-col-top ss-m-l-40">
         <view class="face-value-box ss-flex ss-col-bottom ss-m-t-28">
-          <view class="value-unit">￥</view>
-          <view class="value-text ss-m-r-4">{{ props.value }}</view>
+          <view class="value-text ss-m-r-4">{{ type === 'reduce' ? value : Number(value) }}</view>
+          <view class="value-unit">{{ type === 'reduce' ? '元' : '折' }}</view>
         </view>
         <view class="ss-m-b-28">
           <view class="title-text ss-m-b-10">{{ props.title }}</view>
@@ -68,8 +68,8 @@
     >
       <view class="card-left ss-flex ss-flex-col ss-row-between ss-col-top ss-m-l-40">
         <view class="face-value-box ss-flex ss-col-bottom ss-m-t-28">
-          <view class="value-unit">￥</view>
-          <view class="value-text ss-m-r-4">{{ props.value }}</view>
+          <view class="value-text ss-m-r-4">{{ type === 'reduce' ? value : Number(value) }}</view>
+          <view class="value-unit">{{ type === 'reduce' ? '元' : '折' }}</view>
         </view>
         <view class="ss-m-b-20">
           <view class="title-text ss-m-b-10">{{ props.title }}</view>
@@ -161,6 +161,10 @@
       type: [Number, String],
       default: 1000,
     },
+    type: {
+      type: String,
+      default: '',
+    },
   });
 
   const cardStyle = computed(() => {
@@ -189,7 +193,7 @@
     .value-unit {
       color: v-bind('textColor');
       font-size: 24rpx;
-      line-height: 30rpx;
+      line-height: 38rpx;
     }
 
     .title-text {
@@ -238,7 +242,7 @@
     .value-unit {
       color: v-bind('textColor');
       font-size: 22rpx;
-      line-height: 22rpx;
+      line-height: 28rpx;
     }
 
     .title-text,
@@ -285,7 +289,7 @@
     .value-unit {
       color: v-bind('textColor');
       font-size: 22rpx;
-      line-height: 22rpx;
+      line-height: 32rpx;
     }
 
     .title-text,