From 16a5ec684a02210a345d3b7ffe32ba021e78d78c 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, 31 Dec 2024 18:07:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-article-list/index.vue                 | 2 --
 .../model-article-tabs/model-article-tabs-styles.vue        | 4 +++-
 src/components/model-goods-list/index.vue                   | 3 ++-
 src/config/const/seckill.ts                                 | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/model-article-list/index.vue b/src/components/model-article-list/index.vue
index 6e1b191b..7a26a873 100644
--- a/src/components/model-article-list/index.vue
+++ b/src/components/model-article-list/index.vue
@@ -404,7 +404,6 @@ const article_theme_class = computed(() => {
 <style lang="scss" scoped>
 .style1 {
     .item {
-        width: 100%;
         .img {
             height: v-bind(article_img_height);
             width: v-bind(article_img_width);
@@ -428,7 +427,6 @@ const article_theme_class = computed(() => {
 }
 .style4 {
     .item {
-        width: 100%;
         &:not(:last-child) {
             border-bottom: 0.1rem solid #eee;
         }
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 8daabf2a..26d9c4ab 100644
--- a/src/components/model-article-tabs/model-article-tabs-styles.vue
+++ b/src/components/model-article-tabs/model-article-tabs-styles.vue
@@ -121,7 +121,9 @@
                     <color-text-size-group v-model:color="form.page_view_color" v-model:typeface="form.page_view_weight" v-model:size="form.page_view_size"></color-text-size-group>
                 </el-form-item>
                 <template v-if="theme != '3'">
-                    <margin :value="form.margin"></margin>
+                    <el-form-item label="外间距">
+                        <margin :value="form.margin"></margin>
+                    </el-form-item>
                 </template>
                 <el-form-item label="内间距">
                     <padding :value="form.padding"></padding>
diff --git a/src/components/model-goods-list/index.vue b/src/components/model-goods-list/index.vue
index c7dbcd11..dee64f77 100644
--- a/src/components/model-goods-list/index.vue
+++ b/src/components/model-goods-list/index.vue
@@ -369,8 +369,9 @@ const layout_type = computed(() => {
 // 容器样式
 const layout_style = computed(() => {
     const radius = theme.value == '6' ? '' : content_radius.value;
+    const width = theme.value == '0' ? `width: calc(100% - ${ shop_left_right_width_margin.value }px);` : '';
     const gradient = theme.value != '6' ? gradient_handle(new_style.value.shop_color_list, new_style.value.shop_direction) + margin_computer(new_style.value.shop_margin) + border_computer(new_style.value) + box_shadow_computer(new_style.value) : '';
-    return `${radius} ${ gradient }`;
+    return `${radius} ${ gradient } ${ width }`;
 });
 
 // 容器图片样式
diff --git a/src/config/const/seckill.ts b/src/config/const/seckill.ts
index a59bc04d..a21253a0 100644
--- a/src/config/const/seckill.ts
+++ b/src/config/const/seckill.ts
@@ -275,9 +275,9 @@ const defaultSeckill: DefaultSeckill = {
         shop_content_padding: {
             padding: 0,
             padding_top: 0,
-            padding_bottom: 10,
-            padding_left: 10,
-            padding_right: 10,
+            padding_bottom: 0,
+            padding_left: 0,
+            padding_right: 0,
         },
         shop_content_spacing: 0,
         shop_content: {