From c27a6f103a10c8ddf2e67ac47e7ee549580ccdca Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 20 Jun 2024 13:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BF=E9=97=AE=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E6=B8=A9=E9=A6=A8=E6=8F=90=E7=A4=BA=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=95=86=E5=93=81=E9=94=80=E9=87=8F=E5=92=8C=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=98=BE=E7=A4=BA=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../categorylimit-warm-tips.vue               | 54 +++++++++++++++++++
 components/goods-buy/goods-buy.vue            |  2 +-
 pages/goods-detail/goods-detail.css           |  3 --
 pages/goods-detail/goods-detail.vue           | 22 +++++---
 pages/goods-search/goods-search.vue           | 24 +++++----
 5 files changed, 84 insertions(+), 21 deletions(-)
 create mode 100644 components/categorylimit-warm-tips/categorylimit-warm-tips.vue

diff --git a/components/categorylimit-warm-tips/categorylimit-warm-tips.vue b/components/categorylimit-warm-tips/categorylimit-warm-tips.vue
new file mode 100644
index 00000000..21c4205d
--- /dev/null
+++ b/components/categorylimit-warm-tips/categorylimit-warm-tips.vue
@@ -0,0 +1,54 @@
+<template>
+    <view :class="theme_view">
+        <view v-if="popup_status && (propData || null) != null">
+            <view class="plugins-categorylimit-warm-tips-mask wh-auto ht-auto pf"></view>
+            <view class="plugins-categorylimit-warm-tips-content pf bg-white border-radius-main padding-xxl tc">
+                <image :src="propData.warm_tips_alert_images" class="dis-block wh-auto radius" mode="aspectFit"></image>
+                <view v-if="(propData.warm_tips_alert_msg || null) != null" class="margin-top-lg cr-base">{{propData.warm_tips_alert_msg}}</view>
+                <button type="button" class="bg-main br-main cr-white round text-size-md margin-top-xxxl" @tap="close_event">{{$t('common.confirm')}}</button>
+            </view>
+        </view>
+    </view>
+</template>
+<script>
+    const app = getApp();
+    export default {
+        data() {
+            return {
+                theme_view: app.globalData.get_theme_value_view(),
+                popup_status: true,
+            };
+        },
+        props: {
+            propData: {
+            	type: [String,Object],
+            	default: ''
+            }
+        },
+        methods: {
+            // 关闭弹窗
+            close_event(e) {
+                this.setData({
+                    popup_status: false
+                });
+            }
+        }
+    };
+</script>
+<style scoped>
+    .plugins-categorylimit-warm-tips-mask {
+        left: 0;
+        top: 0;
+        background: rgb(0, 0, 0, 0.6);
+        z-index: 10;
+    }
+    .plugins-categorylimit-warm-tips-content {
+        z-index: 11;
+        width: calc(100% - 240rpx);
+        left: 50%;
+        top: 50%;
+        height: -webkit-max-content;
+        height: max-content;
+        transform: translate(-50%, -50%);
+    }
+</style>
\ No newline at end of file
diff --git a/components/goods-buy/goods-buy.vue b/components/goods-buy/goods-buy.vue
index 6b7c1308..8c6289ac 100644
--- a/components/goods-buy/goods-buy.vue
+++ b/components/goods-buy/goods-buy.vue
@@ -18,7 +18,7 @@
                             </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">
+                        <view v-if="(goods.show_inventory_status || 0) == 1" class="inventory text-size-xs margin-top">
                             <text class="cr-grey">{{ $t('goods-detail.goods-detail.1s79t4') }}</text>
                             <text class="cr-base">{{ goods_spec_base_inventory }}</text>
                             <text class="cr-grey">{{ goods.inventory_unit }}</text>
diff --git a/pages/goods-detail/goods-detail.css b/pages/goods-detail/goods-detail.css
index 824bcdce..5191a597 100644
--- a/pages/goods-detail/goods-detail.css
+++ b/pages/goods-detail/goods-detail.css
@@ -180,9 +180,6 @@
 .goods-base-content .collect {
     width: 76rpx;
 }
