From 0064e5282b65be212ad2abbfe8359eafdeb64376 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 22 Mar 2024 11:27:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=B7=E6=A0=BCicon=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 | 20 +++++++++++++-------
 pages/goods-detail/goods-detail.vue |  5 +++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pages/goods-detail/goods-detail.css b/pages/goods-detail/goods-detail.css
index f324f6e6..6dfd6943 100644
--- a/pages/goods-detail/goods-detail.css
+++ b/pages/goods-detail/goods-detail.css
@@ -245,9 +245,6 @@
     color: #FF5722;
     border: 1px solid #FF5722;
     background: transparent;
-    position: absolute;
-    right: 20rpx;
-    bottom: 20rpx;
     font-size: 24rpx;
 }
 .price-content .sales-price {
@@ -269,6 +266,13 @@
 /**
  * 价格信息与秒杀结合
  */
+.countdown-content {
+    width: 38%;
+}
+.countdown-content .time-title {
+    font-size: 38rpx;
+    margin-bottom: 10rpx;
+}
 .goods-base-price-countdown {
     background: #e84742 !important;
 }
@@ -277,7 +281,7 @@
     background-repeat: no-repeat;
     background-size: 100% 100%;
     width: 60%;
-    min-height: 158rpx;
+    min-height: 164rpx;
 }
 .goods-base-price-countdown .price-icon {
     border-color: #fff;
@@ -290,9 +294,11 @@
 .goods-base-price-countdown .unit{
     color: #ffcece !important;
 }
-.countdown-content .time-title {
-    font-size: 38rpx;
-    margin-bottom: 10rpx;
+.price-content .price-icon.seckill {
+    position: absolute;
+    right: 20rpx;
+    bottom: 20rpx;
+    margin-right: 0;
 }
 
 /*
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 3dc3b855..08f208f5 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -82,10 +82,11 @@
             <view class="goods-base-price bg-white oh spacing-mb" :class="(plugins_seckill_data || null) != null && plugins_seckill_data.time.status == 1 ? 'goods-base-price-countdown' : ''">
                 <!-- 价格 -->
                 <view class="price-content padding-main bs-bb fl" :style="(plugins_seckill_data || null) != null && plugins_seckill_data.time.status == 1 ? 'background-image: url(' + plugins_seckill_data.goods_detail_header + ')' : ''">
-                    <!-- 图标 -->
-                    <text v-if="(show_field_price_text || null) != null" class="price-icon round va-m">{{ show_field_price_text }}</text>
                     <!-- 售价 -->
                     <view v-if="(goods.show_field_price_status || 0) == 1" class="item single-text">
+                        <!-- 图标 -->
+                        <text v-if="(show_field_price_text || null) != null" :class="'price-icon round va-m margin-right-xs '+(((plugins_seckill_data || null) != null && plugins_seckill_data.time.status == 1) ? 'seckill' : '')">{{ show_field_price_text }}</text>
+                        <!-- 售价 -->
                         <text class="sales-price va-m">{{ goods.show_price_symbol }}{{ goods_spec_base_price }}</text>
                         <text class="text-size-xs cr-grey va-m">{{ goods.show_price_unit }}</text>
                     </view>