From 6aa5887f26da31eaaf2b437102906f1dfa434031 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sun, 19 Jan 2025 15:02:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=EF=BC=8C=E5=95=86?=
 =?UTF-8?q?=E5=93=81=20=E7=8C=9C=E4=BD=A0=E5=96=9C=E6=AC=A2=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                             |  6 ------
 components/cart/cart.vue            | 19 ++++++++++++-------
 pages/goods-detail/goods-detail.vue | 17 ++++++++---------
 pages/goods-search/goods-search.vue | 14 ++++++++------
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/App.vue b/App.vue
index d9641dcc..89c61dba 100644
--- a/App.vue
+++ b/App.vue
@@ -69,12 +69,6 @@
                 // 购物车页面顶部导航强制关闭门店（0否, 1是）
                 is_cart_header_close_realstore: 1,
 
-                // 购物车底部猜你喜欢是否显示（0否, 1是）
-                is_cart_bottom_guess_you_like: 1,
-
-                // 购物车底部猜你喜欢是否显示（0否, 1是）
-                is_goods_detail_bottom_guess_you_like: 1,
-
                 // 商品详情页底部导航是否开启购物车功能（0否, 1是）
                 is_goods_bottom_opt_cart: 1,
 
diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 4a777bca..45f1b469 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -128,7 +128,7 @@
                     </view>
 
                     <!-- 猜你喜欢 -->
-                    <view v-if="goods_list.length > 0" class="padding-horizontal-main margin-top-main">
+                    <view v-if="goods_list.length > 0" class="padding-horizontal-main margin-top-xxxl">
                         <view class="tc spacing-mb">
                             <view class="guess-like fw-b text-size-md">{{ $t('goods-detail.goods-detail.v2974w') }}</view>
                         </view>
@@ -357,7 +357,8 @@
                 // 基础配置
                 currency_symbol: app.globalData.currency_symbol(),
                 common_site_type: 0,