-.goods-base-content .base-grid view {
-    width: calc(33.33% - 1px);
-}
 
 /**
 * 视频
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index ad9a33c5..217846ac 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -176,17 +176,17 @@
                     </view>
 
                     <!-- 基础总计数据 -->
-                    <view class="br-t padding-main">
-                        <view class="base-grid oh padding-top-sm padding-bottom-sm text-size-xs">
-                            <view class="fl tl">
+                    <view v-if="(goods.show_sales_number_status || 0) == 1 || (goods.show_inventory_status || 0) == 1" class="br-t padding-main">
+                        <view class="text-size-xs flex-row jc-sb">
+                            <view v-if="(goods.show_inventory_status || 0) == 1">
                                 <text class="cr-grey">{{$t('goods-detail.goods-detail.1s79t4')}}</text>
                                 <text class="cr-main padding-left-sm">{{ goods.inventory }}</text>
                             </view>
-                            <view class="fl tc">
+                            <view>
                                 <text class="cr-grey">{{$t('goods-category.goods-category.283ot0')}}</text>
                                 <text class="cr-main padding-left-sm">{{ goods.access_count }}</text>
                             </view>
-                            <view class="fl tr">
+                            <view v-if="(goods.show_sales_number_status || 0) == 1">
                                 <text class="cr-grey">{{$t('goods-category.goods-category.at5p35')}}</text>
                                 <text class="cr-main padding-left-sm">{{ goods.sales_count }}</text>
                             </view>
@@ -586,6 +586,11 @@
 
         <!-- 门店购物车 -->
         <component-realstore-cart ref="realstore_cart" :propStatus="plugins_realstore_cart_nav_status" v-on:BuyTypeSwitchEvent="refresh_loading_event" v-on:RefreshLoadingEvent="refresh_loading_event" :propCurrencySymbol="currency_symbol"></component-realstore-cart>
+
+        <!-- 品类限制温馨提示 -->
+        <block v-if="(plugins_categorylimit_data || null) != null">
+            <component-categorylimit-warm-tips :propData="plugins_categorylimit_data"></component-categorylimit-warm-tips>
+        </block>
     </view>
 </template>
 <script>
@@ -609,6 +614,7 @@
     import componentRealstoreCart from '@/components/realstore-cart/realstore-cart';
     import componentGoodsList from '@/components/goods-list/goods-list';
     import componentWholesaleRules from '@/components/wholesale-rules/wholesale-rules';
+    import componentCategorylimitWarmTips from '@/components/categorylimit-warm-tips/categorylimit-warm-tips';
 
     var common_static_url = app.globalData.get_static_url('common');
     var ask_static_url = app.globalData.get_static_url('ask', true) + 'app/';
@@ -745,6 +751,8 @@
                 plugins_ask_data: null,
                 // 批发插件
                 plugins_wholesale_data: null,
+                // 品类限制插件
+                plugins_categorylimit_data: null,
             };
         },
 
@@ -767,7 +775,8 @@
             componentCouponCard,
             componentRealstoreCart,
             componentGoodsList,
-            componentWholesaleRules
+            componentWholesaleRules,
+            componentCategorylimitWarmTips
         },
 
         onLoad(params) {
@@ -923,6 +932,7 @@
                                 plugins_goodsservice_data: data.plugins_goodsservice_data || null,
                                 plugins_batchbuy_data: data.plugins_batchbuy_data || null,
                                 plugins_ask_data: data.plugins_ask_data || null,
+                                plugins_categorylimit_data: data.plugins_categorylimit_data || null,
                             };
                             // 导航首页按钮
                             if ((data.nav_home_button_info || null) != null) {
diff --git a/pages/goods-search/goods-search.vue b/pages/goods-search/goods-search.vue
index c9099e41..e27157f3 100644
--- a/pages/goods-search/goods-search.vue
+++ b/pages/goods-search/goods-search.vue
@@ -44,7 +44,7 @@
             </view>
             <view v-else>
                 <!-- 提示信息 -->
-                <component-no-data :propStatus="data_list_loding_status"></component-no-data>
+                <component-no-data :propStatus="data_list_loding_status" :propMsg="data_list_loding_msg"></component-no-data>
             </view>
 
             <!-- 结尾 -->
@@ -387,9 +387,9 @@
                             this.set_tab_bar_badge_handle();
                         } else {
                             this.setData({
-                                data_list_loding_status: 0
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg
                             });
-                            app.globalData.showToast(res.data.msg);
                         }
 
                         // 基础自定义分享
@@ -409,9 +409,9 @@
                     fail: () => {
                         uni.stopPullDownRefresh();
                         this.setData({
-                            data_list_loding_status: 2
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
                         });
-                        app.globalData.showToast(this.$t('common.internet_error_tips'));
                     }
                 });
             },
@@ -468,7 +468,8 @@
                                     random_value: Math.random(),
                                     data_total: data.total,
                                     data_page_total: data.page_total,
-                                    data_list_loding_status: 3,
+                                    data_list_loding_status: 3,
+                                    data_list_loding_msg: '',
                                     data_page: this.data_page + 1,
                                     data_is_loading: 0
                                 });
@@ -479,7 +480,8 @@
                                 });
                             } else {
                                 this.setData({
-                                    data_list_loding_status: 0,
+                                    data_list_loding_status: 0,
+                                    data_list_loding_msg: res.data.msg,
                                     data_total: 0,
                                     data_is_loading: 0
                                 });
@@ -492,10 +494,10 @@
                             }
                         } else {
                             this.setData({
-                                data_list_loding_status: 0,
+                                data_list_loding_status: 0,
+                                data_list_loding_msg: res.data.msg,
                                 data_is_loading: 0
                             });
-                            app.globalData.showToast(res.data.msg);
                         }
                     },
                     fail: () => {
@@ -504,10 +506,10 @@
                         }
                         uni.stopPullDownRefresh();
                         this.setData({
-                            data_list_loding_status: 2,
+                            data_list_loding_status: 2,
+                            data_list_loding_msg: this.$t('common.internet_error_tips'),
                             data_is_loading: 0
                         });
-                        app.globalData.showToast(this.$t('common.internet_error_tips'));
                     }
                 });
             },