From ca77a0d8a9c71d753c53b38a0e0f25c482b53224 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, 19 Sep 2024 11:03:38 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=AD=94=E6=96=B9=E6=8C=87=E7=A4=BA=E5=99=A8=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-data-magic/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/model-data-magic/index.vue b/src/components/model-data-magic/index.vue
index 515417ec..c9387f53 100644
--- a/src/components/model-data-magic/index.vue
+++ b/src/components/model-data-magic/index.vue
@@ -19,7 +19,7 @@
                         <template v-else>
                             <magic-carousel :value="item" :content-img-radius="content_img_radius" type="img" :actived="form.style_actived" @carousel_change="carousel_change($event, index)"></magic-carousel>
                         </template>
-                        <div v-if="item.data_style.is_show == '1' && item.data_content.list.length > 1" :class="{'dot-center': item.data_style?.indicator_location == 'center', 'dot-right': item.data_style?.indicator_location == 'flex-end' }" class="dot flex abs" :style="`bottom: ${new_style.indicator_bottom}px;`">
+                        <div v-if="item.data_style.is_show == '1' && item.data_content.list.length > 1" :class="{'dot-center': item.data_style?.indicator_location == 'center', 'dot-right': item.data_style?.indicator_location == 'flex-end' }" class="dot flex abs" :style="`bottom: ${item.data_style?.indicator_bottom}px;`">
                             <template v-if="item.data_style.indicator_style == 'num'">
                                 <div :style="item.data_style.indicator_styles" class="dot-item">
                                     <span class="num-active" :style="`color: ${ item.data_style.actived_color }`">{{ item.actived_index + 1 }}</span><span>/{{ item.data_content.list.length }}</span>

From cbd0580f2f30d73fc603bb79fa261b58b7448970 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, 19 Sep 2024 15:33:20 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=AD=94=E6=96=B9=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-data-magic/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/model-data-magic/index.vue b/src/components/model-data-magic/index.vue
index c9387f53..3329dae5 100644
--- a/src/components/model-data-magic/index.vue
+++ b/src/components/model-data-magic/index.vue
@@ -240,11 +240,12 @@ const old_list = ref<any>({});
 const data_magic_list = ref<data_magic[]>([]);
 watch(props.value.content, (val) => {
     const data = cloneDeep(val.data_magic_list);
-    data.actived_index = 0;
     data.forEach((item: data_magic) => {
         const data_content = item.data_content;
         const data_style = item.data_style;
         const key = data_style.carouselKey;
+        // 指示器设置为0
+        item.actived_index = 0;
         // 指示器样式
         data_style.indicator_styles = indicator_style(data_style);
         data_style.background_style = background_style(data_style);

From f25c9e400f7e4210ab583dfd512ffc8cf8ea1897 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, 19 Sep 2024 17:18:13 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=92=E6=9D=80?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-seckill/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/model-seckill/index.vue b/src/components/model-seckill/index.vue
index 81c13cd6..eeecb8eb 100644
--- a/src/components/model-seckill/index.vue
+++ b/src/components/model-seckill/index.vue
@@ -52,7 +52,7 @@
                         <div class="flex-col gap-10 w flex-1 jc-sb" :style="content_style">
                             <div class="flex-col gap-10 w">
                                 <!-- 标题 -->
-                                <div :style="trends_config('title')" class="text-line-2">{{ item.title }}</div>
+                                <div v-if="is_show('title')" :style="trends_config('title')" class="text-line-2">{{ item.title }}</div>
                                 <!-- 进度条 -->
                                 <!-- <div v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
                                     <div class="re flex-1">
@@ -113,7 +113,7 @@
                         <div class="flex-col gap-10 w flex-1 jc-sb" :style="content_style">
                             <div class="flex-col gap-10 w">
                                 <!-- 标题 -->
-                                <div :style="trends_config('title')" class="text-line-2">{{ item.title }}</div>
+                                <div v-if="is_show('title')" :style="trends_config('title')" class="text-line-2">{{ item.title }}</div>
                                 <!-- 进度条 -->
                                 <div v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
                                     <div class="re flex-1">

From fdbd754f4a24ea2dbb8e48092dad4e956f7f1802 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, 19 Sep 2024 17:32:02 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9tabs=E5=B1=82=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/div-content/index.vue     | 5 ++++-
 src/components/model-tabs/model-tabs-styles.vue | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/common/div-content/index.vue b/src/components/common/div-content/index.vue
index 616d2ab6..24eefe15 100644
--- a/src/components/common/div-content/index.vue
+++ b/src/components/common/div-content/index.vue
@@ -126,7 +126,7 @@ watch(() => props.diyData, (val) => {
 // 模块的class
 const model_class = computed(() => {
     return (item: { show_tabs: string; key: string; id: string }) => {
-        return ['plug-in-table', { 'plug-in-border': item.show_tabs == '1', 'float-window': item.key == 'float-window', 'plug-in-animation': item.show_tabs != '1' && props.showModelBorder }];
+        return ['plug-in-table', { 'plug-in-border': item.show_tabs == '1', 'tabs-view': item.key == 'tabs', 'float-window': item.key == 'float-window', 'plug-in-animation': item.show_tabs != '1' && props.showModelBorder }];
     };
 });
 
@@ -381,4 +381,7 @@ const float_bottom_change = (val: { bottom: string; location: string }, id: stri
     max-width: 39rem;
     overflow: hidden;
 }
+.tabs-view {
+    z-index: 4;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/model-tabs/model-tabs-styles.vue b/src/components/model-tabs/model-tabs-styles.vue
index f5bf7abb..21aabad4 100644
--- a/src/components/model-tabs/model-tabs-styles.vue
+++ b/src/components/model-tabs/model-tabs-styles.vue
@@ -31,7 +31,7 @@
             </card-container>
         </el-form>
         <div class="divider-line"></div>
-        <common-styles :value="form.common_style" @update:value="common_styles_update" />
+        <common-styles :value="form.common_style" :is-floating-up="false" @update:value="common_styles_update" />
     </div>
 </template>
 <script setup lang="ts">