From cd23ba1f231a8f8f8b6867c6c1eb89953de3b28c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Wed, 2 Apr 2025 11:05:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA=E7=BB=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/diy.vue         | 8 +-------
 components/diy/nav-group.vue   | 6 +++---
 components/diy/salerecords.vue | 8 ++++----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index 7ce5c69b..ff3a1c04 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -4,7 +4,7 @@
             <scroll-view :scroll-y="true" class="ht" @scroll="on_scroll_event" @scrolltolower="on_scroll_lower_event" @scrolltoupper="on_scroll_upper_event" lower-threshold="60" scroll-with-animation="true">
                 <!-- 头部小程序兼容 -->
                 <view class="pr header">
-                    <componentDiyHeader :propKey="header_data.id" :propValue="header_data.com_data" :propScrollTop="head_scroll_top" @onImmersionModelCallBack="immersion_model_call_back" @onLocationBack="choice_location_back"></componentDiyHeader>
+                    <componentDiyHeader :propKey="header_data.id" :propValue="header_data.com_data" :propScrollTop="head_scroll_top" @onLocationBack="choice_location_back"></componentDiyHeader>
                 </view>
                 <view :style="content_padding">
                     <view class="content flex-col" :style="'padding-top:calc(' + (temp_is_header_top ? temp_header_top + temp_sticky_top + 'px)' : '0px)')">
@@ -483,12 +483,6 @@
                 // 缓存数据
                 uni.setStorageSync(this.cache_key + this.tabs_home_id, diy_data);
             },
-            // 顶部导航沉浸模式回调
-            // immersion_model_call_back(bool) {
-            //     this.setData({
-            //         is_immersion_model: bool,
-            //     });
-            // },
             get_index_content(new_diy_index, header, header_style, item) {
                 item.index = new_diy_index;
                 if (new_diy_index == 0) {
diff --git a/components/diy/nav-group.vue b/components/diy/nav-group.vue
index 0a902c24..6fc29094 100644
--- a/components/diy/nav-group.vue
+++ b/components/diy/nav-group.vue
@@ -17,7 +17,7 @@
                     </view>
                 </swiper-item>
             </swiper>
-            <view v-if="form.display_style == 'slide' && new_style.is_show == '1'" :class="['left', 'right'].includes(new_style.indicator_new_location) ? 'indicator_up_down_location' : 'indicator_about_location'" :style="indicator_location_style">
+            <view v-if="form.display_style == 'slide' && new_style.is_show == '1' && new_height !== '0rpx'" :class="['left', 'right'].includes(new_style.indicator_new_location) ? 'indicator_up_down_location' : 'indicator_about_location'" :style="indicator_location_style">
                 <block v-if="new_style.indicator_style == 'num'">
                     <view :style="indicator_style" class="dot-item">
                         <text :style="{ color: new_style.actived_color }">{{ actived_index + 1 }}</text>
@@ -68,7 +68,7 @@ export default {
             img_style: '',
             text_style: '',
             indicator_style: '',
-            new_height: '300rpx',
+            new_height: '0rpx',
             actived_index: 0,
             group_width: '',
             nav_content_list: [],
@@ -171,7 +171,7 @@ export default {
                         }
                     })
                     .exec(); // 执行查询
-            }, 50);
+            }, 100);
         },
         get_nav_content_list(data, new_style) {
             // 深拷贝一下，确保不会出现问题
diff --git a/components/diy/salerecords.vue b/components/diy/salerecords.vue
index 53d03aca..bdc16a09 100644
--- a/components/diy/salerecords.vue
+++ b/components/diy/salerecords.vue
@@ -26,8 +26,8 @@
                         <template v-if="!isEmpty(item.split_list)">
                             <swiper circular="true" autoplay="true" :interval="swiper_interval_time" :duration="interval_time + (1000 * index)" easing-function="linear" :style="'height:' + new_swiper_height * 2 + 'rpx;'" :data-index="index" :data-value="item.split_list.length" @change="swiper_change">
                                 <swiper-item v-for="(new_item, new_index) in item.split_list" :key="new_index">
-                                    <view :style="swiper_horizontal_container + 'margin-right:' + new_style.data_spacing * 2 + 'rpx;margin-left:' + (new_index == 0 && swiper_margin_left_list[index].is_left ? slides_offset_before : 0) + 'px;'">
-                                        <view class="flex-row align-c" :style="swiper_horizontal_img_container + 'gap:' + new_style.content_spacing * 2 + 'rpx;'">
+                                    <view :style="swiper_horizontal_container + 'margin-left:' + (new_index == 0 && swiper_margin_left_list[index].is_left ? slides_offset_before : 0) + 'px;'">
+                                        <view class="flex-row align-c" :style="swiper_horizontal_img_container">
                                             <view v-if="is_show('goods_image') || is_show('goods_title')" class="flex-row align-c" :style="'gap:' + new_style.content_spacing * 2 + 'rpx;'" :data-value="new_item.goods_url" @tap.stop="url_event">
                                                 <template v-if="is_show('goods_image')">
                                                     <imageEmpty :propImageSrc="new_item.images" :propStyle="goods_img_radius" propErrorStyle="width: 20rpx;height: 20rpx;"></imageEmpty>
@@ -196,7 +196,7 @@
             // 横向时的显示内容
             get_swiper_horizontal_container(new_style) {
                 const { content_color_list, content_direction, content_radius } = new_style
-                return gradient_handle(content_color_list, content_direction) + radius_computer(content_radius);
+                return gradient_handle(content_color_list, content_direction) + radius_computer(content_radius) + 'margin-right:' + new_style.data_spacing * 2 + 'rpx';
             },
             // 横向时的图片显示内容
             get_swiper_horizontal_img_container(new_style) {
@@ -205,7 +205,7 @@
                     background_img_style: content_background_img_style,
                     background_img: content_background_img,
                 }
-                return background_computer(data) + padding_computer(content_padding);
+                return background_computer(data) + padding_computer(content_padding) + 'gap:' + new_style.content_spacing * 2 + 'rpx;';
             },
             get_heading_img_radius(new_style) {
                 const { heading_img_radius, heading_img_width, heading_img_height, heading_img_border_color, heading_img_border_size } = new_style;