From 3cc511aa70c6cd0d87f26d6fec2c638c3badf6de Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 29 Aug 2024 15:18:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B5=8B=E8=AF=95=E4=BC=98=E5=8C=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20sws=202024-08-28?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../footer-nav/footer-nav-content.vue         |  8 +-
 .../footer-nav/footer-nav-styles.vue          |  3 +-
 .../model-article-list-content.vue            | 96 +++++++++----------
 .../model-article-list-styles.vue             |  3 +-
 .../model-article-tabs-content.vue            |  9 +-
 .../model-article-tabs-styles.vue             |  6 +-
 .../model-auxiliary-blank-content.vue         |  2 +-
 .../model-auxiliary-blank-styles.vue          |  3 +-
 .../model-auxiliary-line-content.vue          |  2 +-
 .../model-auxiliary-line-styles.vue           |  3 +-
 .../model-carousel/model-carousel-content.vue | 11 ++-
 .../model-carousel/model-carousel-styles.vue  | 27 +++---
 .../model-coupon/model-coupon-content.vue     |  3 +-
 .../model-coupon/model-coupon-styles.vue      |  1 +
 .../model-custom/model-custom-content.vue     |  2 +-
 .../model-float-window-content.vue            |  4 +-
 .../model-float-window-styles.vue             |  7 +-
 .../model-hot-zone/model-hot-zone-content.vue |  2 +-
 .../model-nav-group-content.vue               |  5 +-
 .../model-nav-group-styles.vue                | 28 +++---
 .../model-rich-text-content.vue               |  2 +-
 .../model-shop-list-content.vue               | 85 ++++++++--------
 .../model-shop-list-styles.vue                |  6 +-
 .../model-shop-tabs-content.vue               |  5 +-
 .../model-shop-tabs-styles.vue                |  9 +-
 .../model-tabs/model-tabs-content.vue         |  5 +-
 .../model-tabs/model-tabs-styles.vue          |  3 +-
 .../model-user-info-styles.vue                | 17 +++-
 28 files changed, 183 insertions(+), 174 deletions(-)

diff --git a/src/components/footer-nav/footer-nav-content.vue b/src/components/footer-nav/footer-nav-content.vue
index b27748a5..753753ae 100644
--- a/src/components/footer-nav/footer-nav-content.vue
+++ b/src/components/footer-nav/footer-nav-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="container">
         <el-form :model="form" label-width="70">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="导航样式">
                     <el-radio-group v-model="form.nav_style" is-button @change="nav_style_change">
@@ -17,7 +17,8 @@
                     </el-radio-group>
                 </el-form-item>
             </card-container>
-            <card-container class="footer-nav-height">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">导航内容</div>
                 <div class="size-12 cr-c mb-20">图片建议宽高80*80；鼠标拖拽左侧圆点可调整导航顺序</div>
                 <div class="nav-list">
