From 5e9afd00d87714f8546a4d3d5988e644abbf70d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 3 Sep 2024 16:58:24 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9A=84=E8=B7=9D=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/color-text-size-group/index.vue     | 2 +-
 .../custom-module/model-image/model-image-style.vue       | 4 ++--
 .../common/custom-module/model-text/model-text-style.vue  | 8 ++++----
 src/components/model-carousel/model-carousel-content.vue  | 4 ++--
 .../model-data-magic/components/tabs-content.vue          | 2 +-
 .../model-data-magic/components/tabs-styles.vue           | 2 +-
 .../model-float-window/model-float-window-content.vue     | 2 +-
 .../model-float-window/model-float-window-styles.vue      | 4 ++--
 .../model-nav-group/model-nav-group-content.vue           | 8 ++++----
 src/components/model-notice/model-notice-content.vue      | 8 ++++----
 src/components/model-seckill/model-seckill-content.vue    | 2 +-
 .../model-shop-list/model-shop-list-content.vue           | 2 +-
 .../model-shop-tabs/model-shop-tabs-content.vue           | 2 +-
 src/components/model-tabs/model-tabs-content.vue          | 6 +++---
 .../model-text-title/model-text-title-content.vue         | 4 ++--
 .../model-text-title/model-text-title-styles.vue          | 2 +-
 src/components/page-settings/page-content.vue             | 2 +-
 src/components/page-settings/page-styles.vue              | 6 +++---
 18 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/components/common/color-text-size-group/index.vue b/src/components/common/color-text-size-group/index.vue
index c385b9b1..75063f8a 100644
--- a/src/components/common/color-text-size-group/index.vue
+++ b/src/components/common/color-text-size-group/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="flex-col w h gap-10">
         <color-picker v-if="typeList.includes('color')" v-model="color" :default-color="props.defaultColor"></color-picker>
-        <el-radio-group v-if="typeList.includes('typeface')" v-model="typeface" class="ml-4">
+        <el-radio-group v-if="typeList.includes('typeface')" v-model="typeface">
             <el-radio v-for="item in font_weight" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
         </el-radio-group>
         <el-form-item v-if="typeList.includes('size')" label="字号" label-width="40" class="mb-0 w word-size">
diff --git a/src/components/common/custom-module/model-image/model-image-style.vue b/src/components/common/custom-module/model-image/model-image-style.vue
index b314b8e7..92757d5a 100644
--- a/src/components/common/custom-module/model-image/model-image-style.vue
+++ b/src/components/common/custom-module/model-image/model-image-style.vue
@@ -34,7 +34,7 @@
             <card-container class="h">
                 <div class="mb-12">边框设置</div>
                 <el-form-item label="边框显示">
-                    <el-radio-group v-model="form.border_show" class="ml-4">
+                    <el-radio-group v-model="form.border_show">
                         <el-radio :value="true">显示</el-radio>
                         <el-radio :value="false">隐藏</el-radio>
                     </el-radio-group>
@@ -44,7 +44,7 @@
                         <color-picker v-model="form.border_color" default-color="#FF3F3F"></color-picker>
                     </el-form-item>
                     <el-form-item label="边框样式">
-                        <el-radio-group v-model="form.border_style" class="ml-4">
+                        <el-radio-group v-model="form.border_style">
                             <el-radio value="dashed"><div class="border-style-item" style="border: 1px dashed #979797"></div></el-radio>
                             <el-radio value="solid"><div class="border-style-item" style="border: 1px solid #979797"></div></el-radio>
                             <el-radio value="dotted"><div class="border-style-item" style="border: 1px dotted #979797"></div></el-radio>
diff --git a/src/components/common/custom-module/model-text/model-text-style.vue b/src/components/common/custom-module/model-text/model-text-style.vue
index cd2d0260..682e6b44 100644
--- a/src/components/common/custom-module/model-text/model-text-style.vue
+++ b/src/components/common/custom-module/model-text/model-text-style.vue
@@ -24,7 +24,7 @@
                     <color-picker v-model="form.text_color" default-color="#FF3F3F"></color-picker>
                 </el-form-item>
                 <el-form-item label="文字大小">
-                    <el-radio-group v-model="form.text_weight" class="ml-4">
+                    <el-radio-group v-model="form.text_weight">
                         <el-radio value="500">加粗</el-radio>
                         <el-radio value="normal">正常</el-radio>
                         <el-radio value="italic">倾斜</el-radio>
@@ -34,7 +34,7 @@
                     </el-form-item>
                 </el-form-item>
                 <el-form-item label="字符选项">
-                    <el-radio-group v-model="form.text_option" class="ml-4">
+                    <el-radio-group v-model="form.text_option">
                         <el-radio value="none"><span style="text-decoration: none">Aa</span></el-radio>
                         <el-radio value="underline"><span style="text-decoration: underline">Aa</span></el-radio>
                         <el-radio value="line-through"><span style="text-decoration: line-through">Aa</span></el-radio>
@@ -83,7 +83,7 @@
             <card-container>
                 <div class="mb-12">边框设置</div>
                 <el-form-item label="边框显示">
-                    <el-radio-group v-model="form.border_show" class="ml-4">
+                    <el-radio-group v-model="form.border_show">
                         <el-radio :value="true">显示</el-radio>
                         <el-radio :value="false">隐藏</el-radio>
                     </el-radio-group>
@@ -93,7 +93,7 @@
                         <color-picker v-model="form.border_color" default-color="#FF3F3F"></color-picker>
                     </el-form-item>
                     <el-form-item label="边框样式">
-                        <el-radio-group v-model="form.border_style" class="ml-4">
+                        <el-radio-group v-model="form.border_style">
                             <el-radio value="dashed"><div class="border-style-item" style="border: 1px dashed #979797"></div></el-radio>
                             <el-radio value="solid"><div class="border-style-item" style="border: 1px solid #979797"></div></el-radio>
                             <el-radio value="dotted"><div class="border-style-item" style="border: 1px dotted #979797"></div></el-radio>
diff --git a/src/components/model-carousel/model-carousel-content.vue b/src/components/model-carousel/model-carousel-content.vue
index 3129142b..a3f449dd 100644
--- a/src/components/model-carousel/model-carousel-content.vue
+++ b/src/components/model-carousel/model-carousel-content.vue
@@ -4,13 +4,13 @@
             <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="样式设置">
