From c8dd9e9866847870e076c771c32d619a17493c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 10 Apr 2025 18:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=B9=E5=99=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/common/common.js              | 2 +-
 pages/diy/components/diy/goods-list.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/js/common/common.js b/common/js/common/common.js
index 2134c59d..e20cbc5b 100644
--- a/common/js/common/common.js
+++ b/common/js/common/common.js
@@ -585,7 +585,7 @@ export const border_computer = (new_style) => {
     
     // 根据边框是否需要显示的标志，决定是否构造并返回边框样式字符串
     if (border_is_show == '1') {
-       return `border-width: ${border_size.padding_top}px ${border_size.padding_right}px ${border_size.padding_bottom}px ${border_size.padding_left}px;border-style: ${ border_style };border-color: ${border_color};`
+       return `border-width: ${border_size.padding_top}px ${border_size.padding_right}px ${border_size.padding_bottom}px ${border_size.padding_left}px;border-style: ${ border_style };border-color: ${border_color};box-sizing: border-box;`
     }
     
     // 如果边框不需要显示，返回空字符串
diff --git a/pages/diy/components/diy/goods-list.vue b/pages/diy/components/diy/goods-list.vue
index e7d12338..235e9e0d 100644
--- a/pages/diy/components/diy/goods-list.vue
+++ b/pages/diy/components/diy/goods-list.vue
@@ -397,7 +397,7 @@
             get_layout_style(new_style, form) {
                 const { shop_margin = old_margin } = new_style;
                 const radius = form.theme == '6' ? '' : radius_computer(new_style.shop_radius);
-                const style = form.theme != '6' ? gradient_handle(new_style?.shop_color_list || [], new_style?.shop_direction || '') + margin_computer(shop_margin) + border_computer(new_style) + box_shadow_computer(new_style) : '';
+                const style = form.theme != '6' ? gradient_handle(new_style?.shop_color_list || [], new_style?.shop_direction || '') + margin_computer(shop_margin) + border_computer(new_style) + box_shadow_computer(new_style) + 'box-sizing: border-box;' : '';
                 let size_style = ``;
                 const shop_left_right_width = shop_margin.margin_left + shop_margin.margin_right;
                 if (['1', '4'].includes(form.theme)) {