@@ -85,8 +86,5 @@ const add = () => {
 .container {
     width: 100%;
     height: 100%;
-    .footer-nav-height {
-        min-height: calc(100vh - 36.8rem);
-    }
 }
 </style>
diff --git a/src/components/footer-nav/footer-nav-styles.vue b/src/components/footer-nav/footer-nav-styles.vue
index 6f9abeef..c4b1175b 100644
--- a/src/components/footer-nav/footer-nav-styles.vue
+++ b/src/components/footer-nav/footer-nav-styles.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="container">
         <el-form :model="form" label-width="70">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">颜色设置</div>
                 <el-form-item label="默认文本">
                     <color-picker v-model="form.default_text_color" default-color="rgba(0, 0, 0, 1)" @update:value="default_text_color_event" />
@@ -11,6 +11,7 @@
                 </el-form-item>
             </card-container>
         </el-form>
+        <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_styles_update" />
     </div>
 </template>
diff --git a/src/components/model-article-list/model-article-list-content.vue b/src/components/model-article-list/model-article-list-content.vue
index f31fe900..a45058df 100644
--- a/src/components/model-article-list/model-article-list-content.vue
+++ b/src/components/model-article-list/model-article-list-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="content">
         <el-form :model="form" label-width="70" class="m-h">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="选择风格">
                     <el-radio-group v-model="form.theme" @change="theme_change">
@@ -9,53 +9,53 @@
                     </el-radio-group>
                 </el-form-item>
             </card-container>
-            <div class="content-height bg-f">
-                <card-container class="card-container-br">
-                    <div class="mb-12">文章设置</div>
-                    <el-form-item label="读取方式">
-                        <el-radio-group v-model="form.data_type">
-                            <el-radio v-for="item in base_list.data_type_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
+            <div class="divider-line"></div>
+            <card-container class="card-container-br">
+                <div class="mb-12">文章设置</div>
+                <el-form-item label="读取方式">
+                    <el-radio-group v-model="form.data_type">
+                        <el-radio v-for="item in base_list.data_type_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <template v-if="form.data_type === '0'">
+                    <div class="nav-list">
+                        <drag-group :list="form.data_list" img-params="cover" @onsort="data_list_sort" @remove="data_list_remove"></drag-group>
+                        <el-button class="mtb-20 w" @click="add">+添加</el-button>
+                    </div>
+                </template>
+                <template v-else>
+                    <el-form-item label="文章分类">
+                        <el-select v-model="form.category" multiple collapse-tags placeholder="请选择文章分类">
+                            <el-option v-for="item in base_list.article_category_list" :key="item.id" :label="item.name" :value="item.id" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="显示数量">
+                        <el-input-number v-model="form.number" :min="1" :max="50" type="number" placeholder="请输入显示数量" value-on-clear="min" class="w number-show" controls-position="right"></el-input-number>
+                    </el-form-item>
+                    <el-form-item label="排序类型">
+                        <el-radio-group v-model="form.sort">
+                            <el-radio v-for="item in base_list.sort_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
                         </el-radio-group>
                     </el-form-item>
-                    <template v-if="form.data_type === '0'">
-                        <div class="nav-list">
-                            <drag-group :list="form.data_list" img-params="cover" @onsort="data_list_sort" @remove="data_list_remove"></drag-group>
-                            <el-button class="mtb-20 w" @click="add">+添加</el-button>
-                        </div>
-                    </template>
-                    <template v-else>
-                        <el-form-item label="文章分类">
-                            <el-select v-model="form.category" multiple collapse-tags placeholder="请选择文章分类">
-                                <el-option v-for="item in base_list.article_category_list" :key="item.id" :label="item.name" :value="item.id" />
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="显示数量">
-                            <el-input-number v-model="form.number" :min="1" :max="50" type="number" placeholder="请输入显示数量" value-on-clear="min" class="w number-show" controls-position="right"></el-input-number>
-                        </el-form-item>
-                        <el-form-item label="排序类型">
-                            <el-radio-group v-model="form.sort">
-                                <el-radio v-for="item in base_list.sort_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="排序规则">
-                            <el-radio-group v-model="form.sort_rules">
-                                <el-radio v-for="item in base_list.sort_rules_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="封面图片">
-                            <el-switch v-model="form.is_cover" />
-                        </el-form-item>
-                    </template>
-                </card-container>
-                <card-container>
-                    <div class="mb-12">列表设置</div>
-                    <el-form-item label="是否显示">
-                        <el-checkbox-group v-model="form.field_show">
-                            <el-checkbox v-for="item in base_list.field_show_list" :key="item.value" :value="item.value">{{ item.name }}</el-checkbox>
-                        </el-checkbox-group>
+                    <el-form-item label="排序规则">
+                        <el-radio-group v-model="form.sort_rules">
+                            <el-radio v-for="item in base_list.sort_rules_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
+                        </el-radio-group>
                     </el-form-item>
-                </card-container>
-            </div>
+                    <el-form-item label="封面图片">
+                        <el-switch v-model="form.is_cover" />
+                    </el-form-item>
+                </template>
+            </card-container>
+            <div class="divider-line"></div>
+            <card-container>
+                <div class="mb-12">列表设置</div>
+                <el-form-item label="是否显示">
+                    <el-checkbox-group v-model="form.field_show">
+                        <el-checkbox v-for="item in base_list.field_show_list" :key="item.value" :value="item.value">{{ item.name }}</el-checkbox>
+                    </el-checkbox-group>
+                </el-form-item>
+            </card-container>
         </el-form>
         <url-value-dialog v-model:dialog-visible="url_value_dialog_visible" :type="['article']" multiple @update:model-value="url_value_dialog_call_back"></url-value-dialog>
     </div>
@@ -187,12 +187,6 @@ const url_value_dialog_call_back = (item: any[]) => {
 <style lang="scss" scoped>
 .content {
     width: 100%;
-    .content-height {
-        min-height: calc(100vh - 31.8rem);
-        .card-container-br {
-            border-bottom: 0.8rem solid #f0f2f5;
-        }
-    }
 }
 .img {
     width: 4rem;
diff --git a/src/components/model-article-list/model-article-list-styles.vue b/src/components/model-article-list/model-article-list-styles.vue
index 8fca22bb..d26842a5 100644
--- a/src/components/model-article-list/model-article-list-styles.vue
+++ b/src/components/model-article-list/model-article-list-styles.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="styles">
         <el-form :model="form" label-width="70">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">列表样式</div>
                 <el-form-item label="文章名称">
                     <color-text-size-group v-model:color="form.name_color" v-model:typeface="form.name_weight" v-model:size="form.name_size"></color-text-size-group>
@@ -44,6 +44,7 @@
                 </template>
             </card-container>
         </el-form>
+        <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_style_update" />
     </div>
 </template>
diff --git a/src/components/model-article-tabs/model-article-tabs-content.vue b/src/components/model-article-tabs/model-article-tabs-content.vue
index d7c0d118..fd549066 100644
--- a/src/components/model-article-tabs/model-article-tabs-content.vue
+++ b/src/components/model-article-tabs/model-article-tabs-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="content">
         <el-form :model="form" label-width="74" class="m-h">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="选项卡风格">
                     <el-radio-group v-model="form.tabs_theme" @change="tabs_theme_change">
@@ -17,7 +17,8 @@
                     </el-radio-group>
                 </el-form-item>
             </card-container>
-            <card-container class="content-height mb-8">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">选项卡设置</div>
                 <div class="nav-list">
                     <drag :data="form.tabs_list" type="card" icon-position="top" :space-col="20" @click="tabs_list_click" @remove="tabs_list_remove" @on-sort="tabs_list_sort">
@@ -71,6 +72,7 @@
                     <el-button class="mtb-20 w" @click="tabs_add">+添加</el-button>
                 </div>
             </card-container>
+            <div class="divider-line"></div>
             <card-container>
                 <div class="mb-12">列表设置</div>
                 <el-form-item label="是否显示">
@@ -252,9 +254,6 @@ const tabs_theme_change = (val: string | number | boolean | undefined): void =>
 <style lang="scss" scoped>
 .content {
     width: 100%;
-    .content-height {
-        min-height: calc(100vh - 38.2rem);
-    }
 }
 .img {
     width: 4rem;
diff --git a/src/components/model-article-tabs/model-article-tabs-styles.vue b/src/components/model-article-tabs/model-article-tabs-styles.vue
index 2ae8a3e4..2035405c 100644
--- a/src/components/model-article-tabs/model-article-tabs-styles.vue
+++ b/src/components/model-article-tabs/model-article-tabs-styles.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="styles">
         <el-form :model="form" label-width="70">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">选项卡样式</div>
                 <el-form-item label="选中装饰">
                     <mult-color-picker :value="form.tabs_checked" :type="form.tabs_direction" @update:value="tabs_checked_event"></mult-color-picker>
@@ -13,7 +13,8 @@
                     <color-text-size-group v-model:color="form.tabs_color" v-model:typeface="form.tabs_weight" v-model:size="form.tabs_size" default-color="rgba(51,51,51,1)"></color-text-size-group>
                 </el-form-item>
             </card-container>
-            <card-container class="mb-8">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">内容样式</div>
                 <el-form-item label="文章名称">
                     <color-text-size-group v-model:color="form.name_color" v-model:typeface="form.name_weight" v-model:size="form.name_size"></color-text-size-group>
@@ -53,6 +54,7 @@
                 </template>
             </card-container>
         </el-form>
+        <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_styles_update" />
     </div>
 </template>
diff --git a/src/components/model-auxiliary-blank/model-auxiliary-blank-content.vue b/src/components/model-auxiliary-blank/model-auxiliary-blank-content.vue
index 905fe856..1397a26c 100644
--- a/src/components/model-auxiliary-blank/model-auxiliary-blank-content.vue
+++ b/src/components/model-auxiliary-blank/model-auxiliary-blank-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="auxiliary-line">
         <el-form :model="state" label-width="70">
-            <card-container class="common-content-height">
+            <card-container>
                 <div class="mb-12">高度设置</div>
                 <slider v-model="state.height" :max="1000"></slider>
             </card-container>
diff --git a/src/components/model-auxiliary-blank/model-auxiliary-blank-styles.vue b/src/components/model-auxiliary-blank/model-auxiliary-blank-styles.vue
index b22001c6..9b753aa9 100644
--- a/src/components/model-auxiliary-blank/model-auxiliary-blank-styles.vue
+++ b/src/components/model-auxiliary-blank/model-auxiliary-blank-styles.vue
@@ -1,13 +1,14 @@
 <template>
     <div class="common-style-height">
         <el-form :model="form" label-width="70">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">空白样式</div>
                 <el-form-item label="线条颜色">
                     <color-picker v-model="form.line_color" default-color="rgba(204, 204, 204, 1)" @update:value="line_color_event" />
                 </el-form-item>
             </card-container>
         </el-form>
+        <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_styles_update" />
     </div>
 </template>
diff --git a/src/components/model-auxiliary-line/model-auxiliary-line-content.vue b/src/components/model-auxiliary-line/model-auxiliary-line-content.vue
index 1c64faca..f6853bf0 100644
--- a/src/components/model-auxiliary-line/model-auxiliary-line-content.vue
+++ b/src/components/model-auxiliary-line/model-auxiliary-line-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="auxiliary-line-content">
         <el-form :model="form" label-width="70" class="m-h">
-            <card-container class="common-content-height">
+            <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="线条样式">
                     <el-radio-group v-model="form.styles" @change="line_change">
diff --git a/src/components/model-auxiliary-line/model-auxiliary-line-styles.vue b/src/components/model-auxiliary-line/model-auxiliary-line-styles.vue
index 72925c2d..1c7afb79 100644
--- a/src/components/model-auxiliary-line/model-auxiliary-line-styles.vue
+++ b/src/components/model-auxiliary-line/model-auxiliary-line-styles.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="auxiliary-line-styles">
         <el-form :model="form" label-width="70">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">线条样式</div>
                 <el-form-item label="线条颜色">
                     <color-picker v-model="form.line_color" default-color="rgba(204, 204, 204, 1)" />
@@ -11,6 +11,7 @@
                 </el-form-item>
             </card-container>
         </el-form>
+        <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_styles_update" />
     </div>
 </template>
diff --git a/src/components/model-carousel/model-carousel-content.vue b/src/components/model-carousel/model-carousel-content.vue
index 589f8787..3129142b 100644
--- a/src/components/model-carousel/model-carousel-content.vue
+++ b/src/components/model-carousel/model-carousel-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="auxiliary-line common-content-height">
         <el-form :model="form" label-width="70">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="样式设置">
                     <el-radio-group v-model="form.carousel_type" class="ml-4">
@@ -23,7 +23,8 @@
                     <slider v-model="form.interval_time" :max="100"></slider>
                 </el-form-item>
             </card-container>
-            <card-container class="mb-8">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">内容设置</div>
                 <div class="tips mt-10 mb-20 size-12">最多添加{{ form.carousel_list.length }}张图片，建议尺寸750*300px</div>
                 <div class="flex-col gap-20">
@@ -53,7 +54,7 @@ const props = defineProps({
 });
 
 const state = reactive({
-    form: props.value
+    form: props.value,
 });
 const { form } = toRefs(state);
 const add = () => {
@@ -61,10 +62,10 @@ const add = () => {
         carousel_img: [],
         carousel_link: {},
     });
-}
+};
 const remove = (index: number) => {
     form.value.carousel_list.splice(index, 1);
-}
+};
 </script>
 <style lang="scss" scoped>
 .card-background {
diff --git a/src/components/model-carousel/model-carousel-styles.vue b/src/components/model-carousel/model-carousel-styles.vue
index ea16f946..a091df05 100644
--- a/src/components/model-carousel/model-carousel-styles.vue
+++ b/src/components/model-carousel/model-carousel-styles.vue
@@ -1,22 +1,25 @@
 <template>
     <div class="common-style-height">
         <el-form :model="form" label-width="80">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">图片设置</div>
                 <el-form-item label="圆角">
                     <radius :value="form" @update:value="radius_change"></radius>
                 </el-form-item>
             </card-container>
-            <card-container class="mb-8">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">轮播设置</div>
                 <el-form-item label="高度设置">
                     <slider v-model="form.height" :max="1000"></slider>
                 </el-form-item>
             </card-container>
-            <card-container class="mb-8">
+            <div class="divider-line"></div>
+            <card-container>
                 <carousel-indicator :value="form"></carousel-indicator>
             </card-container>
         </el-form>
+        <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_styles_update" />
     </div>
 </template>
@@ -26,12 +29,12 @@ import { pick } from 'lodash';
 const props = defineProps({
     value: {
         type: Object,
-        default: () => {}
-    }
-})
+        default: () => {},
+    },
+});
 
 const state = reactive({
-    form: props.value
+    form: props.value,
 });
 // 如果需要解构，确保使用toRefs
 const { form } = toRefs(state);