-                    <el-radio-group v-model="form.carousel_type" class="ml-4">
+                    <el-radio-group v-model="form.carousel_type">
                         <el-radio value="inherit">样式一</el-radio>
                         <el-radio value="card">样式二</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="图片设置">
-                    <el-radio-group v-model="form.img_fit" class="ml-4">
+                    <el-radio-group v-model="form.img_fit">
                         <el-radio value="contain">等比缩放</el-radio>
                         <el-radio value="inherit">铺满</el-radio>
                         <el-radio value="cover">等比剪切</el-radio>
diff --git a/src/components/model-data-magic/components/tabs-content.vue b/src/components/model-data-magic/components/tabs-content.vue
index 55c966f7..4610b86d 100644
--- a/src/components/model-data-magic/components/tabs-content.vue
+++ b/src/components/model-data-magic/components/tabs-content.vue
@@ -1,7 +1,7 @@
 <template>
     <card-container class="mb-8">
         <el-form-item label="数据类型">
-            <el-radio-group v-model="form.data_type" class="ml-4">
+            <el-radio-group v-model="form.data_type">
                 <el-radio value="goods">商品</el-radio>
                 <el-radio value="images">图片</el-radio>
             </el-radio-group>
diff --git a/src/components/model-data-magic/components/tabs-styles.vue b/src/components/model-data-magic/components/tabs-styles.vue
index ece9e257..a1f46007 100644
--- a/src/components/model-data-magic/components/tabs-styles.vue
+++ b/src/components/model-data-magic/components/tabs-styles.vue
@@ -25,7 +25,7 @@
             <el-switch v-model="form.is_roll" />
         </el-form-item>
         <el-form-item label="轮播方向">
-            <el-radio-group v-model="form.rotation_direction" class="ml-4">
+            <el-radio-group v-model="form.rotation_direction">
                 <el-radio value="horizontal">横向</el-radio>
                 <el-radio value="vertical">纵向</el-radio>
             </el-radio-group>
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 7c328f5f..9e07bdc0 100644
--- a/src/components/model-float-window/model-float-window-content.vue
+++ b/src/components/model-float-window/model-float-window-content.vue
@@ -4,7 +4,7 @@
             <card-container>
                 <div class="mb-12">按钮设置</div>
                 <el-form-item label="按钮跳转">
-                    <el-radio-group v-model="form.button_jump" class="ml-4">
+                    <el-radio-group v-model="form.button_jump">
                         <el-radio value="link">页面链接</el-radio>
                         <el-radio value="customer_service">客服入口</el-radio>
                     </el-radio-group>
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 0fa82784..0cee3aaf 100644
--- a/src/components/model-float-window/model-float-window-styles.vue
+++ b/src/components/model-float-window/model-float-window-styles.vue
@@ -4,7 +4,7 @@
             <card-container>
                 <div class="mb-12">位置设置</div>
                 <el-form-item label="展示位置">
-                    <el-radio-group v-model="form.display_location" class="ml-4">
+                    <el-radio-group v-model="form.display_location">
                         <el-radio value="left">左</el-radio>
                         <el-radio value="right">右</el-radio>
                     </el-radio-group>
@@ -13,7 +13,7 @@
                     <slider v-model="form.offset_number" :max="1000"></slider>
                 </el-form-item>
                 <el-form-item label="风格">
-                    <el-radio-group v-model="form.float_style" class="ml-4">
+                    <el-radio-group v-model="form.float_style">
                         <el-radio value="diffuse">扩散</el-radio>
                         <el-radio value="shadow">阴影</el-radio>
                     </el-radio-group>
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 83881069..b936cd70 100644
--- a/src/components/model-nav-group/model-nav-group-content.vue
+++ b/src/components/model-nav-group/model-nav-group-content.vue
@@ -4,27 +4,27 @@
             <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="导航样式">
-                    <el-radio-group v-model="form.nav_style" class="ml-4">
+                    <el-radio-group v-model="form.nav_style">
                         <el-radio value="image_with_text">图片加文字</el-radio>
                         <el-radio value="image">图片</el-radio>
                         <el-radio value="text">文字</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="单行显示">
-                    <el-radio-group v-model="form.single_line" class="ml-4">
+                    <el-radio-group v-model="form.single_line">
                         <el-radio :value="3">3个</el-radio>
                         <el-radio :value="4">4个</el-radio>
                         <el-radio :value="5">5个</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="展示样式">
-                    <el-radio-group v-model="form.display_style" class="ml-4">
+                    <el-radio-group v-model="form.display_style">
                         <el-radio value="fixed">固定显示</el-radio>
                         <el-radio value="slide">分页滑动</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="form.display_style === 'slide'" label="显示行数">
-                    <el-radio-group v-model="form.row" class="ml-4">
+                    <el-radio-group v-model="form.row">
                         <el-radio :value="1">1行</el-radio>
                         <el-radio :value="2">2行</el-radio>
                         <el-radio :value="3">3行</el-radio>
diff --git a/src/components/model-notice/model-notice-content.vue b/src/components/model-notice/model-notice-content.vue
index 0db4b1de..031af8ca 100644
--- a/src/components/model-notice/model-notice-content.vue
+++ b/src/components/model-notice/model-notice-content.vue
@@ -4,7 +4,7 @@
             <card-container>
                 <div class="mb-12">展示设置</div>
                 <el-form-item label="选择风格">
-                    <el-radio-group v-model="form.notice_style" class="ml-4">
+                    <el-radio-group v-model="form.notice_style">
                         <el-radio value="inherit">样式一</el-radio>
                         <el-radio value="card">样式二</el-radio>
                     </el-radio-group>
@@ -14,7 +14,7 @@
             <card-container>
                 <div class="mb-12">公告风格</div>
                 <el-form-item label="标题类型">
-                    <el-radio-group v-model="form.title_type" class="ml-4">
+                    <el-radio-group v-model="form.title_type">
                         <el-radio value="img-icon">图片/图标</el-radio>
                         <el-radio value="text">文字</el-radio>
                     </el-radio-group>
@@ -27,7 +27,7 @@
                 </el-form-item>
                 <template v-if="!is_card">
                     <el-form-item label="滚动方式">
-                        <el-radio-group v-model="form.direction" class="ml-4">
+                        <el-radio-group v-model="form.direction">
                             <el-radio value="vertical">上下滚动</el-radio>
                             <el-radio value="horizontal">左右滚动</el-radio>
                         </el-radio-group>
