From d6fb0071293077d471520dbab96c7bda0535894b 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, 9 Dec 2024 14:19:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=AD=94=E6=96=B9=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../magic-cube-settings/tabs-styles.vue          | 16 ++++++++--------
 .../model-data-magic/components/video/index.vue  |  7 ++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue b/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue
index f18dfcf2..e241d442 100644
--- a/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue
+++ b/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue
@@ -1,8 +1,8 @@
 <template>
-    <template v-if="tabs_content.data_type != 'video'">
+    <template v-if="['goods', 'images', 'video'].includes(tabs_content.data_type) || (tabs_content.data_type == 'custom' && ['vertical-scroll', 'horizontal'].includes(tabs_content.data_source_direction))">
         <card-container>
             <div class="mb-12">基础样式</div>
-            <template v-if="['goods', 'images', 'custom'].includes(tabs_content.data_type)">
+            <template v-if="tabs_content.data_type != 'video'">
                 <el-form-item label="自动轮播">
                     <el-switch v-model="form.is_roll" active-value="1" inactive-value="0" />
                 </el-form-item>
@@ -30,6 +30,12 @@
         </card-container>
         <div class="bg-f5 divider-line" />
     </template>
+    <template v-if="['goods', 'images'].includes(tabs_content.data_type) || (tabs_content.data_type == 'custom' && ['vertical-scroll', 'horizontal'].includes(tabs_content.data_source_direction))">
+        <card-container>
+            <carousel-indicator :key="form.carouselKey" :value="form"></carousel-indicator>
+        </card-container>
+        <div class="bg-f5 divider-line" />
+    </template>
     <template v-if="tabs_content.data_type === 'goods'">
         <card-container>
             <div class="mb-12">标题样式</div>
@@ -156,12 +162,6 @@
         </card-container>
         <div class="bg-f5 divider-line" />
     </template>
-    <template v-if="['goods', 'images', 'custom'].includes(tabs_content.data_type)">
-        <card-container>
-            <carousel-indicator :key="form.carouselKey" :value="form"></carousel-indicator>
-        </card-container>
-        <div class="bg-f5 divider-line" />
-    </template>
     <card-container class="mb-8">
         <div class="mb-12">通用样式</div>
         <el-form-item label="底部背景">
diff --git a/src/components/model-data-magic/components/video/index.vue b/src/components/model-data-magic/components/video/index.vue
index 0d1f79a6..a3cf3b5f 100644
--- a/src/components/model-data-magic/components/video/index.vue
+++ b/src/components/model-data-magic/components/video/index.vue
@@ -2,10 +2,10 @@
     <div class="w h" :style="style_container">
         <div class="re w h oh">
             <template v-if="video && !video_img">
-                <video :src="video" class="w h" ></video>
+                <video :src="video" class="w h" :style="video_style"></video>
             </template>
             <template v-else>
-                <image-empty v-model="video_img" error-img-style="width:60px;height:60px;"></image-empty>
+                <image-empty v-model="video_img" :style="video_style" error-img-style="width:60px;height:60px;"></image-empty>
             </template>
             <img :src="video_src" class="middle box-shadow-sm round" width="50" height="50" />
         </div>
@@ -46,7 +46,8 @@ const video = computed(() => {
     }
 });
 // 公共样式
-const style_container = computed(() => padding_computer(props.dataStyle.chunk_padding) + radius_computer(props.dataStyle.img_radius));
+const style_container = computed(() => padding_computer(props.dataStyle.chunk_padding));
+const video_style = computed(() => radius_computer(props.dataStyle.img_radius));
 </script>
 <style lang="scss" scoped>
 video {