@@ -40,15 +43,9 @@ const { form } = toRefs(state);
 const emit = defineEmits(['update:value']);
 // 图片圆角
 const radius_change = (radius: any) => {
-    form.value = Object.assign(form.value, pick(radius, [
-        'radius',
-        'radius_top_left',
-        'radius_top_right',
-        'radius_bottom_left',
-        'radius_bottom_right',
-    ]));
+    form.value = Object.assign(form.value, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right']));
     emit('update:value', form.value);
-}
+};
 // 通用样式处理
 const common_styles_update = (val: Object) => {
     form.value.common_style = val;
diff --git a/src/components/model-coupon/model-coupon-content.vue b/src/components/model-coupon/model-coupon-content.vue
index 5531ec2c..8e173d9a 100644
--- a/src/components/model-coupon/model-coupon-content.vue
+++ b/src/components/model-coupon/model-coupon-content.vue
@@ -1,12 +1,13 @@
 <template>
     <div class="content">
         <el-form :model="form" label-width="70" class="m-h">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="选择风格">
                     <theme-select v-model="form.theme" :data="base_list.themeList" @update:model-value="themeChange"></theme-select>
                 </el-form-item>
             </card-container>
+            <div class="divider-line"></div>
             <card-container class="content-height">
                 <div class="mb-12">优惠券数据</div>
                 <el-form-item label="数据来源">
diff --git a/src/components/model-coupon/model-coupon-styles.vue b/src/components/model-coupon/model-coupon-styles.vue
index b73555b6..a4f85637 100644
--- a/src/components/model-coupon/model-coupon-styles.vue
+++ b/src/components/model-coupon/model-coupon-styles.vue
@@ -39,6 +39,7 @@
                 </el-form-item>
             </card-container>
         </el-form>
+        <div class="divider-line"></div>
         <common-styles class="styles-height" :value="form.common_style" @update:value="common_styles_update" />
     </div>
 </template>
diff --git a/src/components/model-custom/model-custom-content.vue b/src/components/model-custom/model-custom-content.vue
index b0ea362f..c2d3a38f 100644
--- a/src/components/model-custom/model-custom-content.vue
+++ b/src/components/model-custom/model-custom-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="auxiliary-line">
         <el-form :model="form" label-width="70">
-            <card-container class="common-content-height">
+            <card-container>
                 <div class="mb-20">数据源</div>
                 <el-form-item label="动态数据">
                     <el-select v-model="form.data_source" value-key="id" placeholder="请选择数据源" filterable clearable @change="changeDataSource">
diff --git a/src/components/model-float-window/model-float-window-content.vue b/src/components/model-float-window/model-float-window-content.vue
index 8a271a11..7c328f5f 100644
--- a/src/components/model-float-window/model-float-window-content.vue
+++ b/src/components/model-float-window/model-float-window-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="auxiliary-line">
         <el-form :model="form" label-width="70">
-            <card-container class="common-content-height">
+            <card-container>
                 <div class="mb-12">按钮设置</div>
                 <el-form-item label="按钮跳转">
                     <el-radio-group v-model="form.button_jump" class="ml-4">
@@ -28,7 +28,7 @@ const props = defineProps({
 });
 
 const state = reactive({
-    form: props.value
+    form: props.value,
 });
 const { form } = toRefs(state);
 </script>
diff --git a/src/components/model-float-window/model-float-window-styles.vue b/src/components/model-float-window/model-float-window-styles.vue
index 8e0ed758..0fa82784 100644
--- a/src/components/model-float-window/model-float-window-styles.vue
+++ b/src/components/model-float-window/model-float-window-styles.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="w">
         <el-form :model="form" label-width="80">
-            <card-container class="common-content-height">
+            <card-container>
                 <div class="mb-12">位置设置</div>
                 <el-form-item label="展示位置">
                     <el-radio-group v-model="form.display_location" class="ml-4">
@@ -30,15 +30,14 @@ const props = defineProps({
     value: {
         type: Object,
         default: () => {},
-    }
+    },
 });
 
 const state = reactive({
-    form: props.value
+    form: props.value,
 });
 // 如果需要解构，确保使用toRefs
 const { form } = toRefs(state);