@@ -41,7 +41,7 @@
             <card-container>
                 <div class="mb-12">按钮设置</div>
                 <el-form-item label="右侧按钮">
-                    <el-radio-group v-model="form.is_right_button" class="ml-4">
+                    <el-radio-group v-model="form.is_right_button">
                         <el-radio value="show">显示</el-radio>
                         <el-radio value="hidden">隐藏</el-radio>
                     </el-radio-group>
diff --git a/src/components/model-seckill/model-seckill-content.vue b/src/components/model-seckill/model-seckill-content.vue
index 391604c2..7e7f1985 100644
--- a/src/components/model-seckill/model-seckill-content.vue
+++ b/src/components/model-seckill/model-seckill-content.vue
@@ -50,7 +50,7 @@
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="form.shop_style_type == '3'" label="单行显示">
-                    <el-radio-group v-model="form.single_line_number" class="ml-4">
+                    <el-radio-group v-model="form.single_line_number">
                         <el-radio :value="1">1个</el-radio>
                         <el-radio :value="2">2个</el-radio>
                         <el-radio :value="3">3个</el-radio>
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 7f73ee10..36f73bf1 100644
--- a/src/components/model-shop-list/model-shop-list-content.vue
+++ b/src/components/model-shop-list/model-shop-list-content.vue
@@ -9,7 +9,7 @@
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="form.theme == '5'" label="轮播列数">
-                    <el-radio-group v-model="form.carousel_col" class="ml-4">
+                    <el-radio-group v-model="form.carousel_col">
                         <el-radio :value="1">1个</el-radio>
                         <el-radio :value="2">2个</el-radio>
                         <el-radio :value="3">3个</el-radio>
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 3fba7ff1..41ea5857 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-content.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-content.vue
@@ -17,7 +17,7 @@
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="form.theme == '5'" label="轮播列数">
-                    <el-radio-group v-model="form.carousel_col" class="ml-4">
+                    <el-radio-group v-model="form.carousel_col">
                         <el-radio :value="1">1个</el-radio>
                         <el-radio :value="2">2个</el-radio>
                         <el-radio :value="3">3个</el-radio>
diff --git a/src/components/model-tabs/model-tabs-content.vue b/src/components/model-tabs/model-tabs-content.vue
index 684c55a0..aa1045f7 100644
--- a/src/components/model-tabs/model-tabs-content.vue
+++ b/src/components/model-tabs/model-tabs-content.vue
@@ -4,14 +4,14 @@
             <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">
+                    <el-radio-group v-model="form.tabs_theme" @change="tabs_theme_change">
                         <el-radio value="0">样式一</el-radio>
                         <el-radio value="2">样式二</el-radio>
                         <el-radio value="3">样式三</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="滑动置顶">
-                    <el-radio-group v-model="form.tabs_top_up" class="ml-4">
+                    <el-radio-group v-model="form.tabs_top_up">
                         <el-radio :value="true">启用</el-radio>
                         <el-radio :value="false">不启用</el-radio>
                     </el-radio-group>
@@ -27,7 +27,7 @@
                                 <el-input v-model="scoped.row.title" placeholder="请输入标题文字" />
                             </el-form-item>
                             <el-form-item label="数据类型" class="w mb-0">
-                                <el-radio-group v-model="scoped.row.data_type" class="ml-4">
+                                <el-radio-group v-model="scoped.row.data_type">
                                     <el-radio value="micro_page">微页面</el-radio>
                                     <el-radio value="category">选择分类</el-radio>
                                 </el-radio-group>
diff --git a/src/components/model-text-title/model-text-title-content.vue b/src/components/model-text-title/model-text-title-content.vue
index 14bd3bdf..c5023d98 100644
--- a/src/components/model-text-title/model-text-title-content.vue
+++ b/src/components/model-text-title/model-text-title-content.vue
@@ -14,7 +14,7 @@
             <card-container>
                 <div class="mb-12">关键字设置</div>
                 <el-form-item label="关键字">
-                    <el-radio-group v-model="form.keyword_show" class="ml-4">
+                    <el-radio-group v-model="form.keyword_show">
                         <el-radio :value="true">显示</el-radio>
                         <el-radio :value="false">隐藏</el-radio>
                     </el-radio-group>
@@ -42,7 +42,7 @@
             <card-container>
                 <div class="mb-12">更多设置</div>
                 <el-form-item label="右侧按钮">
-                    <el-radio-group v-model="form.right_show" class="ml-4">
+                    <el-radio-group v-model="form.right_show">
                         <el-radio :value="true">显示</el-radio>
                         <el-radio :value="false">隐藏</el-radio>
                     </el-radio-group>
diff --git a/src/components/model-text-title/model-text-title-styles.vue b/src/components/model-text-title/model-text-title-styles.vue
index 12c1f139..911865a1 100644
--- a/src/components/model-text-title/model-text-title-styles.vue
+++ b/src/components/model-text-title/model-text-title-styles.vue
@@ -7,7 +7,7 @@
                     <color-picker v-model="form.title_color" default-color="#000000"></color-picker>
                 </el-form-item>
                 <el-form-item label="标题文字">
-                    <el-radio-group v-model="form.title_weight" class="ml-4">
+                    <el-radio-group v-model="form.title_weight">
                         <el-radio value="500">加粗</el-radio>
                         <el-radio value="normal">正常</el-radio>
                         <el-radio value="italic">倾斜</el-radio>
diff --git a/src/components/page-settings/page-content.vue b/src/components/page-settings/page-content.vue
index a378dd67..5f1e9bed 100644
--- a/src/components/page-settings/page-content.vue
+++ b/src/components/page-settings/page-content.vue
@@ -59,7 +59,7 @@
             </template>
             <card-container>
                 <el-form-item label="底部导航">
-                    <el-radio-group v-model="form.bottom_navigation_show" class="ml-4">
+                    <el-radio-group v-model="form.bottom_navigation_show">
                         <el-radio v-for="item in base_list.bottom_navigation" :key="item.value" :value="item.value">{{item.name }}</el-radio>
                     </el-radio-group>
                 </el-form-item>
diff --git a/src/components/page-settings/page-styles.vue b/src/components/page-settings/page-styles.vue
index 9eafbb1d..ce49f086 100644
--- a/src/components/page-settings/page-styles.vue
+++ b/src/components/page-settings/page-styles.vue
@@ -36,19 +36,19 @@
                     </div>
                 </el-form-item>
                 <el-form-item label="功能按钮">
