From eff0e63bdad35320ae20088ce4a366272024bf1c 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, 4 Mar 2025 10:08:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                   | 4 ++--
 components/diy/search.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/App.vue b/App.vue
index d25db4e2..38ef28c9 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                request_url:'https://new.shopxo.vip/',
+                request_url:'https://d1.shopxo.vip/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                static_url:'https://new.shopxo.vip/',
+                static_url:'https://d1.shopxo.vip/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
diff --git a/components/diy/search.vue b/components/diy/search.vue
index 6e7bee8b..c7ee18c9 100644
--- a/components/diy/search.vue
+++ b/components/diy/search.vue
@@ -200,7 +200,7 @@ export default {
             return style + border + `height: ${height > 0 ? height * 2 : 0}rpx;line-height: ${height > 0 ? height * 2 : 0}rpx;`;
         },
         get_search_button_height(new_style) {
-            const { search_botton_border_size = old_padding, search_botton_padding = old_padding } = new_style;
+            const { search_botton_border_size = old_padding, search_botton_padding = this.button_padding } = new_style;
             const height = 32 - search_botton_border_size.padding_top - search_botton_border_size.padding_bottom - search_botton_padding.padding_top - search_botton_padding.padding_bottom;
             return `height: ${height > 0 ? height * 2 : 0}rpx !important;line-height: ${height > 0 ? height * 2 : 0}rpx;`;
         },
@@ -211,7 +211,7 @@ export default {
                 background_img: search_botton_background_img,
                 background_img_style: search_botton_background_img_style,
             }
-            return background_computer(data) + padding_computer(new_style?.search_botton_padding || button_padding) + 'box-sizing: border-box;';
+            return background_computer(data) + padding_computer(new_style?.search_botton_padding || this.button_padding) + 'box-sizing: border-box;';
         },
         // get_style(new_style) {
         //     let common_styles = '';

From 457babc6785d12e5b74c6ebdcfc4dc98a8aab4c4 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, 4 Mar 2025 10:16:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/search.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/diy/search.vue b/components/diy/search.vue
index c7ee18c9..3d18f337 100644
--- a/components/diy/search.vue
+++ b/components/diy/search.vue
@@ -78,7 +78,7 @@
 <script>
 import componentChoiceLocation from '@/components/choice-location/choice-location';
 const app = getApp();
-import { background_computer, common_styles_computer, common_img_computer, gradient_computer, radius_computer, isEmpty, padding_computer, old_padding, old_radius, old_margin, margin_computer } from '@/common/js/common/common.js';
+import { background_computer, common_styles_computer, common_img_computer, gradient_computer, radius_computer, isEmpty, padding_computer, old_padding, old_radius, margin_computer } from '@/common/js/common/common.js';
 export default {
     components: {
         componentChoiceLocation,
@@ -147,7 +147,8 @@ export default {
             search_button_style: '',
             search_button_img_style: '',
             search_button_height: '',
-            button_padding: { padding: 0, padding_bottom: 3, padding_left: 12, padding_right: 12, padding_top: 3 }
+            button_padding: { padding: 0, padding_bottom: 3, padding_left: 12, padding_right: 12, padding_top: 3 },
+            button_margin: { margin: 0, margin_bottom: 2, margin_left: 0, margin_right: 2, margin_top: 2 },
         };
     },
     watch: {
@@ -181,7 +182,7 @@ export default {
             });
         },
         get_search_button_style(form, new_style) {
-            const { search_botton_color_list = [], search_botton_direction, search_botton_background_img_style, search_button_radius = old_radius, search_botton_background_img, search_botton_margin = old_margin, search_botton_border_show = '0', search_botton_border_size = old_padding, search_botton_border_style = 'solid', search_botton_border_color = '' } = new_style;
+            const { search_botton_color_list = [], search_botton_direction, search_botton_background_img_style, search_button_radius = old_radius, search_botton_background_img, search_botton_margin = this.button_margin, search_botton_border_show = '0', search_botton_border_size = old_padding, search_botton_border_style = 'solid', search_botton_border_color = '' } = new_style;
             let style = radius_computer(search_button_radius);
             if (form.search_type != 'img') {
                 const data = {
@@ -196,7 +197,7 @@ export default {
             if (search_botton_border_show == '1') {
                 border += `border-width: ${search_botton_border_size.padding_top * 2}rpx ${search_botton_border_size.padding_right * 2}rpx ${search_botton_border_size.padding_bottom * 2}rpx ${search_botton_border_size.padding_left * 2}rpx;border-style: ${ search_botton_border_style };border-color: ${search_botton_border_color};`
             }
-            const height = 32 - search_botton_margin.margin_top - search_botton_margin.margin_bottom;
+            const height = 32 - search_botton_margin.margin_top - search_botton_margin.margin_bottom - search_botton_border_size.padding_top - search_botton_border_size.padding_bottom;
             return style + border + `height: ${height > 0 ? height * 2 : 0}rpx;line-height: ${height > 0 ? height * 2 : 0}rpx;`;
         },
         get_search_button_height(new_style) {