-
 </script>
 <style lang="scss" scoped>
 .card.mb-8 {
diff --git a/src/components/model-hot-zone/model-hot-zone-content.vue b/src/components/model-hot-zone/model-hot-zone-content.vue
index c463f30a..63461036 100644
--- a/src/components/model-hot-zone/model-hot-zone-content.vue
+++ b/src/components/model-hot-zone/model-hot-zone-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="content">
         <el-form :model="form" label-width="70" class="m-h">
-            <card-container class="common-content-height">
+            <card-container>
                 <div class="mb-12">内容设置</div>
                 <el-form-item label="上传照片">
                     <upload v-model="form.img" :limit="1" is-tips tips-text="请先选择照片，图片宽度750px，高度不限" @update:model-value="update_upload_data"></upload>
diff --git a/src/components/model-nav-group/model-nav-group-content.vue b/src/components/model-nav-group/model-nav-group-content.vue
index 34cce2f5..43671a05 100644
--- a/src/components/model-nav-group/model-nav-group-content.vue
+++ b/src/components/model-nav-group/model-nav-group-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="auxiliary-line common-content-height">
         <el-form :model="form" label-width="70">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="导航样式">
                     <el-radio-group v-model="form.nav_style" class="ml-4">
@@ -32,7 +32,8 @@
                     </el-radio-group>
                 </el-form-item>
             </card-container>
-            <card-container class="mb-8">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">内容设置</div>
                 <div class="tips mt-10 mb-20 size-12">最多添加{{ form.nav_content_list.length }}张图片，建议尺寸90*90px</div>
                 <drag :data="form.nav_content_list" type="card" :space-col="27" @remove="remove" @on-sort="on_sort">
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 41e8974f..d6a03c4a 100644
--- a/src/components/model-nav-group/model-nav-group-styles.vue
+++ b/src/components/model-nav-group/model-nav-group-styles.vue
@@ -1,14 +1,15 @@
 <template>
     <div class="common-style-height">
         <el-form :model="form" label-width="80">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">图片样式</div>
                 <el-form-item label="圆角">
                     <radius :value="form" @update:value="radius_change"></radius>
                 </el-form-item>
             </card-container>
+            <div class="divider-line"></div>
             <template v-if="display_style_show">
-                <card-container class="mb-8">
+                <card-container>
                     <div class="mb-12">轮播设置</div>
                     <el-form-item label="自动轮播">
                         <el-switch v-model="form.is_roll" />
@@ -17,11 +18,13 @@
                         <slider v-model="form.interval_time" :max="100"></slider>
                     </el-form-item>
                 </card-container>
-                <card-container class="mb-8">
+                <div class="divider-line"></div>
+                <card-container>
                     <carousel-indicator :value="form"></carousel-indicator>
                 </card-container>
+                <div class="divider-line"></div>
             </template>
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">标题样式</div>
                 <el-form-item label="标题颜色">
                     <color-picker v-model="form.title_color" default-color="#000000"></color-picker>
@@ -31,6 +34,7 @@
                 </el-form-item>
             </card-container>
         </el-form>
+        <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_styles_update" />
     </div>
 </template>
@@ -64,34 +68,28 @@ const props = withDefaults(defineProps<Props>(), {
         color: '#DDDDDD',
         title_color: '#000',
         title_size: 12,
-        common_style: {}
+        common_style: {},
     }),
 });
 
 const state = reactive({
     form: props.value,
-    content: props.content
+    content: props.content,
 });
 // 如果需要解构，确保使用toRefs
 const { form } = toRefs(state);
 
 // 图片圆角
 const radius_change = (radius: nav_group_styles) => {
-    form.value = Object.assign(form.value, pick(radius, [
-        'radius',
-        'radius_top_left',
-        'radius_top_right',
-        'radius_bottom_left',
-        'radius_bottom_right',
-    ]));
-}
+    form.value = Object.assign(form.value, pick(radius, ['radius', 'radius_top_left', 'radius_top_right', 'radius_bottom_left', 'radius_bottom_right']));
+};
 // 通用样式处理
 const common_styles_update = (val: Object) => {
     form.value.common_style = val;
 };
 
 // 是否显示指示器设置
