From aaf6d82d69fb1e614ab6ef98633a9dc8edc15d73 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 17 Oct 2024 16:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=89=B9=E5=8F=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                             |  4 ++--
 pages/goods-detail/goods-detail.css | 10 +++++-----
 pages/goods-detail/goods-detail.vue |  6 +-----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/App.vue b/App.vue
index 0cbb6325..e9593056 100644
--- a/App.vue
+++ b/App.vue
@@ -25,10 +25,10 @@
                 application_logo: '',
 
                 // 版本号、如: v1.0.0
-                version: 'v6.2',
+                version: 'v6.3',
 
                 // app版本信息、如: v1.0.0 20180118
-                app_version_info: 'v6.2 20240704',
+                app_version_info: 'v6.3 20241022',
 
                 // 货币价格符号
                 currency_symbol: '￥',
diff --git a/pages/goods-detail/goods-detail.css b/pages/goods-detail/goods-detail.css
index 8117c851..edbacd71 100644
--- a/pages/goods-detail/goods-detail.css
+++ b/pages/goods-detail/goods-detail.css
@@ -261,17 +261,17 @@
     width: 60%;
     min-height: 164rpx;
 }
-.goods-base-price-countdown .price-icon {
+.goods-base-price-countdown .price-content .price-icon {
     border-color: #fff;
     color: #fff;
     background: transparent;
 }
-.goods-base-price-countdown .sales-price,
-.goods-base-price-countdown .sales-price-unit {
+.goods-base-price-countdown .price-content .sales-price,
+.goods-base-price-countdown .price-content .sales-price-unit {
     color: #fff !important;
 }
-.goods-base-price-countdown .original-price,
-.goods-base-price-countdown .unit{
+.goods-base-price-countdown .price-content .original-price,
+.goods-base-price-countdown .price-content .unit{
     color: #ffcece !important;
 }
 .price-content .price-icon.seckill {
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index efc110b9..6fc0ee4d 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -76,14 +76,10 @@
             <view class="goods-base-price bg-white oh spacing-mb" :class="plugins_seckill_is_valid ? 'goods-base-price-countdown' : ''">
                 <!-- 批发规则、未隐藏商品售价的时候独立行展示 -->
                 <view v-if="(plugins_wholesale_data || null) != null && (plugins_wholesale_data.is_hide_goods_price || 0) != 1">
-                    <component-wholesale-rules :propIsPopup="true" :propCurrencySymbol="currency_symbol" :propData="plugins_wholesale_data" :propIsSeckill="plugins_seckill_is_valid"></component-wholesale-rules>
+                    <component-wholesale-rules :propIsPopup="true" :propCurrencySymbol="currency_symbol" :propData="plugins_wholesale_data"></component-wholesale-rules>
                 </view>
                 <!-- 价格 -->
                 <view class="price-content padding-vertical-main padding-left-main bs-bb fl" :style="plugins_seckill_is_valid ? 'background-image: url(' + plugins_seckill_data.goods_detail_header + ')' : ''">
-                    <!-- 批发规则、隐藏商品售价的时候在这里展示 -->
-                    <view v-if="(plugins_wholesale_data || null) != null && (plugins_wholesale_data.is_hide_goods_price || 0) == 1" class="item">
-                        <component-wholesale-rules :propIsPopup="true" :propCurrencySymbol="currency_symbol" :propData="plugins_wholesale_data"></component-wholesale-rules>
-                    </view>
                     <!-- 批发插件是否开启隐藏价格信息 -->
                     <block v-if="(plugins_wholesale_data || null) == null || (plugins_wholesale_data.is_hide_goods_price || 0) != 1">
                         <!-- 售价 -->