From bb9e75ad4708c9e0c4d4cd66e5b22fe95946d625 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, 9 Apr 2025 11:02:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/diy/components/diy/title.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pages/diy/components/diy/title.vue b/pages/diy/components/diy/title.vue
index 7a6615c2..dee8c37c 100644
--- a/pages/diy/components/diy/title.vue
+++ b/pages/diy/components/diy/title.vue
@@ -107,20 +107,24 @@
                     right_size: right_size * 2 + 'rpx', // 右边按钮设置
                     right_style: `color:${right_color}; font-size: ${right_size * 2}rpx;`, //右侧按钮样式
                     title_style: `color:${title_color}; font-size: ${title_size * 2}rpx; ${common_styles}`, // 标题样式设置
-                    subtitle_style: this.get_subtitle_style(new_style), // 副标题样式设置
+                    subtitle_style: this.get_subtitle_style(new_form, new_style), // 副标题样式设置
                     style_container: common_styles_computer(common_style), // 通用样式区
                     style_img_container: common_img_computer(common_style, this.propIndex), // 通用图片样式区
                 });
             },
             // 副标题样式设置
-            get_subtitle_style(new_style) {
+            get_subtitle_style(new_form, new_style) {
                 let common_styles = '';
                 if (new_style.subtitle_weight == 'italic') {
                     common_styles += `font-style: italic`;
                 } else if (['bold', '500'].includes(new_style.subtitle_weight)) {
                     common_styles += `font-weight: bold;`;
                 }
-                return `color:${new_style.subtitle_color}; font-size: ${new_style.subtitle_size * 2}rpx; ${common_styles}`;
+                let flex = '';
+                if (new_form.is_subtitle_center == '1') {
+                    flex = 'display: flex; justify-content: center;';
+                }
+                return `color:${new_style.subtitle_color}; font-size: ${new_style.subtitle_size * 2}rpx; ${common_styles} ${ flex }`;
             },
             url_event(e) {
                 app.globalData.url_event(e);

From 2d990060d4621ed59407b1271e73da977d47fb5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 10 Apr 2025 10:05:15 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/diy/components/diy/carousel.vue | 33 ++++++++++++---------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/pages/diy/components/diy/carousel.vue b/pages/diy/components/diy/carousel.vue
index e50adff2..94146f5a 100644
--- a/pages/diy/components/diy/carousel.vue
+++ b/pages/diy/components/diy/carousel.vue
@@ -5,21 +5,19 @@
             <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 + '; '+ outer_img_style" :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">
-                        <view class="flex-row align-c wt-auto ht-auto" :data-value="item.carousel_link.page" @tap="url_open">
+                        <view class="flex-row align-c wt-auto ht-auto pr" :data-value="item.carousel_link.page" @tap="url_open">
                             <view class="swiper-item" :style="img_style" :class="['scale-defalt', { 'scale-1': animationData === index }]">
                                 <view class="wh-auto ht-auto">
                                     <image-empty :propImageSrc="item.carousel_img[0]" :propStyle="img_style" :propImgFit="img_fit" propErrorStyle="width: 100rpx;height: 100rpx;"></image-empty>
                                 </view>
                             </view>
                             <view v-if="new_style.video_is_show == '1' && item.carousel_video.length > 0" :class="{ 'x-middle': new_style.video_location == 'center', 'right-0': new_style.video_location == 'flex-end' }" class="video-class pa oh" :style="{'bottom': new_style.video_bottom * 2 + 'rpx'}">
-                                <view class="flex-row gap-5 align-c" :style="video_style" :data-value="item.carousel_video" @tap.stop="video_play">
+                                <view class="flex-row gap-5 align-c wh-auto ht-auto" :style="video_style" :data-value="item.carousel_video" @tap.stop="video_play">
                                     <block v-if="new_style.video_type == 'img'">
-                                        <view class="video_img">
-                                            <image-empty :propImageSrc="new_style.video_img[0]" propImgFit="aspectFill" propErrorStyle="width: 28rpx;height: 28rpx;"></image-empty>
-                                        </view>
+                                        <image-empty :propImageSrc="new_style.video_img[0]" :propStyle="video_img_style" propImgFit="aspectFit" propErrorStyle="width: 28rpx;height: 28rpx;"></image-empty>
                                     </block>
                                     <block v-else>
-                                        <iconfont :name="!isEmpty(new_style.video_icon_class) ? 'icon-' + new_style.video_icon_class : 'icon-bofang'" size="'28rpx'" :color="new_style.video_icon_color" propContainerDisplay="flex"></iconfont>
+                                        <iconfont :name="!isEmpty(new_style.video_icon_class) ? 'icon-' + new_style.video_icon_class : 'icon-bofang'" :size="video_icon_size" :color="new_style.video_icon_color" propContainerDisplay="flex"></iconfont>
                                     </block>
                                     <text v-if="!isEmpty(item.video_title)" :style="{ color: new_style.video_title_color, 'font-size': new_style.video_title_size * 2 + 'rpx', 'text-wrap': 'nowrap' }">{{ item.video_title }}</text>
                                 </view>
@@ -29,19 +27,17 @@
                 </block>
                 <block v-else>
                     <swiper-item v-for="(item, index) in new_list" :key="index">
-                        <view class="ht-auto" :style="['oneDragOne', 'twoDragOne'].includes(form.carousel_type) ? 'padding-right:' + new_style.image_spacing * 2 + 'rpx;' : ''" :data-value="item.carousel_link.page" @tap="url_open">
-                            <view class="wh-auto ht-auto pr" :style="img_style">
+                        <view class="ht-auto pr" :style="['oneDragOne', 'twoDragOne'].includes(form.carousel_type) ? 'padding-right:' + new_style.image_spacing * 2 + 'rpx;' : ''" :data-value="item.carousel_link.page" @tap="url_open">
+                            <view class="wh-auto ht-auto" :style="img_style">
                                 <image-empty :propImageSrc="item.carousel_img[0]" :propStyle="img_style" :propImgFit="img_fit" propErrorStyle="width: 100rpx;height: 100rpx;"></image-empty>
                             </view>
                             <view v-if="new_style.video_is_show == '1' && item.carousel_video.length > 0" :class="{ 'x-middle': new_style.video_location == 'center', 'right-0': new_style.video_location == 'flex-end' }" class="video-class pa oh" :style="{'bottom': new_style.video_bottom * 2 + 'rpx'}">
-                                <view class="flex-row gap-5 align-c" :style="video_style" :data-value="item.carousel_video" @tap.stop="video_play">
+                                <view class="flex-row gap-5 align-c wh-auto ht-auto" :style="video_style" :data-value="item.carousel_video" @tap.stop="video_play">
                                     <block v-if="new_style.video_type == 'img'">
-                                        <view class="video_img">
-                                            <image-empty :propImageSrc="new_style.video_img[0]" propImgFit="aspectFill" propErrorStyle="width: 28rpx;height: 28rpx;"></image-empty>
-                                        </view>
+                                        <image-empty :propImageSrc="new_style.video_img[0]" :propStyle="video_img_style" propImgFit="aspectFit" propErrorStyle="width: 28rpx;height: 28rpx;"></image-empty>
                                     </block>
                                     <block v-else>
-                                        <iconfont :name="!isEmpty(new_style.video_icon_class) ? 'icon-' + new_style.video_icon_class : 'icon-bofang'" size="'28rpx'" :color="new_style.video_icon_color" propContainerDisplay="flex"></iconfont>
+                                        <iconfont :name="!isEmpty(new_style.video_icon_class) ? 'icon-' + new_style.video_icon_class : 'icon-bofang'" :size="video_icon_size" :color="new_style.video_icon_color" propContainerDisplay="flex"></iconfont>
                                     </block>
                                     <text v-if="!isEmpty(item.video_title)" :style="{ color: new_style.video_title_color, 'font-size': new_style.video_title_size * 2 + 'rpx', 'text-wrap': 'nowrap' }">{{ item.video_title }}</text>
                                 </view>
@@ -120,6 +116,8 @@
                 img_fit: '',
                 dot_style: '',
                 video_style: '',
+                video_img_style: '',
+                video_icon_size: '',
                 popup_width: '0rpx',
                 popup_height: '0rpx',
                 // 样式二的处理
@@ -183,12 +181,16 @@
                     indicator_style: get_indicator_style(new_style), // 指示器的样式
                     indicator_location_style: get_indicator_location_style(new_style),
                     dot_style: `bottom: ${ new_style.indicator_bottom * scale }px;`, // 指示器位置
+                    video_img_style: `width:${(new_style?.video_image_width || 14) * 2 }rpx;height:${ (new_style?.video_image_height || 14) * 2 }rpx;`,
+                    video_icon_size: `${ (new_style?.video_image_height || 14) * 2 }rpx`,
                     img_fit: fit, // 图片风格 默认为aspectFill
                     video_style: this.get_video_style(new_style), // 视频播放按钮显示逻辑   
                     swiper_height: new_form.height * scale + 'px', // 轮播图高度
                     swiper_bg_style: this.get_swiper_bg_style(new_form, 0),
                     swiper_bg_img_style: this.get_swiper_bg_img_style(new_form, 0),
                 });