-const display_style_show = computed(() => { 
+const display_style_show = computed(() => {
     const { content } = toRefs(state);
     if (!isEmpty(content.value)) {
         return content.value.display_style == 'slide';
diff --git a/src/components/model-rich-text/model-rich-text-content.vue b/src/components/model-rich-text/model-rich-text-content.vue
index 822bde12..f637511f 100644
--- a/src/components/model-rich-text/model-rich-text-content.vue
+++ b/src/components/model-rich-text/model-rich-text-content.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="rich-text-content w">
-        <card-container class="common-content-height">
+        <card-container>
             <div class="mb-12">展示设置</div>
             <div class="br-c pr z-deep">
                 <!-- 工具栏 -->
diff --git a/src/components/model-shop-list/model-shop-list-content.vue b/src/components/model-shop-list/model-shop-list-content.vue
index 64dbac70..ca3fc050 100644
--- a/src/components/model-shop-list/model-shop-list-content.vue
+++ b/src/components/model-shop-list/model-shop-list-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="content">
         <el-form :model="form" label-width="70" class="m-h">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">列表设置</div>
                 <el-form-item label="选择风格">
                     <el-radio-group v-model="form.theme" @change="change_style">
@@ -9,49 +9,48 @@
                     </el-radio-group>
                 </el-form-item>
             </card-container>
-            <div class="content-height bg-f">
-                <card-container class="card-container-br">
-                    <div class="mb-12">商品设置</div>
-                    <el-form-item label="添加商品">
-                        <el-radio-group v-model="form.data_type">
-                            <el-radio v-for="item in base_list.product_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
+            <div class="divider-line"></div>
+            <card-container>
+                <div class="mb-12">商品设置</div>
+                <el-form-item label="添加商品">
+                    <el-radio-group v-model="form.data_type">
+                        <el-radio v-for="item in base_list.product_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <template v-if="form.data_type === '0'">
+                    <div class="nav-list">
+                        <drag-group :list="form.data_list" img-params="images" @onsort="goods_list_sort" @remove="goods_list_remove"></drag-group>
+                        <el-button class="mt-20 w" @click="add">+添加</el-button>
+                    </div>
+                </template>
+                <template v-else>
+                    <el-form-item label="商品分类">
+                        <el-select v-model="form.category" multiple collapse-tags placeholder="请选择商品分类">
+                            <el-option v-for="item in base_list.product_category_list" :key="item.id" :label="item.name" :value="item.id" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="指定品牌">
+                        <el-select v-model="form.data_ids" multiple collapse-tags placeholder="请选择品牌">
+                            <el-option v-for="item in base_list.product_brand_list" :key="item.id" :label="item.name" :value="item.id" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="显示数量">
+                        <el-input-number v-model="form.number" :min="1" :max="50" type="number" placeholder="请输入显示数量" value-on-clear="min" class="w number-show" controls-position="right"></el-input-number>
+                    </el-form-item>
+                    <el-form-item label="排序类型">
+                        <el-radio-group v-model="form.sort">
+                            <el-radio v-for="item in base_list.sort_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
                         </el-radio-group>
                     </el-form-item>
-                    <template v-if="form.data_type === '0'">
-                        <div class="nav-list">
-                            <drag-group :list="form.data_list" img-params="images" @onsort="goods_list_sort" @remove="goods_list_remove"></drag-group>
-                            <el-button class="mt-20 w" @click="add">+添加</el-button>
-                        </div>
-                    </template>
-                    <template v-else>
-                        <el-form-item label="商品分类">
-                            <el-select v-model="form.category" multiple collapse-tags placeholder="请选择商品分类">
-                                <el-option v-for="item in base_list.product_category_list" :key="item.id" :label="item.name" :value="item.id" />
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="指定品牌">
-                            <el-select v-model="form.data_ids" multiple collapse-tags placeholder="请选择品牌">
-                                <el-option v-for="item in base_list.product_brand_list" :key="item.id" :label="item.name" :value="item.id" />
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="显示数量">
-                            <el-input-number v-model="form.number" :min="1" :max="50" type="number" placeholder="请输入显示数量" value-on-clear="min" class="w number-show" controls-position="right"></el-input-number>
-                        </el-form-item>
-                        <el-form-item label="排序类型">
-                            <el-radio-group v-model="form.sort">
-                                <el-radio v-for="item in base_list.sort_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="排序规则">
-                            <el-radio-group v-model="form.sort_rules">
-                                <el-radio v-for="item in base_list.sort_rules_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                    </template>
-                </card-container>
-                <!-- 商品显示的配置信息 -->
-                <product-show-config :value="form" @change_shop_type="change_shop_type"></product-show-config>
-            </div>
+                    <el-form-item label="排序规则">
+                        <el-radio-group v-model="form.sort_rules">
+                            <el-radio v-for="item in base_list.sort_rules_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                </template>
+            </card-container>
+            <!-- 商品显示的配置信息 -->
+            <product-show-config :value="form" @change_shop_type="change_shop_type"></product-show-config>
             <url-value-dialog v-model:dialog-visible="url_value_dialog_visible" :type="['goods']" multiple @update:model-value="url_value_dialog_call_back"></url-value-dialog>
         </el-form>
     </div>
@@ -193,7 +192,7 @@ const change_style = (val: any): void => {
 const is_revise = ref(false);
 const change_shop_type = () => {
     is_revise.value = true;
-}
+};
 </script>
 <style lang="scss" scoped>
 .content {
diff --git a/src/components/model-shop-list/model-shop-list-styles.vue b/src/components/model-shop-list/model-shop-list-styles.vue
index bb181957..bbf2551a 100644
--- a/src/components/model-shop-list/model-shop-list-styles.vue
+++ b/src/components/model-shop-list/model-shop-list-styles.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="w">
         <el-form :model="form" label-width="70">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">商品样式</div>
                 <el-form-item label="商品名称">
                     <color-text-size-group v-model:color="form.shop_title_color" v-model:typeface="form.shop_title_typeface" v-model:size="form.shop_title_size" default-color="#000000"></color-text-size-group>
@@ -46,7 +46,8 @@
                     </template>
                 </template>
             </card-container>
-            <card-container class="mb-8">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">购物车按钮</div>
                 <el-form-item label="按钮颜色" class="topic">
                     <flex-gradients-create :color-list="form.shop_button_color" default-color="#FF3D53"></flex-gradients-create>
@@ -63,6 +64,7 @@
                 </template>
             </card-container>
         </el-form>
+        <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_style_update" />
     </div>
 </template>
diff --git a/src/components/model-shop-tabs/model-shop-tabs-content.vue b/src/components/model-shop-tabs/model-shop-tabs-content.vue
index eb663c9e..afebd8c7 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-content.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="content">
         <el-form :model="form" label-width="74" class="m-h">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="选项卡风格">
                     <el-radio-group v-model="form.tabs_theme" @change="tabs_theme_change">
@@ -17,7 +17,8 @@
                     </el-radio-group>
                 </el-form-item>
             </card-container>
-            <card-container class="content-height mb-8">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">选项卡设置</div>
                 <div class="nav-list">
                     <drag :data="form.tabs_list" type="card" icon-position="top" :space-col="20" @click="tabs_list_click" @remove="tabs_list_remove" @on-sort="tabs_list_sort">
diff --git a/src/components/model-shop-tabs/model-shop-tabs-styles.vue b/src/components/model-shop-tabs/model-shop-tabs-styles.vue
index 00499169..de51d66d 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-styles.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-styles.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="w">
         <el-form :model="form" label-width="70">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">选项卡样式</div>
                 <el-form-item label="选中装饰">
                     <mult-color-picker :value="form.tabs_checked" :type="form.tabs_direction" @update:value="tabs_checked_event"></mult-color-picker>
@@ -13,7 +13,8 @@
                     <color-text-size-group v-model:color="form.tabs_color" v-model:typeface="form.tabs_weight" v-model:size="form.tabs_size" default-color="rgba(51,51,51,1)"></color-text-size-group>
                 </el-form-item>
             </card-container>
-            <card-container class="mb-8">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">内容样式</div>
                 <el-form-item label="商品名称">
                     <color-text-size-group v-model:color="form.shop_title_color" v-model:typeface="form.shop_title_typeface" v-model:size="form.shop_title_size" default-color="#000000"></color-text-size-group>
@@ -58,7 +59,8 @@
                     <color-picker v-model="form.shop_score_color" default-color="#000000"></color-picker>
                 </el-form-item> -->
             </card-container>
-            <card-container class="mb-8">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">购物车按钮</div>
                 <el-form-item label="按钮颜色" class="topic">
                     <flex-gradients-create :color-list="form.shop_button_color" default-color="#2a94ff"></flex-gradients-create>
@@ -75,6 +77,7 @@
                 </template>
             </card-container>
         </el-form>
+        <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_style_update" />
     </div>
 </template>
diff --git a/src/components/model-tabs/model-tabs-content.vue b/src/components/model-tabs/model-tabs-content.vue
index 1eef3942..684c55a0 100644
--- a/src/components/model-tabs/model-tabs-content.vue
+++ b/src/components/model-tabs/model-tabs-content.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="common-content-height">
         <el-form :model="form" label-width="60">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="选择风格">
                     <el-radio-group v-model="form.tabs_theme" class="ml-4" @change="tabs_theme_change">
@@ -17,7 +17,8 @@
                     </el-radio-group>
                 </el-form-item>
             </card-container>
-            <card-container class="mb-8">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">选项卡设置</div>
                 <drag :data="form.tabs_list" type="card" :space-col="25" @remove="remove" @on-sort="on_sort">
                     <template #default="scoped">
diff --git a/src/components/model-tabs/model-tabs-styles.vue b/src/components/model-tabs/model-tabs-styles.vue
index 06e0e131..d7dc7335 100644
--- a/src/components/model-tabs/model-tabs-styles.vue
+++ b/src/components/model-tabs/model-tabs-styles.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="w">
         <el-form :model="form" label-width="74">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">选项卡样式</div>
                 <el-form-item label="选中装饰">
                     <mult-color-picker :value="form.tabs_checked" :type="form.tabs_direction" @update:value="tabs_checked_event"></mult-color-picker>
@@ -14,6 +14,7 @@
                 </el-form-item>
             </card-container>
         </el-form>
+        <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_styles_update" />
     </div>
 </template>
diff --git a/src/components/model-user-info/model-user-info-styles.vue b/src/components/model-user-info/model-user-info-styles.vue
index f8a98bc4..f4364a34 100644
--- a/src/components/model-user-info/model-user-info-styles.vue
+++ b/src/components/model-user-info/model-user-info-styles.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="styles">
         <el-form :model="form" label-width="70">
-            <card-container class="mb-8">
+            <card-container>
                 <div class="mb-12">头像设置</div>
                 <el-form-item label="头像大小">
                     <el-radio-group v-model="form.user_avatar_size">
@@ -11,7 +11,9 @@
                     </el-radio-group>
                 </el-form-item>
             </card-container>
-            <card-container class="mb-8">
+
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">人物名称</div>
                 <el-form-item label="色值">
                     <color-picker v-model="form.user_name_color"></color-picker>
@@ -25,7 +27,8 @@
                     <slider v-model="form.user_name_size"></slider>
                 </el-form-item>
             </card-container>
-            <card-container class="mb-8">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">ID设置</div>
                 <el-form-item label="底部背景">
                     <div class="flex-col gap-10 w">
@@ -45,7 +48,9 @@
                     <slider v-model="form.user_id_size"></slider>
                 </el-form-item>
             </card-container>
-            <card-container class="mb-8">
+
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">图标设置</div>
                 <el-form-item label="图标大小">
                     <el-radio-group v-model="form.img_size">
@@ -62,7 +67,8 @@
                     </el-radio-group>
                 </el-form-item>
             </card-container>
-            <card-container class="mb-8">
+            <div class="divider-line"></div>
+            <card-container>
                 <div class="mb-12">统计设置</div>
                 <el-form-item label="文字颜色">
                     <color-picker v-model="form.stats_name_color"></color-picker>
@@ -88,6 +94,7 @@
                 </el-form-item>
             </card-container>
         </el-form>
+        <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_styles_update" />
     </div>
 </template>