From 469cfe50dbfd8081d9e2dc8fec4c80fdee317062 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 4 Nov 2023 10:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods-detail/goods-detail.css | 2 +-
 pages/goods-detail/goods-detail.vue | 2 +-
 pages/plugins/coupon/user/user.vue  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/goods-detail/goods-detail.css b/pages/goods-detail/goods-detail.css
index e2108b01..a7dd6f45 100644
--- a/pages/goods-detail/goods-detail.css
+++ b/pages/goods-detail/goods-detail.css
@@ -606,7 +606,7 @@
 }
 
 .plugins-wholesale-container-view .item:not(:last-child) {
-    margin-right: 10rpx;
+    margin-right: 24rpx;
 }
 
 .plugins-wholesale-container {
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 3a86bdbe..e1f00466 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -488,7 +488,7 @@
                             <text v-if="(plugins_wholesale_data.spec_tips || null) != null" class="spec-tips pa round">{{ plugins_wholesale_data.spec_tips }}</text>
                             <view class="oh flex-row flex-warp">
                                 <block v-for="(item, index) in plugins_wholesale_data.rules" :key="index">
-                                    <view class="item flex-width-half margin-bottom-sm">
+                                    <view class="item flex-width-half margin-bottom">
                                         <view class="padding-main bg-base border-radius-main oh tc">
                                             <text class="cr-base">{{ item.arr.msg }}</text>
                                             <text class="margin-left-sm cr-main fw-b text-size-lg">{{ item.arr.val }}</text>
diff --git a/pages/plugins/coupon/user/user.vue b/pages/plugins/coupon/user/user.vue
index e6ea8fb1..e4748bad 100644
--- a/pages/plugins/coupon/user/user.vue
+++ b/pages/plugins/coupon/user/user.vue
@@ -12,21 +12,21 @@
                 <!-- 未使用 -->
                 <block v-if="(data_list.not_use || null) != null && data_list.not_use.length > 0 && nav_tabs_value == 'not_use'">
                     <block v-for="(item, index) in data_list.not_use" :key="index">
-                        <component-coupon-card :prop-data="item.coupon" :prop-start-time="item.time_start" :prop-end-time="item.time_end" :prop-status-type="item.status_type" :prop-status-operable-name="item.status_operable_name" prop-bg="#f5f5f5"></component-coupon-card>
+                        <component-coupon-card :prop-data="item.coupon" :prop-start-time="item.time_start_show_text" :prop-end-time="item.time_end_show_text" :prop-status-type="item.status_type" :prop-status-operable-name="item.status_operable_name" prop-bg="#f5f5f5"></component-coupon-card>
                     </block>
                 </block>
 
                 <!-- 已使用 -->
                 <block v-if="(data_list.already_use || null) != null && data_list.already_use.length > 0 && nav_tabs_value == 'already_use'">
                     <block v-for="(item, index) in data_list.already_use" :key="index">
-                        <component-coupon-card :prop-data="item.coupon" :prop-start-time="item.time_start" :prop-end-time="item.time_end" :prop-status-type="item.status_type" :prop-status-operable-name="item.status_operable_name" prop-bg="#f5f5f5"></component-coupon-card>
+                        <component-coupon-card :prop-data="item.coupon" :prop-start-time="item.time_start_show_text" :prop-end-time="item.time_end_show_text" :prop-status-type="item.status_type" :prop-status-operable-name="item.status_operable_name" prop-bg="#f5f5f5"></component-coupon-card>
                     </block>
                 </block>
 
                 <!-- 已过期 -->
                 <block v-if="(data_list.already_expire || null) != null && data_list.already_expire.length > 0 && nav_tabs_value == 'already_expire'">
                     <block v-for="(item, index) in data_list.already_expire" :key="index">
-                        <component-coupon-card :prop-data="item.coupon" :prop-start-time="item.time_start" :prop-end-time="item.time_end" :prop-status-type="item.status_type" :prop-status-operable-name="item.status_operable_name" prop-bg="#f5f5f5"></component-coupon-card>
+                        <component-coupon-card :prop-data="item.coupon" :prop-start-time="item.time_start_show_text" :prop-end-time="item.time_end_show_text" :prop-status-type="item.status_type" :prop-status-operable-name="item.status_operable_name" prop-bg="#f5f5f5"></component-coupon-card>
                     </block>
                 </block>
             </view>