+                console.log(this.video_img_style);
+                
                 // 风格二显示逻辑
                 if (new_form.carousel_type == 'card') {
                     // this.$nextTick(() => {
@@ -356,12 +358,7 @@
             transform: scale(1.1);
         }
     }
-    .video_img {
-        max-width: 120rpx;
-        height: 28rpx;
-    }
     .video-class {
-        max-width: 100%;
         padding-right: 20rpx;
         padding-left: 20rpx;
     }

From b901eb92d4ac85f93a8203a2039199386e8f1a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 10 Apr 2025 10:06:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AE=E6=92=AD?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=9B=BE=E7=89=87=E6=8E=A7=E5=88=B6=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/diy/components/diy/carousel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/diy/components/diy/carousel.vue b/pages/diy/components/diy/carousel.vue
index 94146f5a..2a786694 100644
--- a/pages/diy/components/diy/carousel.vue
+++ b/pages/diy/components/diy/carousel.vue
@@ -182,7 +182,7 @@
                     indicator_location_style: get_indicator_location_style(new_style),
                     dot_style: `bottom: ${ new_style.indicator_bottom * scale }px;`, // 指示器位置
                     video_img_style: `width:${(new_style?.video_image_width || 14) * 2 }rpx;height:${ (new_style?.video_image_height || 14) * 2 }rpx;`,
-                    video_icon_size: `${ (new_style?.video_image_height || 14) * 2 }rpx`,
+                    video_icon_size: `${ (new_style?.video_icon_size || 14) * 2 }rpx`,
                     img_fit: fit, // 图片风格 默认为aspectFill
                     video_style: this.get_video_style(new_style), // 视频播放按钮显示逻辑   
                     swiper_height: new_form.height * scale + 'px', // 轮播图高度