From 79a127fc6eee7b49d4a790cd2b0edc8b6499eb6b Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Sat, 12 Oct 2024 10:00:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=80=89=E9=A1=B9=E5=8D=A1=E8=BD=AE=E6=92=AD?=
 =?UTF-8?q?=E9=A3=8E=E6=A0=BC=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/tabs-view/index.vue     |  2 ++
 src/components/model-nav-group/index.vue      |  2 +-
 .../model-nav-group-styles.vue                |  3 ++-
 src/components/model-tabs-carousel/index.vue  | 19 ++++++++++++-------
 .../model-tabs-carousel-content.vue           |  2 +-
 .../model-tabs-carousel-setting.vue           |  2 +-
 .../model-tabs/model-tabs-content.vue         |  6 +++---
 7 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/components/common/tabs-view/index.vue b/src/components/common/tabs-view/index.vue
index 307453c0..94063b6b 100644
--- a/src/components/common/tabs-view/index.vue
+++ b/src/components/common/tabs-view/index.vue
@@ -28,10 +28,12 @@ const props = defineProps({
         type: Object,
         default: () => ({}),
     },
+    // 是否为tabs
     isTabs: {
         type: Boolean,
         default: false,
     },
+    // 当前选中的tabs
     activeIndex: {
         type: Number,
         default: 0,
diff --git a/src/components/model-nav-group/index.vue b/src/components/model-nav-group/index.vue
index 0e07e1ce..5d43b5ac 100644
--- a/src/components/model-nav-group/index.vue
+++ b/src/components/model-nav-group/index.vue
@@ -108,7 +108,7 @@ onMounted(() => {
 const img_size = computed(() => (new_style.value?.img_size || '0') + 'px');
 // 每个导航所占位置
 const group_width = computed(() => `${100 / (form.value.single_line || 4)}%`);
-// 是否显示文字和图片
+// 是否显示标题和图片
 const nav_style = computed(() => form.value?.nav_style || 'image_with_text');
 
 const nav_content_list = computed(() => {
diff --git a/src/components/model-nav-group/model-nav-group-styles.vue b/src/components/model-nav-group/model-nav-group-styles.vue
index c1b0aca7..5920de17 100644
--- a/src/components/model-nav-group/model-nav-group-styles.vue
+++ b/src/components/model-nav-group/model-nav-group-styles.vue
@@ -3,10 +3,11 @@
         <el-form :model="form" label-width="80">
             <card-container>
                 <div class="mb-12">导航组</div>
-                <el-form-item label="间距">
+                <el-form-item label="数据间距">
                     <slider v-model="form.space"></slider>
                 </el-form-item>
             </card-container>
+            <div class="divider-line"></div>
             <card-container>
                 <div class="mb-12">图片样式</div>
                 <el-form-item label="图片圆角">
diff --git a/src/components/model-tabs-carousel/index.vue b/src/components/model-tabs-carousel/index.vue
index f48deab4..adcc2c0f 100644
--- a/src/components/model-tabs-carousel/index.vue
+++ b/src/components/model-tabs-carousel/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div :style="style_container">
         <div class="flex-col oh" :style="style_img_container">
-            <tabs-view ref="tabs" :value="tabs_list" :is-tabs="true"></tabs-view>
+            <tabs-view ref="tabs" :value="tabs_list" :is-tabs="true" :active-index="tabs_active_index"></tabs-view>
             <model-carousel :value="value" :is-common="false"></model-carousel>
         </div>
     </div>
@@ -19,12 +19,17 @@ const props = defineProps({
 });
 
 const tabs_list = ref(props.value);
-watch(props.value, (val) => {
-    let new_data = cloneDeep(val);
-    const { home_data } = new_data.content;
-    new_data.content.tabs_list = [home_data, ...new_data.content.tabs_list];
-    tabs_list.value = new_data;
-}, { immediate: true, deep: true });
+const tabs_active_index = ref(0);
+watch(
+    props.value,
+    (val) => {
+        let new_data = cloneDeep(val);
+        const { home_data } = new_data.content;
+        new_data.content.tabs_list = [home_data, ...new_data.content.tabs_list];
+        tabs_list.value = new_data;
+    },
+    { immediate: true, deep: true }
+);
 
 const style_container = computed(() => `${common_styles_computer(props.value.style.common_style)};`);
 const style_img_container = computed(() => `${common_img_computer(props.value.style.common_style)};gap:${props.value.style.data_spacing}px`);
diff --git a/src/components/model-tabs-carousel/model-tabs-carousel-content.vue b/src/components/model-tabs-carousel/model-tabs-carousel-content.vue
index b08bd127..9fb0d17c 100644
--- a/src/components/model-tabs-carousel/model-tabs-carousel-content.vue
+++ b/src/components/model-tabs-carousel/model-tabs-carousel-content.vue
@@ -43,7 +43,7 @@ const tabs_name = ref('tabs');
         width: 10rem;
         font-size: 1.4rem;
     }
-    .el-tabs__active-bar{
+    .el-tabs__active-bar {
         width: 100%;
     }
 }
diff --git a/src/components/model-tabs-carousel/model-tabs-carousel-setting.vue b/src/components/model-tabs-carousel/model-tabs-carousel-setting.vue
index 3c5f597b..6d0b0348 100644
--- a/src/components/model-tabs-carousel/model-tabs-carousel-setting.vue
+++ b/src/components/model-tabs-carousel/model-tabs-carousel-setting.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="setting-content">
         <template v-if="type == '1'">
-            <model-tabs-carousel-content :value="value.content" :tab-style="value.style"></model-tabs-carousel-content>
+            <model-tabs-carousel-content :value="value.content" :tab-carousel-style="value.style"></model-tabs-carousel-content>
         </template>
         <template v-if="type == '2'">
             <model-tabs-carousel-styles :value="value.style" :content="value.content"></model-tabs-carousel-styles>
diff --git a/src/components/model-tabs/model-tabs-content.vue b/src/components/model-tabs/model-tabs-content.vue
index 97877853..e9772279 100644
--- a/src/components/model-tabs/model-tabs-content.vue
+++ b/src/components/model-tabs/model-tabs-content.vue
@@ -20,20 +20,20 @@
                 <div class="flex-col gap-x-20">
                     <div class="card-background box-shadow-sm ptb-25 flex gap-y-16 re align-c">
                         <el-icon class="iconfont icon-jinzhi size-16 cursor-move" />
-                        <el-form-item label="显示文字" class="w mb-0">
+                        <el-form-item label="显示标题" class="w mb-0">
                             <el-input v-model="form.home_data.title" placeholder="请输入标题文字" clearable />
                         </el-form-item>
                     </div>
                     <drag :data="form.tabs_list" type="card" :space-col="25" @remove="remove" @on-sort="on_sort">
                         <template #default="scoped">
                             <div class="flex-col align-c jc-s gap-20 flex-1 w">
-                                <el-form-item label="显示文字" class="w mb-0">
+                                <el-form-item label="显示标题" class="w mb-0">
                                     <el-input v-model="scoped.row.title" placeholder="请输入标题文字" clearable />
                                 </el-form-item>
                                 <el-form-item label="数据类型" class="w mb-0">
                                     <el-radio-group v-model="scoped.row.data_type">
                                         <el-radio value="0">DIY页面</el-radio>
-                                        <el-radio value="1">选择分类</el-radio>
+                                        <el-radio value="1">商品分类</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
                                 <el-form-item :label="scoped.row.data_type == '0' ? 'DIY页面' : '商品分类'" class="w mb-0">