From 6242d6122738fe1758aced61ba2d0db4ea10c5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 4 Aug 2025 17:08:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E9=A1=B9=E5=8D=A1?=
 =?UTF-8?q?=E8=BD=AE=E6=92=AD=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/diy/components/diy/carousel.vue      | 12 ++++++------
 pages/diy/components/diy/tabs-carousel.vue |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/diy/components/diy/carousel.vue b/pages/diy/components/diy/carousel.vue
index e6c72e78..6c58fb7b 100644
--- a/pages/diy/components/diy/carousel.vue
+++ b/pages/diy/components/diy/carousel.vue
@@ -78,7 +78,7 @@
                     return {};
                 },
             },
-            propIsCommon: {
+            propIsCommonStyle: {
                 type: Boolean,
                 default: true,
             },
@@ -178,8 +178,8 @@
                     new_list: new_form.carousel_list.concat(this.get_seat_list(new_form)),
                     popup_width: block * 16 * 2 + 'rpx', // 视频的宽度，依照16:9比例来算
                     popup_height: block * 9 * 2 + 'rpx',  // 视频的高度
-                    style_container: this.propIsCommon ? common_styles_computer(common_style) : '', // 公共样式显示
-                    style_img_container: this.propIsCommon ? common_img_computer(common_style, this.propIndex) : '', // 公共样式显示
+                    style_container: this.propIsCommonStyle ? common_styles_computer(common_style) : '', // 公共样式显示
+                    style_img_container: this.propIsCommonStyle ? common_img_computer(common_style, this.propIndex) : '', // 公共样式显示
                     img_style: new_form.carousel_type == 'inherit' ? '' : radius_computer(new_style), // 图片的设置
                     outer_img_style: new_form.carousel_type == 'inherit' ? radius_computer(new_style) + 'overflow: hidden;' : '',
                     indicator_style: get_indicator_style(new_style), // 指示器的样式
@@ -214,7 +214,7 @@
                 }
             },
             get_swiper_bg_style(form, actived_index) {
-                if (!this.propIsCommon) {
+                if (!this.propIsCommonStyle) {
                     return '';
                 }
                 const style = form?.carousel_list?.[actived_index]?.style;
@@ -233,7 +233,7 @@
                 return '';
             },
             get_swiper_bg_img_style(form, actived_index) {
-                if (!this.propIsCommon) {
+                if (!this.propIsCommonStyle) {
                     return '';
                 }
                 const { carousel_img, style = {} } = form?.carousel_list[actived_index] || {};
@@ -282,7 +282,7 @@
                         actived_index = 0;
                     }
                 }
-                if (!this.propIsCommon) {
+                if (!this.propIsCommonStyle) {
                     this.$emit('slideChange', actived_index);
                 }
                 this.setData({
diff --git a/pages/diy/components/diy/tabs-carousel.vue b/pages/diy/components/diy/tabs-carousel.vue
index 0a6eca8f..117a4df1 100644
--- a/pages/diy/components/diy/tabs-carousel.vue
+++ b/pages/diy/components/diy/tabs-carousel.vue
@@ -6,7 +6,7 @@
             <view :style="carousel_margin_top">
                 <view :style="carousel_container">
                     <view :style="carousel_img_container">
-                        <component-diycarousel :propValue="propValue" :propIsCommon="false" @onVideoPlay="video_play" @slideChange="slideChange"></component-diycarousel>
+                        <component-diycarousel :propValue="propValue" :propIsCommonStyle="false" @onVideoPlay="video_play" @slideChange="slideChange"></component-diycarousel>
                     </view>
                 </view>
             </view>