From 6136158f1007161ad0cd900f9b7286efe847f655 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 2 Jan 2025 10:22:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E5=8F=91=E9=9A=90=E8=97=8F=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/wholesale-rules/wholesale-rules.vue | 11 ++++++++---
 pages/goods-detail/goods-detail.vue            |  6 +++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/components/wholesale-rules/wholesale-rules.vue b/components/wholesale-rules/wholesale-rules.vue
index bafed5e2..42256f37 100644
--- a/components/wholesale-rules/wholesale-rules.vue
+++ b/components/wholesale-rules/wholesale-rules.vue
@@ -1,7 +1,7 @@
 <template>
     <view :class="theme_view">
         <!-- 批发规则展示 -->
-        <view v-if="(data || null) != null" class="plugins-wholesale-container scroll-view-horizontal">
+        <view v-if="(data || null) != null" class="plugins-wholesale-container scroll-view-horizontal" :class="propIsAlone ? 'is-alone' : ''">
             <scroll-view scroll-x="true">
                 <view :class="'plugins-wholesale-container-rules-view wh-auto padding-main item-number-'+data.rules.length" @tap="popup_wholesale_event">
                     <view v-for="(item, index) in data.rules" :key="index" class="item">
@@ -78,7 +78,12 @@ export default {
         propData: {
             type: [Array, Object, String],
             default: {},
-        }
+        },
+        // 是否独立行
+        propIsAlone: {
+            type: Boolean,
+            default: false,
+        },
     },
     // 属性值改变监听
     watch: {
@@ -120,7 +125,7 @@ export default {
     /**
      * 批发 - 插件
      */
-    .plugins-wholesale-container {
+    .plugins-wholesale-container.is-alone {
         background: linear-gradient(to bottom, #fafafa 0%, #fff 100%);
     }
     .plugins-wholesale-container-rules-view {
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 255cce71..9cf91fd5 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -76,7 +76,7 @@
             <view class="goods-base-price bg-white oh spacing-mb" :class="plugins_seckill_is_valid ? 'goods-base-price-countdown' : ''">
                 <!-- 批发规则、未隐藏商品售价的时候独立行展示 -->
                 <block 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"></component-wholesale-rules>
+                    <component-wholesale-rules :propIsPopup="true" :propCurrencySymbol="currency_symbol" :propData="plugins_wholesale_data" :propIsAlone="true"></component-wholesale-rules>
                 </block>
                 <!-- 价格 -->
                 <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 + ')' : ''">
@@ -98,6 +98,10 @@
                             <text class="points-price-unit text-size-xs cr-grey va-m margin-left-xs">{{goods.plugins_points_data.points_unit}}</text>
                         </view>
                     </block>
+                    <block v-else>
+                        <!-- 批发开启了隐藏价格，则价格容器这里展示批发价格信息 -->
+                        <component-wholesale-rules :propIsPopup="true" :propCurrencySymbol="currency_symbol" :propData="plugins_wholesale_data"></component-wholesale-rules>
+                    </block>
                 </view>
                 <block v-if="plugins_seckill_is_valid">
                     <view class="countdown-content padding-top-lg padding-bottom-lg padding-left-xs padding-right-xs fr tc">