-                common_is_exhibition_mode_btn_text: null,
+                common_is_exhibition_mode_btn_text: null,
+                common_is_cart_show_guess_you_like: 0,
                 common_app_customer_service_tel: null,
                 swipe_item_index: null,
                 swipe_options: [
@@ -459,7 +460,8 @@
                     this.setData({
                         currency_symbol: app.globalData.get_config('currency_symbol'),
                         common_site_type: app.globalData.get_config('config.common_site_type'),
-                        common_is_exhibition_mode_btn_text: app.globalData.get_config('config.common_is_exhibition_mode_btn_text', this.$t('cart.cart.31h34v')),
+                        common_is_exhibition_mode_btn_text: app.globalData.get_config('config.common_is_exhibition_mode_btn_text', this.$t('cart.cart.31h34v')),
+                        common_is_cart_show_guess_you_like: parseInt(app.globalData.get_config('config.common_is_cart_show_guess_you_like', 0)),
                         common_app_customer_service_tel: app.globalData.get_config('config.common_app_customer_service_tel'),
                         is_cart_show_discount: parseInt(app.globalData.get_config('plugins_base.intellectstools.data.is_cart_show_discount', 0)),
                     });
@@ -1082,7 +1084,7 @@
 
             // 猜你喜欢
             get_data_list(is_mandatory) {
-                if(app.globalData.data.is_cart_bottom_guess_you_like == 1) {
+                if(this.common_is_cart_show_guess_you_like == 1) {
                     // 分页是否还有数据
                     if ((is_mandatory || 0) == 0) {
                         if (this.goods_bottom_line_status == true) {
@@ -1139,7 +1141,8 @@
                                     });
                                     if (this.goods_page <= 1) {
                                         this.setData({
-                                            goods_list: [],
+                                            goods_list: [],
+                                            random_value: Math.random(),
                                             goods_bottom_line_status: false,
                                         });
                                     }
@@ -1165,7 +1168,8 @@
             cart_success_event(e) {
                 // 更新猜你喜欢列表数据
                 this.setData({
-                    goods_list: e.goods_list,
+                    goods_list: e.goods_list,
+                    random_value: Math.random(),
                 });
                 // 重新加载数据
                 this.get_data();
@@ -1183,7 +1187,8 @@
                         }
                     }
                     this.setData({
-                        goods_list: temp_goods_list,
+                        goods_list: temp_goods_list,
+                        random_value: Math.random(),
                     });
                 }
             },
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 9cf91fd5..7e86470c 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -290,7 +290,7 @@
                 </block>
 
                 <!-- 商品评价 -->
-                <view v-if="common_is_show_goods_comments == 1" class="goods-comment spacing-mb">
+                <view v-if="common_is_goods_detail_show_comments == 1" class="goods-comment spacing-mb">
                     <view class="spacing-nav-title flex-row align-c jc-sb text-size-xs">
                         <view class="title-left">
                             <text class="text-wrapper title-left-border">{{$t('goods-detail.goods-detail.znz76d')}}</text>
@@ -372,9 +372,9 @@
                         <text class="text-wrapper title-left-border">{{$t('goods-detail.goods-detail.2j44o2')}}</text>
                     </view>
                     <view class="border-radius-main oh bg-white">
-                        <block v-if="(common_is_goods_detail_show_photo == 1 && goods_photo.length > 0) || (common_app_is_use_mobile_detail == 0 && (goods.content_web || null) != null) || (common_app_is_use_mobile_detail == 1 && goods_content_app.length > 0)">
+                        <block v-if="(common_is_goods_detail_content_show_photo == 1 && goods_photo.length > 0) || (common_app_is_use_mobile_detail == 0 && (goods.content_web || null) != null) || (common_app_is_use_mobile_detail == 1 && goods_content_app.length > 0)">
                             <!-- 是否详情展示相册 -->
-                            <block v-if="common_is_goods_detail_show_photo == 1 && goods_photo.length > 0">
+                            <block v-if="common_is_goods_detail_content_show_photo == 1 && goods_photo.length > 0">
                                 <view v-for="(item, index) in goods_photo" :key="index" class="goods-detail-photo">
                                     <image v-if="(item.images || null) != null" @tap="goods_detail_images_view_event" :data-value="item.images" class="wh-auto dis-block" :src="item.images" mode="widthFix"></image>
                                 </view>
@@ -707,8 +707,8 @@
                 currency_symbol: app.globalData.currency_symbol(),
                 plugins_is_goods_detail_poster: 0,
                 common_app_is_use_mobile_detail: 0,
-                common_is_goods_detail_show_photo: 0,
-                common_is_show_goods_comments: 1,
+                common_is_goods_detail_content_show_photo: 0,
+                common_is_goods_detail_show_comments: 1,
                 common_app_customer_service_tel: null,
                 // 是否单页预览
                 is_single_page: app.globalData.is_current_single_page() || 0,
@@ -898,8 +898,8 @@
                     this.setData({
                         currency_symbol: app.globalData.get_config('currency_symbol'),
                         common_app_is_use_mobile_detail: app.globalData.get_config('config.common_app_is_use_mobile_detail'),
-                        common_is_goods_detail_show_photo: app.globalData.get_config('config.common_is_goods_detail_show_photo'),
-                        common_is_show_goods_comments: app.globalData.get_config('config.common_is_show_goods_comments', 1),
+                        common_is_goods_detail_content_show_photo: app.globalData.get_config('config.common_is_goods_detail_content_show_photo'),
+                        common_is_goods_detail_show_comments: app.globalData.get_config('config.common_is_goods_detail_show_comments', 1),
                         common_app_customer_service_tel: app.globalData.get_config('config.common_app_customer_service_tel'),
                         plugins_is_goods_detail_poster: app.globalData.get_config('plugins_base.distribution.data.is_goods_detail_poster'),
                     });
@@ -935,13 +935,12 @@
 
                             // 基础数据
                             var plugins_seckill_data = data.plugins_seckill_data || null;
-                            var is_guess_you_like = app.globalData.data.is_goods_detail_bottom_guess_you_like;
                             var upd_data = {
                                 random_value: Math.random(),
                                 data_loading_status: 1,
                                 goods_bottom_nav_status: true,
                                 goods_bottom_opt_nav_status: true,
-                                guess_you_like: (is_guess_you_like == 1) ? (data.guess_you_like || []) : [],
+                                guess_you_like: data.guess_you_like || [],
                                 nav_more_list: data.nav_more_list || [],
                                 buy_button: data.buy_button || null,
                                 buy_left_nav: data.buy_left_nav || [],
diff --git a/pages/goods-search/goods-search.vue b/pages/goods-search/goods-search.vue
index 94436280..9d62761b 100644
--- a/pages/goods-search/goods-search.vue
+++ b/pages/goods-search/goods-search.vue
@@ -32,14 +32,14 @@
                     </block>
                 </view>
                 <image class="screening-submit pa cp" :src="common_static_url+'search-submit-icon.png'" mode="aspectFill" @tap="popup_form_event_show"></image>
-                <image class="show-type-submit pa cp" :src="common_static_url+'show-'+(data_show_type_value == 0 ? 'grid' : 'list')+'-icon.png'" mode="aspectFill" @tap="data_show_type_event"></image>
+                <image class="show-type-submit pa cp" :src="common_static_url+'show-'+(data_show_type_value == 0 ? 'list' : 'grid')+'-icon.png'" mode="aspectFill" @tap="data_show_type_event"></image>
             </view>
         </view>
 
         <!-- 列表 -->
         <scroll-view :scroll-y="true" class="scroll-box" @scrolltolower="scroll_lower" lower-threshold="60">
             <view v-if="data_list.length > 0" class="padding-horizontal-main padding-top-main oh">
-                <component-goods-list :propData="{style_type: data_show_type_value, goods_list: data_list, random: random_value}" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol"
+                <component-goods-list :propData="{style_type: (data_show_type_value) == 0 ? 1 : 0, goods_list: data_list, random: random_value}" :propLabel="plugins_label_data" :propCurrencySymbol="currency_symbol"
                     :propIsCartParaCurve="true"></component-goods-list>
             </view>
             <view v-else>
@@ -199,7 +199,8 @@
             return {
                 theme_view: app.globalData.get_theme_value_view(),
                 common_static_url: common_static_url,
-                data_list_loding_status: 1,
+                data_list_loding_status: 1,
+                data_list_loding_msg: '',
                 data_bottom_line_status: false,
                 data_is_loading: 0,
                 data_list: [],
@@ -251,8 +252,8 @@
                         icon: 'default'
                     }
                 ],
-                // 数据展示样式（0图文、1九方格）
-                data_show_type_value: 1,
+                // 数据展示样式（0九方格、1图文）
+                data_show_type_value: 0,
                 // 基础配置
                 currency_symbol: app.globalData.currency_symbol(),
                 // 搜素条件
@@ -358,7 +359,8 @@
             init_config(status) {
                 if ((status || false) == true) {
                     this.setData({
-                        currency_symbol: app.globalData.get_config('currency_symbol')
+                        currency_symbol: app.globalData.get_config('currency_symbol'),
+                        data_show_type_value: parseInt(app.globalData.get_config('config.home_search_goods_show_type', 0))
                     });
                 } else {
                     app.globalData.is_config(this, 'init_config');