From 35a0360e0ac877c7a41e16734ee63a3032c2d3df Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Mon, 5 Feb 2024 17:16:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E7=AC=A6=E5=8F=B7=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=8D=95=E4=BD=8D=E6=9C=89=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/binding-list/binding-list.vue      |  2 +-
 components/blog-list/blog-list.vue            |  2 +-
 components/cart/cart.vue                      |  2 +-
 components/goods-buy/goods-buy.vue            |  6 +++---
 components/goods-list/goods-list.vue          |  6 +++---
 components/magic-list/magic-list.vue          |  2 +-
 pages/goods-category/goods-category.vue       | 13 ++++++++-----
 pages/plugins/binding/detail/detail.vue       |  4 ++--
 pages/user-favor/user-favor.vue               |  7 +++++--
 pages/user-goods-browse/user-goods-browse.vue |  9 ++++++---
 10 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/components/binding-list/binding-list.vue b/components/binding-list/binding-list.vue
index f66234fc..0af5b7e0 100644
--- a/components/binding-list/binding-list.vue
+++ b/components/binding-list/binding-list.vue
@@ -30,7 +30,7 @@
                                     <image :src="gv.images" mode="aspectFit" class="goods-images fl dis-block radius"></image>
                                     <view class="goods-right fr bs-bb">
                                         <view class="single-text text-size-sm">{{ gv.title }}</view>
-                                        <view class="single-text">
+                                        <view v-if="(gv.show_field_price_status || 0) == 1" class="single-text">
                                             <text class="sales-price va-m text-size-xss">{{ gv.show_price_symbol }}{{ gv.price }}</text>
                                             <text class="cr-grey va-m text-size-xsss">{{ gv.show_price_unit }}</text>
                                         </view>
diff --git a/components/blog-list/blog-list.vue b/components/blog-list/blog-list.vue
index 10456055..af526749 100644
--- a/components/blog-list/blog-list.vue
+++ b/components/blog-list/blog-list.vue
@@ -22,7 +22,7 @@
                                                 <view class="base fr">
                                                     <view class="single-text text-size">{{ item.title }}</view>
                                                     <view class="cr-grey-9 margin-top-sm text-size-xs">{{ item.add_time_date_cn }}</view>
-                                                    <view class="cr-base multi-text margin-top-sm text-size-xs">{{ item.describe }}</view>
+                                                    <view v-if="(item.describe || null) != null" class="cr-base multi-text margin-top-sm text-size-xs">{{item.describe}}</view>
                                                 </view>
                                             </navigator>
                                         </view>
diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index b0d4c417..7e0c2554 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -87,7 +87,7 @@
                                                 <!-- 底部内容 -->
                                                 <view class="goods-bottom pr margin-top-sm flex-row jc-sb align-c">
                                                     <!-- 价格 -->
-                                                    <view>
+                                                    <view v-if="(item.show_field_price_status || 0) == 1">
                                                         <text class="sales-price fw-b va-m">
                                                             <text class="text-size-sm">{{ item.show_price_symbol }}</text>
                                                             <text class="text-size-lg">{{ item.price }}</text>
diff --git a/components/goods-buy/goods-buy.vue b/components/goods-buy/goods-buy.vue
index 4042c450..8783a5b7 100644
--- a/components/goods-buy/goods-buy.vue
+++ b/components/goods-buy/goods-buy.vue
@@ -12,11 +12,11 @@
                     <image :src="goods_spec_base_images" mode="scaleToFill" class="radius br" @tap="goods_detail_images_view_event" :data-value="goods_spec_base_images"></image>
                     <view class="goods-spec-base-content">
                         <view class="goods-price">
-                            <view>
+                            <view v-if="(goods.show_field_price_status || 0) == 1">
                                 <text class="sales-price va-m">{{ goods.show_price_symbol }}{{ goods_spec_base_price }}</text>
                                 <text class="cr-grey text-size-xs va-m">{{ goods.show_price_unit }}</text>
-                            </view> 
-                            <view v-if="(goods_spec_base_original_price || null) != null && goods_spec_base_original_price != 0" class="original-price margin-top-sm">{{ goods.show_original_price_symbol }}{{ goods_spec_base_original_price }}{{ goods.show_original_price_unit }}</view>
+                            </view>
+                            <view v-if="(goods.show_field_original_price_status || 0) == 1 && (goods_spec_base_original_price || null) != null && goods_spec_base_original_price != 0" class="original-price margin-top-sm">{{ goods.show_original_price_symbol }}{{ goods_spec_base_original_price }}{{ goods.show_original_price_unit }}</view>
                         </view>
                         <view class="inventory text-size-xs margin-top">
                             <text class="cr-grey">{{ $t('goods-detail.goods-detail.1s79t4') }}</text>
diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
index 24b34659..3d55be6a 100644
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -19,7 +19,7 @@
                                 <view class="base fr">
                                     <view class="multi-text">{{ item.title }}</view>
                                     <view v-if="(item.simple_desc || null) != null" class="cr-grey single-text margin-top-sm text-size-sm">{{ item.simple_desc }}</view>
-                                    <view class="flex-row jc-sb align-c margin-top-main pr">
+                                    <view  v-if="(item.show_field_price_status || 0) == 1"class="flex-row jc-sb align-c margin-top-main pr">
                                         <block v-if="(propPriceField || null) != null && item[propPriceField] != undefined">
                                             <view class="base-bottom">
                                                 <text v-if="propIsShowPriceIcon && (item.price_icon || null) != null" class="bg-red br-red cr-white text-size-xs padding-left-sm padding-right-sm round va-m margin-right-xs">{{ item.price_icon }}</text>
@@ -62,7 +62,7 @@
                                 <image class="goods-img dis-block wh-auto" :src="item.images" mode="widthFix"></image>
                                 <view class="base padding-horizontal-main margin-top-sm">
                                     <view class="goods-title multi-text">{{ item.title }}</view>
-                                    <view class="margin-top-sm flex-row jc-sb align-c pr">
+                                    <view v-if="(item.show_field_price_status || 0) == 1" class="margin-top-sm flex-row jc-sb align-c pr">
                                         <view :class="propIsOpenGridBtnSet ? 'open-grid-btn' : ''">
                                             <block v-if="!propIntegral">
                                                 <block v-if="(propPriceField || null) != null && item[propPriceField] != undefined">
@@ -129,7 +129,7 @@
                                             <image class="goods-img dis-block wh-auto" :src="item.images" mode="aspectFit"></image>
                                             <view class="padding-left-sm padding-right-sm margin-top-sm">
                                                 <view class="single-text text-size-xs">{{ item.title }}</view>
-                                                <view class="margin-top-xs flex-row align-c">
+                                                <view v-if="(item.show_field_price_status || 0) == 1" class="margin-top-xs flex-row align-c">
                                                     <block v-if="(item.is_error || 0) == 0 && is_show_cart">
                                                         <view v-if="propOpenCart" class="bg-white right-cart-icon" :data-index="index" @tap.stop="goods_cart_event">
                                                             <iconfont name="icon-cart-inc" size="28rpx" :color="theme_color" propClass="pr top-xs margin-right-xs"></iconfont>
diff --git a/components/magic-list/magic-list.vue b/components/magic-list/magic-list.vue
index 261f1e03..447f965e 100644
--- a/components/magic-list/magic-list.vue
+++ b/components/magic-list/magic-list.vue
@@ -22,7 +22,7 @@
                                                 <view v-for="(gv, gi) in swiper_item" :key="gi" :class="items.data.length % 2 == 0 ? 'flex-width-half' : items.data.length === index + 1 ? 'flex-width-half-2' : 'flex-width-half'">
                                                     <view class="padding-horizontal-main tc" :data-value="(gv.goods_url || null) !== null ? gv.goods_url : ''" @tap="url_event">
                                                         <image :src="(gv.images || null) !== null ? gv.images : ''" mode="heightFix" class="swiper-img border-radius-sm"> </image>
-                                                        <view class="price tc single-text">
+                                                        <view v-if="(gv.show_field_price_status || 0) == 1" class="price tc single-text">
                                                             <text class="sales-price va-m text-size-xss va-b">{{ gv.show_price_symbol }}</text>
                                                             <text class="sales-price va-m text-size-xs">{{ gv.min_price }}</text>
                                                             <text class="cr-grey va-m text-size-xss">{{ gv.show_price_unit }}</text>
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index ecf7de2b..8343f8fd 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -128,12 +128,15 @@
                                                                     <view class="goods-title multi-text">{{ item.title }}</view>
                                                                     <view v-if="(item.simple_desc || null) != null" class="simple-desc cr-grey-9 text-size-xs margin-top-sm single-text">{{ item.simple_desc }}</view>
                                                                 </view>
-                                                                <view class="oh flex-row jc-sb align-c">
-                                                                    <view class="single-text sales-price va-b va-m">
-                                                                        <text class="text-size-xss">{{ currency_symbol }}</text>
-                                                                        <text class="text-size-lg">{{ item.min_price }}</text>
+                                                                <view v-if="(item.show_field_price_status || 0) == 1" class="oh flex-row jc-sb align-c">
+                                                                    <view class="single-text va-m">
+                                                                        <text class="sales-price">
+                                                                            <text class="text-size-xss">{{ item.show_price_symbol }}</text>
+                                                                            <text class="text-size-lg">{{ item.min_price }}</text>
+                                                                        </text>
+                                                                        <text class="text-size-xs cr-grey">{{ item.show_price_unit }}</text>
                                                                     </view>
