From 8612cffa90d740f7d3d36400e43aaf877cf54926 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 13 Apr 2024 01:36:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E5=8F=91=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 | 28 +++++++++++++++++--------
 pages/goods-detail/goods-detail.vue | 32 ++++++++++++++---------------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/pages/goods-detail/goods-detail.css b/pages/goods-detail/goods-detail.css
index 0d1c4fbd..6271f147 100644
--- a/pages/goods-detail/goods-detail.css
+++ b/pages/goods-detail/goods-detail.css
@@ -525,17 +525,29 @@
 /**
  * 批发 - 插件
  */
-.plugins-wholesale-container-view .item-title {
-    min-width: 70rpx;
+.plugins-wholesale-container-view {
+    display: flex;
+    justify-content: space-around;
 }
 .plugins-wholesale-container-view .item {
-    padding: 5rpx 15rpx;
-    color: #ff6633;
-    border: 1px dashed #ff9e7e;
-    display: inline-table;
+    margin-bottom: 0 !important;
 }
-.plugins-wholesale-container-view .item:not(:last-child) {
-    margin-right: 24rpx;
+.plugins-wholesale-container-view .item .price > .unit {
+    border: 0.05rem solid #cdcdcd;
+    color: #969696;
+    border-radius: 50%;
+    padding: 1rpx 6rpx;
+    vertical-align: top;
+    margin-left: 5rpx;
+}
+.plugins-wholesale-container-view .spec-tips {
+    color: #ffefc0;
+    border: 1rpx solid #ff9800;
+    background: #FF9800;
+    padding: 0 16rpx;
+    position: absolute;
+    top: 0;
+    right: 0;
 }
 .plugins-wholesale-container {
     max-height: 50vh;
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 48a155a4..d67ead81 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -81,7 +81,20 @@
             <!-- 价格信息 -->
             <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 + ')' : ''">
+                <view class="price-content padding-vertical-main padding-left-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 + ')' : ''">
+                    <!-- 批发 -->
+                    <block v-if="(plugins_wholesale_data || null) != null">
+                        <view class="plugins-wholesale-container-view wh-auto item" @tap="popup_wholesale_event">
+                            <view v-for="(item, index) in plugins_wholesale_data.rules" :key="index" class="item">
+                                <view class="price">
+                                    <text v-if="item.arr.type == 1" class="cr-red text-size-xs">{{currency_symbol}}</text>
+                                    <text class="sales-price">{{item.range_val}}</text>
+                                    <text v-if="item.arr.type == 0" class="unit text-size-xsss">{{item.arr.unit}}</text>
+                                </view>
+                                <view class="msg cr-black text-size-sm cr-grey">{{item.range_msg}}</view>
+                            </view>
+                        </view>
+                    </block>
                     <!-- 售价 -->
                     <view v-if="(goods.show_field_price_status || 0) == 1" class="item single-text">
                         <!-- 图标 -->
@@ -207,19 +220,6 @@
                     </view>
                 </view>
 
-                <!-- 批发 -->
-                <view v-if="(plugins_wholesale_data || null) != null" class="plugins-wholesale-container-view pr oh padding-main border-radius-main bg-white text-size-xs spacing-mb flex-row jc-sb align-c">
-                    <view class="item-title padding-right-main self-c">{{ plugins_wholesale_data.title }}</view>
-                    <view class="flex-row align-c flex-1 flex-width" @tap="popup_wholesale_event">
-                        <view class="padding-right-main border-radius-main single-text flex-1 flex-width">
-                            <block v-for="(item, index) in plugins_wholesale_data.rules" :key="index">
-                                <view class="item round dis-inline-block margin-vertical-xs">{{ item.msg }}</view>
-                            </block>
-                        </view>
-                        <iconfont name="icon-arrow-right" color="#999"></iconfont>
-                    </view>
-                </view>
-
                 <!-- 优惠券 -->
                 <view v-if="(plugins_coupon_data || null) != null && plugins_coupon_data.data.length > 0" class="plugins-coupon-container-view pr oh padding-main border-radius-main bg-white text-size-xs spacing-mb flex-row jc-sb align-c">
                     <view class="item-title padding-right-main self-c">{{$t('goods-detail.goods-detail.w3jma9')}}</view>
@@ -514,8 +514,8 @@
                                 <block v-for="(item, index) in plugins_wholesale_data.rules" :key="index">
                                     <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>
+                                            <text class="cr-base">{{ item.range_msg }}</text>
+                                            <text class="margin-left-sm cr-main fw-b text-size-lg">{{ item.range_val }}</text>
                                             <text class="cr-grey margin-left-xs">{{ item.arr.unit }}</text>
                                         </view>
                                     </view>