-                    <el-radio-group v-model="form.function_buttons_type" class="ml-4">
+                    <el-radio-group v-model="form.function_buttons_type">
                         <el-radio value="black">黑色</el-radio>
                         <el-radio value="white">白色</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="沉浸样式">
-                    <el-radio-group v-model="form.immersive_style" class="ml-4">
+                    <el-radio-group v-model="form.immersive_style">
                         <el-radio :value="true">开启</el-radio>
                         <el-radio :value="false">关闭</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="上滑展示">
-                    <el-radio-group v-model="form.up_slide_display" class="ml-4">
+                    <el-radio-group v-model="form.up_slide_display">
                         <el-radio :value="true">保留</el-radio>
                         <el-radio :value="false">关闭</el-radio>
                     </el-radio-group>

From d6c1042cfde0236dbbd5246369396e1d3f5ac919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 3 Sep 2024 18:26:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=92=E6=9D=80?=
 =?UTF-8?q?=E7=9A=84=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        | 145 +++++++++++++-
 .../model-seckill/model-seckill-setting.vue   |  10 +
 .../model-seckill/model-seckill-styles.vue    | 179 ++++++++++--------
 src/components/model-shop-list/index.vue      |   1 -
 .../layout/components/main/default/seckill.ts |  14 ++
 5 files changed, 268 insertions(+), 81 deletions(-)

diff --git a/src/components/model-seckill/index.vue b/src/components/model-seckill/index.vue
index 4593f88f..eb22117e 100644
--- a/src/components/model-seckill/index.vue
+++ b/src/components/model-seckill/index.vue
@@ -9,7 +9,7 @@
                     </div>
                     <div v-if="form.theme == '1'" class="pl-6 pr-6 cr-f">|</div>
                     <div class="flex-row align-c gap-4">
-                        <span v-if="form.theme != '4'" class="size-10" :style="`color: ${ new_style.end_text_color }`">距离结束</span>
+                        <span class="size-10" :style="`color: ${ new_style.end_text_color }`">距离结束</span>
                         <div class="flex-row gap-3 jc-c align-c" :style="[form.theme == '4'? `${ time_bg };padding: 0.3rem 0.4rem;border-radius: 1.1rem;` : '']">
                         <img v-if="form.theme == '4'" class="seckill-head-icon radius-xs" :src="url_computer('time')" />
                         <template v-for="(item, index) in time_config" :key="item.key">
@@ -30,11 +30,27 @@
                     <el-icon class="iconfont icon-arrow-right" :color="new_style.head_button_color"></el-icon>
                 </div>
             </div>
+            <div class="flex flex-wrap" :style="`gap: ${ content_outer_spacing }px;`">
+                <div v-for="(item, index) in list" :key="index" :class="layout_type" :style="`${ content_radius }; ${ content_padding }`">
+                    <template v-if="!isEmpty(item)">
+                        <template v-if="!isEmpty(item.new_cover)">
+                            <image-empty v-model="item.new_cover[0]" :class="`flex-img${shop_style_type}`" :style="content_img_radius"></image-empty>
+                        </template>
+                        <template v-else>
+                            <image-empty v-model="item.images" :class="`flex-img${shop_style_type}`" :style="content_img_radius"></image-empty>
+                        </template>
+                    </template>
+                    <div class="flex-col gap-10">
+
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </template>
 <script setup lang="ts">
