From 878ecdef2f1c44e044cc09b0fe3a4e47cc4495e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 17 Dec 2024 17:21:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AE=E5=92=8C=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=8D=A1=E8=BD=AE=E6=92=AD=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/carousel.vue      | 17 +++++++++++++----
 components/diy/tabs-carousel.vue | 15 ++++++++++++---
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/components/diy/carousel.vue b/components/diy/carousel.vue
index 3bc1ccdc..6f0e2ff3 100644
--- a/components/diy/carousel.vue
+++ b/components/diy/carousel.vue
@@ -1,7 +1,7 @@
 <template>
-    <view class="pr re" :style="style_container + swiper_bg_style">
+    <view class="pr" :style="style_container + swiper_bg_style">
         <view class="pa top-0 wh-auto ht-auto" :style="swiper_bg_img_style"></view>
-        <view class="pr re" :style="style_img_container + (!isEmpty(swiper_bg_img_style) ? 'background-image: url(null);' : '')">
+        <view class="pr" :style="style_img_container + (!isEmpty(swiper_bg_img_style) ? 'background-image: url(null);' : '')">
             <swiper circular="true" :autoplay="form.is_roll == '1'" :interval="form.interval_time * 1000" :display-multiple-items="slides_per_group" :duration="500" :style="{ height: swiper_height }" :previous-margin="previousMargin" :next-margin="nextMargin" @change="slideChange">
                 <block v-if="form.carousel_type == 'card'">
                     <swiper-item v-for="(item, index) in new_list" :key="index">
@@ -228,8 +228,17 @@
                 if (!this.propIsCommon) {
                     return '';
                 }
-                if (!isEmpty(form.carousel_list[actived_index]?.style?.background_img)) {
-                    return background_computer(form.carousel_list[actived_index].style) + (form?.carousel_list[actived_index].is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.6;` : '');
+                const { carousel_img, style = {} } = form?.carousel_list[actived_index] || {};
+                // 如果是自定义的图片 判断图片是否存在
+                if (!isEmpty(carousel_img) && style?.background_type == 'carousel') {
+                    // 如果是使用轮播图，判断轮播图是否存在
+                    const data = {
+                        background_img: carousel_img,
+                        background_img_style: style?.background_img_style || '2',
+                    }
+                    return background_computer(data) + (style.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.6;` : '');
+                } else if (!isEmpty(style?.background_img)) {
+                    return background_computer(style) + (style.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.6;` : '');
                 }
                 return '';
             },
diff --git a/components/diy/tabs-carousel.vue b/components/diy/tabs-carousel.vue
index 3938137a..6312eb20 100644
--- a/components/diy/tabs-carousel.vue
+++ b/components/diy/tabs-carousel.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="ou re" :style="style_container + swiper_bg_style">
+    <view class="ou pr" :style="style_container + swiper_bg_style">
         <view class="pa top-0 wh-auto ht-auto" :style="swiper_bg_img_style"></view>
         <view class="flex-col ou wh-auto" :style="style_img_container + (!isEmpty(swiper_bg_img_style) ? 'background-image: url(null);' : '')">
             <componentDiyTabs :propContentPadding="propContentPadding" :propValue="propValue" :propTop="propTop" :propNavIsTop="propNavIsTop" :propTabsIsTop="propTabsIsTop" :propIsCommon="false" :propsTabsContainer="tabs_container" :propsTabsImgContainer="tabs_img_container" :propSpacingCommonStyle="spacing_common_style" @onComputerHeight="tabs_height_event" @onTabsTap="tabs_click_event"></componentDiyTabs>
@@ -172,8 +172,17 @@
                 return '';
             },
             get_swiper_bg_img_style(form, actived_index) {
-                if (!isEmpty(form.carousel_list[actived_index]?.style?.background_img)) {
-                    return background_computer(form.carousel_list[actived_index].style) + (form?.carousel_list[actived_index].is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.6;` : '');
+                const { carousel_img, style = {} } = form?.carousel_list[actived_index] || {};
+                // 如果是自定义的图片 判断图片是否存在
+                if (!isEmpty(carousel_img) && style?.background_type == 'carousel') {
+                    // 如果是使用轮播图，判断轮播图是否存在
+                    const data = {
+                        background_img: carousel_img,
+                        background_img_style: style?.background_img_style || '2',
+                    }
+                    return background_computer(data) + (style.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.6;` : '');
+                } else if (!isEmpty(style?.background_img)) {
+                    return background_computer(style) + (style.is_background_img_blur == '1' ? `filter: blur(14px);opacity: 0.6;` : '');
                 }
                 return '';
             },