-                                                                    <view v-if="common_site_type != 1" class="buy-opt tc flex-row align-c">
+                                                                    <view v-if="common_site_type != 1" class="buy-opt">
                                                                         <block v-if="(item.is_error || 0) == 0">
                                                                             <view v-if="(item.buy_number || 0) > 0" class="cp pr top-sm" :data-index="index" data-type="0" @tap.stop="buy_number_event">
                                                                                 <iconfont name="icon-cart-dec" size="40rpx" :color="theme_color"></iconfont>
diff --git a/pages/plugins/binding/detail/detail.vue b/pages/plugins/binding/detail/detail.vue
index c7dcd896..16966140 100644
--- a/pages/plugins/binding/detail/detail.vue
+++ b/pages/plugins/binding/detail/detail.vue
@@ -19,14 +19,14 @@
                                     </label>
                                 </view>
                                 <view class="single-text margin-top-sm flex-row align-c">
-                                    <view>
+                                    <view v-if="(item.show_field_price_status || 0) == 1" class="margin-right-lg">
                                         <text class="sales-price va-m">
                                             <text class="text-size-xs">{{ item.show_price_symbol }}</text>
                                             <text class="text-size-lg fw-b">{{ item.price }}</text>
                                         </text>
                                         <text class="cr-grey text-size-xs va-m">{{ item.show_price_unit }}</text>
                                     </view>
-                                    <view v-if="(item.discount_price || 0) != 0" class="cr-green margin-left-lg text-size-xs">{{$t('detail.detail.6026t4')}}<text class="text-size-xs">{{ currency_symbol }}</text>
+                                    <view v-if="(item.discount_price || 0) != 0" class="cr-green text-size-xs">{{$t('detail.detail.6026t4')}}<text class="text-size-xs">{{ currency_symbol }}</text>
                                         {{ item.discount_price }}
                                     </view>
                                 </view>
diff --git a/pages/user-favor/user-favor.vue b/pages/user-favor/user-favor.vue
index fba50db4..f6672b55 100644
--- a/pages/user-favor/user-favor.vue
+++ b/pages/user-favor/user-favor.vue
@@ -8,8 +8,11 @@
                         <view class="goods-base">
                             <view class="goods-title multi-text">{{item.title}}</view>
                             <view class="oh margin-top-sm">
-                                <text class="sales-price">{{currency_symbol}}{{item.price}}</text>
-                                <text v-if="item.original_price > 0" class="original-price margin-left-sm">{{currency_symbol}}{{item.original_price}}</text>
+                                <block v-if="(item.show_field_price_status || 0) == 1">
+                                    <text class="sales-price">{{item.show_price_symbol}}{{item.price}}</text>
+                                    <text class="cr-grey text-size-xs">{{item.show_price_unit}}</text>
+                                </block>
+                                <text v-if="(item.show_field_original_price_status || 0) == 1 && item.original_price > 0" class="original-price margin-left">{{item.show_price_symbol}}{{item.original_price}}{{item.show_original_price_unit}}</text>
                             </view>
                         </view>
                     </view>
diff --git a/pages/user-goods-browse/user-goods-browse.vue b/pages/user-goods-browse/user-goods-browse.vue
index ef666c16..a18fdb56 100644
--- a/pages/user-goods-browse/user-goods-browse.vue
+++ b/pages/user-goods-browse/user-goods-browse.vue
@@ -7,9 +7,12 @@
                         <image class="goods-image fl radius" :src="item.images" mode="aspectFill"></image>
                         <view class="goods-base">
                             <view class="goods-title multi-text">{{item.title}}</view>
-                            <view class="oh margin-top-sm">
-                                <text class="sales-price">{{currency_symbol}}{{item.price}}</text>
-                                <text v-if="item.original_price > 0" class="original-price margin-left-sm">{{currency_symbol}}{{item.original_price}}</text>
+                            <view class="oh margin-top-sm">
+                                <block v-if="(item.show_field_price_status || 0) == 1">
+                                    <text class="sales-price">{{item.show_price_symbol}}{{item.price}}</text>
+                                    <text class="cr-grey text-size-xs">{{item.show_price_unit}}</text>
+                                </block>
+                                <text v-if="(item.show_field_original_price_status || 0) == 1 && item.original_price > 0" class="original-price margin-left">{{item.show_price_symbol}}{{item.original_price}}{{item.show_original_price_unit}}</text>
                             </view>
                         </view>
                     </view>