-import { background_computer, common_styles_computer, gradient_computer } from '@/utils';
+import { background_computer, common_styles_computer, gradient_computer, padding_computer, radius_computer } from '@/utils';
+import { isEmpty } from 'lodash';
 
 const props = defineProps({
     value: {
@@ -74,6 +90,106 @@ const seckill_head_style = computed(() => {
 });
 
 const style = computed(() => common_styles_computer(props.value.style.common_style));
+interface plugins_icon_data {
+    name: string;
+    bg_color: string;
+    br_color: string;
+    color: string;
+    url: string;
+}
+interface data_list {
+    title: string;
+    images: string;
+    new_cover: string[];
+    min_original_price: string;
+    show_original_price_symbol: string;
+    show_original_price_unit: string;
+    min_price: string;
+    show_price_symbol: string;
+    show_price_unit: string;
+    sales_count: string;
+    plugins_view_icon_data: plugins_icon_data[];
+}
+const default_list = {
+    title: '测试商品标题',
+    min_original_price: '41.2',
+    show_original_price_symbol: '￥',
+    show_original_price_unit: '/ 台',
+    min_price: '51',
+    show_price_symbol: '￥',
+    show_price_unit: '/ 台',
+    sales_count: '1000',
+    images: '',
+    new_cover: [],
+    plugins_view_icon_data: [
+        {
+            name: '满减活动',
+            bg_color: '#EA3323',
+            br_color: '',
+            color: '#fff',
+            url: '',
+        },
+        {
+            name: '包邮',
+            bg_color: '',
+            br_color: '#EA3323',
+            color: '#EA3323',
+            url: '',
+        },
+        {
+            name: '领劵',
+            bg_color: '',
+            br_color: '#EA9223',
+            color: '#EA9223',
+            url: '',
+        },
+    ],
+};
+const list = ref<data_list[]>([]);
+onBeforeMount(() => {
+    list.value = Array(4).fill(default_list);
+})
+// 商品间距
+const content_outer_spacing = computed(() => new_style.value.content_outer_spacing);
+// 圆角设置
+const content_radius = computed(() => radius_computer(new_style.value.shop_radius));
+// 选择的风格
+const shop_style_type = computed(() => form.value.shop_style_type);
+// 内边距设置
+const content_padding = computed(() => padding_computer(new_style.value.shop_padding));
+// 不同风格下的样式
+const layout_type = computed(() => {
+    let class_type = '';
+    switch (shop_style_type.value) {
+        case '1':
+            class_type = `flex-row bg-f oh multicolumn-columns`;
+            break;
+        case '2':
+            class_type = `flex-col bg-f oh multicolumn-columns`;
+            break;
+        case '3':
+            class_type = `flex-col bg-f oh multicolumn-columns`;
+            break;
+        default:
+            break;
+    }
+    return class_type;
+});
+// 不换行显示
+const multicolumn_columns_width = computed(() => {
+    const { single_line_number } = toRefs(form.value);
+    let model_number = single_line_number.value;
+    if (shop_style_type.value == '1') {
+        model_number = 1;
+    } else if (shop_style_type.value == '2') {
+        model_number = 2;
+    }
+    // 计算间隔的空间。(gap * gap数量) / 模块数量
+    let gap = (new_style.value.content_outer_spacing * (model_number - 1)) / model_number;
+    return `calc(${100 / model_number}% - ${gap}px)`;
+});
+// 图片圆角设置
+const content_img_radius = computed(() => radius_computer(new_style.value.shop_img_radius));
 
 const url_computer = (name: string) => {
     const new_url = ref(new URL(`../../assets/images/components/model-seckill/${name}.png`, import.meta.url).href).value;
@@ -81,6 +197,12 @@ const url_computer = (name: string) => {
 };
 </script>
 <style lang="scss" scoped>
+:deep(.el-image) {
+    .image-slot img {
+        width: 5rem;
+        height: 5rem;
+    }
+}
 .seckill-head {
     padding: 1.5rem 1.3rem;
     width: 100%;
@@ -103,4 +225,23 @@ const url_computer = (name: string) => {
     position: relative;
     top: -0.1rem;
 }
+.multicolumn-columns {
+    height: 100%;
+    width: v-bind(multicolumn_columns_width);
+    min-width: v-bind(multicolumn_columns_width);
+}
+.flex-img1 {
+    height: auto;
+    min-height: 11rem;
+    max-height: 12rem;
+    width: 11rem;
+}
+.flex-img2 {
+    width: 100%;
+    height: 18rem;
+}
+.flex-img3 {
+    width: 100%;
+    min-height: 10.4rem;
+}
 </style>
diff --git a/src/components/model-seckill/model-seckill-setting.vue b/src/components/model-seckill/model-seckill-setting.vue
index 34b5af3a..39c0ab75 100644
--- a/src/components/model-seckill/model-seckill-setting.vue
+++ b/src/components/model-seckill/model-seckill-setting.vue
@@ -62,6 +62,16 @@ onBeforeMount(async () => {
                 radius_bottom_left: 4,
                 radius_bottom_right: 4,
             },
+            shop_padding: {
+                padding: 10, 
+                padding_top: 10, 
+                padding_bottom: 10, 
+                padding_left: 10, 
+                padding_right: 10,
+            },
+            content_outer_spacing: 10, // 商品间距
+            content_spacing: 10,
+            content_outer_height: 232,
             shop_title_color: '',
             shop_title_typeface: '',
             shop_title_size: 12,
diff --git a/src/components/model-seckill/model-seckill-styles.vue b/src/components/model-seckill/model-seckill-styles.vue
index b22abdb6..522b1535 100644
--- a/src/components/model-seckill/model-seckill-styles.vue
+++ b/src/components/model-seckill/model-seckill-styles.vue
@@ -1,51 +1,53 @@
 <template>
     <div class="w">
         <el-form :model="form" label-width="70">
-            <card-container>
-                <div class="mb-12">头部样式</div>
-                <el-form-item label="标题设置">
-                    <color-text-size-group v-model:color="form.topic_color" v-model:size="form.topic_size" :type-list="['color', 'size']"></color-text-size-group>
-                </el-form-item>
-                <el-form-item label="按钮设置">
-                    <color-text-size-group v-model:color="form.head_button_color" v-model:size="form.head_button_size" :type-list="['color', 'size']"></color-text-size-group>
-                </el-form-item>
-                <el-form-item v-if="data.theme != '4'" label="距离结束">
-                    <color-picker v-model="form.end_text_color"></color-picker>
-                </el-form-item>
-                <el-form-item label="数字背景">
-                    <mult-color-picker :value="form.countdown_bg_color_list" :type="form.countdown_direction" @update:value="countdown_color_picker_event"></mult-color-picker>
-                </el-form-item>
-                <el-form-item label="数字">
-                    <color-picker v-model="form.countdown_color"></color-picker>
-                </el-form-item>
-                <el-form-item label="顶部背景">
-                    <div class="flex-col gap-10">
-                        <mult-color-picker :value="form.header_background_color_list" :type="form.header_background_direction" @update:value="mult_color_picker_event"></mult-color-picker>
-                        <div class="flex-row jc-sb align-c">
-                            <div class="size-12">背景图</div>
-                            <el-radio-group v-model="form.header_background_img_style" is-button>
-                                <el-tooltip content="单张" placement="top" effect="light">
-                                    <el-radio-button value="0">
-                                        <icon name="single-sheet"></icon>
-                                    </el-radio-button>
-                                </el-tooltip>
-                                <el-tooltip content="平铺" placement="top" effect="light">
-                                    <el-radio-button value="1">
-                                        <icon name="tile"></icon>
-                                    </el-radio-button>
-                                </el-tooltip>
-                                <el-tooltip content="铺满" placement="top" effect="light">
-                                    <el-radio-button value="2">
-                                        <icon name="spread-over"></icon>
-                                    </el-radio-button>
-                                </el-tooltip>
-                            </el-radio-group>
+            <template v-if="form.head_state == '1'">
+                <card-container>
+                    <div class="mb-12">头部样式</div>
+                    <el-form-item v-if="form.topic_type == 'text'" label="标题设置">
+                        <color-text-size-group v-model:color="form.topic_color" v-model:size="form.topic_size" :default-color="clone_form.topic_color" :type-list="['color', 'size']"></color-text-size-group>
+                    </el-form-item>
+                    <el-form-item v-if="form.button_status == '1'" label="按钮设置">
+                        <color-text-size-group v-model:color="form.head_button_color" v-model:size="form.head_button_size" :default-color="clone_form.head_button_color" :type-list="['color', 'size']"></color-text-size-group>
+                    </el-form-item>
+                    <el-form-item label="秒杀提示">
+                        <color-picker v-model="form.end_text_color" :default-color="clone_form.end_text_color"></color-picker>
+                    </el-form-item>
+                    <el-form-item label="数字背景">
+                        <mult-color-picker :value="form.countdown_bg_color_list" :type="form.countdown_direction" @update:value="countdown_color_picker_event"></mult-color-picker>
+                    </el-form-item>
+                    <el-form-item label="数字">
+                        <color-picker v-model="form.countdown_color" :default-color="clone_form.countdown_color"></color-picker>
+                    </el-form-item>
+                    <el-form-item label="顶部背景">
+                        <div class="flex-col gap-10">
+                            <mult-color-picker :value="form.header_background_color_list" :type="form.header_background_direction" @update:value="mult_color_picker_event"></mult-color-picker>
+                            <div class="flex-row jc-sb align-c">
+                                <div class="size-12">背景图</div>
+                                <el-radio-group v-model="form.header_background_img_style" is-button>
+                                    <el-tooltip content="单张" placement="top" effect="light">
+                                        <el-radio-button value="0">
+                                            <icon name="single-sheet"></icon>
+                                        </el-radio-button>
+                                    </el-tooltip>
+                                    <el-tooltip content="平铺" placement="top" effect="light">
+                                        <el-radio-button value="1">
+                                            <icon name="tile"></icon>
+                                        </el-radio-button>
+                                    </el-tooltip>
+                                    <el-tooltip content="铺满" placement="top" effect="light">
+                                        <el-radio-button value="2">
+                                            <icon name="spread-over"></icon>
+                                        </el-radio-button>
+                                    </el-tooltip>
+                                </el-radio-group>
+                            </div>
+                            <upload v-model="form.header_background_img_url" :limit="1"></upload>
                         </div>
-                        <upload v-model="form.header_background_img_url" :limit="1"></upload>
-                    </div>
-                </el-form-item>
-            </card-container>
-            <div class="divider-line"></div>
+                    </el-form-item>
+                </card-container>
+                <div class="divider-line"></div>
+            </template>
             <card-container>
                 <div class="mb-12">商品样式</div>
                 <el-form-item label="内容圆角">
@@ -63,6 +65,20 @@
                 <el-form-item label="原价价格">
                     <color-picker v-model="form.original_price_color"></color-picker>
                 </el-form-item>
+                <el-form-item label="内间距">
+                    <padding :value="form.shop_padding"></padding>
+                </el-form-item>
+                <el-form-item v-if="form.shop_style_type == '1'" label="内容间距">
+                    <slider v-model="form.content_spacing" :max="100"></slider>
+                </el-form-item>
+                <el-form-item label="商品间距">
+                    <slider v-model="form.content_outer_spacing" :max="100"></slider>
+                </el-form-item>
+                <template v-if="form.shop_style_type == '3'">
+                    <el-form-item label="内容高度">
+                        <slider v-model="form.content_outer_height" :max="1000"></slider>
+                    </el-form-item>
+                </template>
                 <el-form-item label="秒杀角标">
                     <div class="flex-col gap-10">
                         <el-radio-group v-model="form.seckill_subscript_location">
@@ -77,46 +93,51 @@
                     </div>
                 </el-form-item>
             </card-container>
-            <div class="divider-line"></div>
-            <card-container>
-                <div class="mb-12">进度条设置</div>
-                <el-form-item label="背景色">
-                    <color-picker v-model="form.progress_bg_color"></color-picker>
-                </el-form-item>
-                <el-form-item label="选中色">
-                    <mult-color-picker :value="form.progress_actived_color_list" :type="form.progress_actived_direction" @update:value="progress_color_picker_event"></mult-color-picker>
-                </el-form-item>
-                <el-form-item label="按钮背景">
-                    <color-picker v-model="form.progress_button_color"></color-picker>
-                </el-form-item>
-                <el-form-item label="图标颜色">
-                    <color-picker v-model="form.progress_button_icon_color"></color-picker>
-                </el-form-item>
-                <el-form-item label="文字颜色">
-                    <color-picker v-model="form.progress_text_color"></color-picker>
-                </el-form-item>
-            </card-container>
-            <div class="divider-line"></div>
-            <card-container>
-                <div class="mb-12">轮播设置</div>
-                <el-form-item label="自动轮播">
-                    <el-switch v-model="form.is_roll" />
-                </el-form-item>
-                <el-form-item label="间隔时间">
-                    <slider v-model="form.interval_time" :min="1" :max="100"></slider>
-                </el-form-item>
-                <el-form-item label="滚动方式">
-                    <el-radio-group v-model="form.rolling_fashion">
-                        <el-radio v-for="item in base_list.rolling_fashion_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </card-container>
+            <template v-if="form.shop_style_type == '1'">
+                <div class="divider-line"></div>
+                <card-container>
+                    <div class="mb-12">进度条设置</div>
+                    <el-form-item label="背景色">
+                        <color-picker v-model="form.progress_bg_color"></color-picker>
+                    </el-form-item>
+                    <el-form-item label="选中色">
+                        <mult-color-picker :value="form.progress_actived_color_list" :type="form.progress_actived_direction" @update:value="progress_color_picker_event"></mult-color-picker>
+                    </el-form-item>
+                    <el-form-item label="按钮背景">
+                        <color-picker v-model="form.progress_button_color"></color-picker>
+                    </el-form-item>
+                    <el-form-item label="图标颜色">
+                        <color-picker v-model="form.progress_button_icon_color"></color-picker>
+                    </el-form-item>
+                    <el-form-item label="文字颜色">
+                        <color-picker v-model="form.progress_text_color"></color-picker>
+                    </el-form-item>
+                </card-container>
+            </template>
+            <template v-if="form.shop_style_type == '3'">
+                <div class="divider-line"></div>
+                <card-container>
+                    <div class="mb-12">轮播设置</div>
+                    <el-form-item label="自动轮播">
+                        <el-switch v-model="form.is_roll" />
+                    </el-form-item>
+                    <el-form-item label="间隔时间">
+                        <slider v-model="form.interval_time" :min="1" :max="100"></slider>
+                    </el-form-item>
+                    <el-form-item label="滚动方式">
+                        <el-radio-group v-model="form.rolling_fashion">
+                            <el-radio v-for="item in base_list.rolling_fashion_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                </card-container>
+            </template>
         </el-form>
         <div class="divider-line"></div>
         <common-styles :value="form.common_style" @update:value="common_style_update" />
     </div>
 </template>
 <script setup lang="ts">
+import { cloneDeep } from 'lodash';
 const props = defineProps({
     value: {
         type: Object,
@@ -136,6 +157,8 @@ const state = reactive({
 // 如果需要解构，确保使用toRefs
 const { form, data } = toRefs(state);
 
+let clone_form = cloneDeep(props.value);
+
 const base_list = {
     location_list: [
         { name: '左上', value: 'left-top' },
diff --git a/src/components/model-shop-list/index.vue b/src/components/model-shop-list/index.vue
index f21f0d5b..4a062992 100644
--- a/src/components/model-shop-list/index.vue
+++ b/src/components/model-shop-list/index.vue
@@ -168,7 +168,6 @@ const props = defineProps({
 const form = computed(() => props.value?.content || {});
 const new_style = computed(() => props.value?.style || {});
 
-// 目前显示假数据，日后通过分类或者选择的商品来显示真实数据
 interface plugins_icon_data {
     name: string;
     bg_color: string;
diff --git a/src/views/layout/components/main/default/seckill.ts b/src/views/layout/components/main/default/seckill.ts
index 891c3779..0a46c59d 100644
--- a/src/views/layout/components/main/default/seckill.ts
+++ b/src/views/layout/components/main/default/seckill.ts
@@ -33,6 +33,10 @@ interface DefaultSeckill {
         header_background_img_url: uploadList[];
         shop_radius: radiusStyle;
         shop_img_radius: radiusStyle;
+        shop_padding: paddingStyle;
+        content_outer_spacing: number;
+        content_spacing: number;
+        content_outer_height: number;
         shop_title_color: string;
         shop_title_typeface: string;
         shop_title_size: number;
@@ -97,6 +101,16 @@ const defaultSeckill: DefaultSeckill = {
             radius_bottom_left: 4,
             radius_bottom_right: 4,
         },
+        shop_padding: {
+            padding: 10, 
+            padding_top: 10, 
+            padding_bottom: 10, 
+            padding_left: 10, 
+            padding_right: 10,
+        },
+        content_outer_spacing: 10, // 商品间距
+        content_spacing: 10,
+        content_outer_height: 232,
         shop_title_color: '',
         shop_title_typeface: '',
         shop_title_size: 12,

From f2241a1739c2175e60f5542bba6b1bc204e13785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 3 Sep 2024 18:49:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=92=E6=9D=80?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/model-seckill/theme-4.png      | Bin 9690 -> 11095 bytes
 .../images/components/model-seckill/time.png  | Bin 691 -> 0 bytes
 src/components/model-seckill/index.vue        |  31 +++++++++++++-----
 .../model-seckill/model-seckill-setting.vue   |   2 +-
 .../model-seckill/model-seckill-styles.vue    |  14 ++++----
 5 files changed, 30 insertions(+), 17 deletions(-)
 delete mode 100644 src/assets/images/components/model-seckill/time.png

diff --git a/src/assets/images/components/model-seckill/theme-4.png b/src/assets/images/components/model-seckill/theme-4.png
index 443265bbc46dec8603f029f0de329f621b351cfd..e6e26bf5fc2f10ee685902c9cba2c457b468a19d 100644
GIT binary patch
literal 11095
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

literal 9690
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

diff --git a/src/assets/images/components/model-seckill/time.png b/src/assets/images/components/model-seckill/time.png
deleted file mode 100644
index d0cacb8e85fcb46c90182229e83857ef62c13ad2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 691
zcmV;k0!;mhP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%ZAnByR9HvFmraOHVHC%Ir+h4km55>GqZB)3qgatdHWZc=v$Pe9k*%GP%#yVt
zHL;k<O4*rGK2~TVD~9s1IPU+Q=jy)i-22{po|n9JH}5^?+~0G)AEV>X-B$nyfTO@p
zU}Jh@VLm-CfcwCVnf>fy+S-KNeFJa>I1Q|6lTYuz0C#~2Gy5=1rxC#2R|1!Si@>S|
zBcId%Ya8BwE1<6f*UaokolGr2I`utZ?-2T5z?Ss>ZSj%iLu8)<$LqYY1i;;Q0}p|*
z7I%L%Gld6tmz&qO$iD{;o7r4dt`8uc{8@*O%SIGHI)d0!^~4{56!X~@w^!kF0Hm*Q
z>@Rbo3NQg&?wIAd9w^OUH8WKfJ%Hr;H$$?$jw{y#vZd<Ss!)^wlSND~1WrGy2c&<~
z%*HKsxKDv5Q*w^t0ohQqS|@;mMdD2dPyaVOARC7Sa03|60GKl~^$g|Eb6{77jY$E_
zs4RlYcZ!-mTb5EP;VIxu(9Wy?UIN<#itma+vu&`qCy3X;=76nN0$2c62b8AF>|C9^
zyWf^)0=B;90Ng6-_k06@M)0Wsz(P(4H2HRz+4sQ@x%(4fUjU#Nf}A9L1RNWLaCdD<
zvez}IdP$gDhH74qfn~rZ;DnjY2O)Z8nA?a3J*^7Rl#4+08j+UGoK{>H>IlSQD^8s(
zXBai*S{335@Ss6(aTtv-j)x_?AhgV$Z0L^t<2XS?7m`4=EfMWsND_e7@W@J*3sAq3
zRYK8qDa`?BUP?=Afwepe(7u*eAhhqdT}&bX-7h8;h%Q&NHi*2dS=H))yPVccx_@##
Z{|yxmBjs|9Wyk;k002ovPDHLkV1kP;I+g$c

diff --git a/src/components/model-seckill/index.vue b/src/components/model-seckill/index.vue
index eb22117e..84607eb2 100644
--- a/src/components/model-seckill/index.vue
+++ b/src/components/model-seckill/index.vue
@@ -11,7 +11,7 @@
                     <div class="flex-row align-c gap-4">
                         <span class="size-10" :style="`color: ${ new_style.end_text_color }`">距离结束</span>
                         <div class="flex-row gap-3 jc-c align-c" :style="[form.theme == '4'? `${ time_bg };padding: 0.3rem 0.4rem;border-radius: 1.1rem;` : '']">
-                        <img v-if="form.theme == '4'" class="seckill-head-icon radius-xs" :src="url_computer('time')" />
+                        <img v-if="form.theme == '4'" class="seckill-head-icon radius-xs" :src="new_url" />
                         <template v-for="(item, index) in time_config" :key="item.key">
                             <template v-if="form.theme == '4'">
                                 <div class="size-12" :style="`color: ${ new_style.countdown_color }`">{{ item.value }}</div>
@@ -31,7 +31,7 @@
                 </div>
             </div>
             <div class="flex flex-wrap" :style="`gap: ${ content_outer_spacing }px;`">
-                <div v-for="(item, index) in list" :key="index" :class="layout_type" :style="`${ content_radius }; ${ content_padding }`">
+                <div v-for="(item, index) in list" :key="index" :class="layout_type" :style="`${ content_radius }; ${ shop_style_type == '1' ? content_padding : '' }`">
                     <template v-if="!isEmpty(item)">
                         <template v-if="!isEmpty(item.new_cover)">
                             <image-empty v-model="item.new_cover[0]" :class="`flex-img${shop_style_type}`" :style="content_img_radius"></image-empty>
@@ -40,8 +40,8 @@
                             <image-empty v-model="item.images" :class="`flex-img${shop_style_type}`" :style="content_img_radius"></image-empty>
                         </template>
                     </template>
-                    <div class="flex-col gap-10">
-
+                    <div class="flex-col gap-10" :style="content_style">
+                        <div>{{ item.title }}</div>
                     </div>
                 </div>
             </div>
@@ -51,6 +51,7 @@
 <script setup lang="ts">
 import { background_computer, common_styles_computer, gradient_computer, padding_computer, radius_computer } from '@/utils';
 import { isEmpty } from 'lodash';
+import { online_url } from '@/utils';
 
 const props = defineProps({
     value: {
@@ -60,6 +61,12 @@ const props = defineProps({
         },
     },
 });
+const new_url = ref('');
+onBeforeMount(async () => {
+    const url = await online_url('/static/plugins/seckill/images/diy/').then(res => res);
+    new_url.value = url + 'time.png';
+})
+
 const form = computed(() => props.value?.content || {});
 const new_style = computed(() => props.value?.style || {});
 const time_config = [
@@ -157,6 +164,17 @@ const content_radius = computed(() => radius_computer(new_style.value.shop_radiu
 const shop_style_type = computed(() => form.value.shop_style_type);
 // 内边距设置
 const content_padding = computed(() => padding_computer(new_style.value.shop_padding));
+// 内容区域的样式
+const content_style = computed(() => {
+    const spacing_value = new_style.value.content_spacing;
+    let spacing = '';
+    if (shop_style_type.value == '1') {
+        spacing = `margin-left: ${spacing_value}px;`;
+    } else {
+        spacing = content_padding.value;
+    }
+    return `${spacing}`;
+});
 // 不同风格下的样式
 const layout_type = computed(() => {
     let class_type = '';
@@ -190,11 +208,6 @@ const multicolumn_columns_width = computed(() => {
 });
 // 图片圆角设置
 const content_img_radius = computed(() => radius_computer(new_style.value.shop_img_radius));
-
-const url_computer = (name: string) => {
-    const new_url = ref(new URL(`../../assets/images/components/model-seckill/${name}.png`, import.meta.url).href).value;
-    return new_url;
-};
 </script>
 <style lang="scss" scoped>
 :deep(.el-image) {
diff --git a/src/components/model-seckill/model-seckill-setting.vue b/src/components/model-seckill/model-seckill-setting.vue
index 39c0ab75..b726b08a 100644
--- a/src/components/model-seckill/model-seckill-setting.vue
+++ b/src/components/model-seckill/model-seckill-setting.vue
@@ -136,7 +136,7 @@ onBeforeMount(async () => {
                 style: {
                     topic_color: '#000',
                     head_button_color: '#000',
-                    end_text_color: '',
+                    end_text_color: '#666',
                     header_background_color_list: [{ color: '#fff', color_percentage: undefined }],
                     header_background_img_url: [],
                     countdown_bg_color_list: [{ color: '#FF5000', color_percentage: undefined }],
diff --git a/src/components/model-seckill/model-seckill-styles.vue b/src/components/model-seckill/model-seckill-styles.vue
index 522b1535..008aa52f 100644
--- a/src/components/model-seckill/model-seckill-styles.vue
+++ b/src/components/model-seckill/model-seckill-styles.vue
@@ -1,13 +1,13 @@
 <template>
     <div class="w">
         <el-form :model="form" label-width="70">
-            <template v-if="form.head_state == '1'">
+            <template v-if="data.head_state == '1'">
                 <card-container>
                     <div class="mb-12">头部样式</div>
-                    <el-form-item v-if="form.topic_type == 'text'" label="标题设置">
+                    <el-form-item v-if="data.topic_type == 'text'" label="标题设置">
                         <color-text-size-group v-model:color="form.topic_color" v-model:size="form.topic_size" :default-color="clone_form.topic_color" :type-list="['color', 'size']"></color-text-size-group>
                     </el-form-item>
-                    <el-form-item v-if="form.button_status == '1'" label="按钮设置">
+                    <el-form-item v-if="data.button_status == '1'" label="按钮设置">
                         <color-text-size-group v-model:color="form.head_button_color" v-model:size="form.head_button_size" :default-color="clone_form.head_button_color" :type-list="['color', 'size']"></color-text-size-group>
                     </el-form-item>
                     <el-form-item label="秒杀提示">
@@ -68,13 +68,13 @@
                 <el-form-item label="内间距">
                     <padding :value="form.shop_padding"></padding>
                 </el-form-item>
-                <el-form-item v-if="form.shop_style_type == '1'" label="内容间距">
+                <el-form-item v-if="data.shop_style_type == '1'" label="内容间距">
                     <slider v-model="form.content_spacing" :max="100"></slider>
                 </el-form-item>
                 <el-form-item label="商品间距">
                     <slider v-model="form.content_outer_spacing" :max="100"></slider>
                 </el-form-item>
-                <template v-if="form.shop_style_type == '3'">
+                <template v-if="data.shop_style_type == '3'">
                     <el-form-item label="内容高度">
                         <slider v-model="form.content_outer_height" :max="1000"></slider>
                     </el-form-item>
@@ -93,7 +93,7 @@
                     </div>
                 </el-form-item>
             </card-container>
-            <template v-if="form.shop_style_type == '1'">
+            <template v-if="data.shop_style_type == '1'">
                 <div class="divider-line"></div>
                 <card-container>
                     <div class="mb-12">进度条设置</div>
@@ -114,7 +114,7 @@
                     </el-form-item>
                 </card-container>
             </template>
-            <template v-if="form.shop_style_type == '3'">
+            <template v-if="data.shop_style_type == '3'">
                 <div class="divider-line"></div>
                 <card-container>
                     <div class="mb-12">轮播设置</div>