From 718090da9fbc667d9e65cd31acb650efebd757ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Sun, 5 Jan 2025 10:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/article-tabs.vue | 8 ++------
 components/diy/custom.vue       | 2 +-
 components/diy/goods-tabs.vue   | 8 ++------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/components/diy/article-tabs.vue b/components/diy/article-tabs.vue
index d4b363fc..343d0428 100644
--- a/components/diy/article-tabs.vue
+++ b/components/diy/article-tabs.vue
@@ -16,7 +16,7 @@
 
 <script>
     const app = getApp();
-    import { common_styles_computer, common_img_computer, padding_computer, margin_computer, background_computer, gradient_computer, radius_computer, isEmpty, box_shadow_computer, border_computer, old_border_and_box_shadow } from '@/common/js/common/common.js';
+    import { common_styles_computer, common_img_computer, padding_computer, margin_computer, background_computer, gradient_computer, radius_computer, isEmpty, box_shadow_computer, border_computer, old_border_and_box_shadow, old_margin, old_padding } from '@/common/js/common/common.js';
     import componentDiyModulesTabsView from '@/components/diy/modules/tabs-view';
     import componentDiyArticleList from '@/components/diy/article-list'; // 状态栏高度
     var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
@@ -83,10 +83,6 @@
                 // 商品区域背景设置
                 article_container: '',
                 article_img_container: '',
-                // 默认数据
-                old_radius: { radius: 0, radius_top_left: 0, radius_top_right: 0, radius_bottom_left: 0, radius_bottom_right: 0 },
-                old_padding: { padding: 0, padding_top: 0, padding_bottom: 0, padding_left: 0, padding_right: 0 },
-                old_margin: { margin: 0, margin_top: 10, margin_bottom: 0, margin_left: 0, margin_right: 0 },
                 // #ifdef MP
                 nav_safe_space: bar_height + 5,
                 // #endif
@@ -184,7 +180,7 @@
                 let common_style = Object.assign({}, new_style.common_style, {
                     padding_top: 0,
                 });
-                const { tabs_bg_color_list = [], tabs_bg_direction = '', tabs_bg_background_img_style = '', tabs_bg_background_img = [], tabs_radius = this.old_radius, tabs_padding = this.old_padding, article_content_color_list = [], article_content_direction = '', article_content_background_img_style = '', article_content_background_img = [], article_content_margin = this.old_margin, article_content_padding = this.old_padding, article_content_radius = this.old_radius } = new_style;
+                const { tabs_bg_color_list = [], tabs_bg_direction = '', tabs_bg_background_img_style = '', tabs_bg_background_img = [], tabs_radius = old_radius, tabs_padding = old_padding, article_content_color_list = [], article_content_direction = '', article_content_background_img_style = '', article_content_background_img = [], article_content_margin = old_margin, article_content_padding = old_padding, article_content_radius = old_radius } = new_style;
                 // 选项卡背景设置
                 const tabs_data = {
                     color_list: tabs_bg_color_list,
diff --git a/components/diy/custom.vue b/components/diy/custom.vue
index 6732af73..ea02b0ca 100644
--- a/components/diy/custom.vue
+++ b/components/diy/custom.vue
@@ -300,7 +300,7 @@
                         }
                     }
                 }
-                app.globalData.url_event(e);
+                app.globalData.url_open(e);
             },
         },
     };
diff --git a/components/diy/goods-tabs.vue b/components/diy/goods-tabs.vue
index ff9e776a..d6009e92 100644
--- a/components/diy/goods-tabs.vue
+++ b/components/diy/goods-tabs.vue
@@ -15,7 +15,7 @@
 
 <script>
     const app = getApp();
-    import { common_styles_computer, common_img_computer, padding_computer, margin_computer, background_computer, gradient_computer, isEmpty, old_border_and_box_shadow, border_computer, box_shadow_computer, radius_computer } from '@/common/js/common/common.js';
+    import { common_styles_computer, common_img_computer, padding_computer, margin_computer, background_computer, gradient_computer, isEmpty, old_border_and_box_shadow, old_margin, old_radius, old_padding, border_computer, box_shadow_computer, radius_computer } from '@/common/js/common/common.js';
     import componentDiyModulesTabsView from '@/components/diy/modules/tabs-view';
     import componentGoodsList from '@/components/diy/goods-list';
     // 状态栏高度
@@ -82,10 +82,6 @@
                 shop_margin_top: '',
                 shop_container: '',
                 shop_img_container: '',
-                // 默认数据
-                old_radius: { radius: 0, radius_top_left: 0, radius_top_right: 0, radius_bottom_left: 0, radius_bottom_right: 0 },
-                old_padding: { padding: 0, padding_top: 0, padding_bottom: 0, padding_left: 0, padding_right: 0 },
-                old_margin: { margin: 0, margin_top: 10, margin_bottom: 0, margin_left: 0, margin_right: 0 },
                 // #ifdef MP
                 nav_safe_space: bar_height + 5,
                 // #endif
@@ -177,7 +173,7 @@
                 let common_style = Object.assign({}, new_style.common_style, {
                     padding_top: 0,
                 });
-                const { tabs_bg_color_list = [], tabs_bg_direction = '', tabs_bg_background_img_style = '', tabs_bg_background_img = [], tabs_radius = this.old_radius, tabs_padding = this.old_padding, shop_content_color_list = [], shop_content_direction = '', shop_content_background_img_style = '', shop_content_background_img = [], shop_content_margin = this.old_margin, shop_content_padding = this.old_padding, shop_content_radius = this.old_radius } = new_style;
+                const { tabs_bg_color_list = [], tabs_bg_direction = '', tabs_bg_background_img_style = '', tabs_bg_background_img = [], tabs_radius = old_radius, tabs_padding = old_padding, shop_content_color_list = [], shop_content_direction = '', shop_content_background_img_style = '', shop_content_background_img = [], shop_content_margin = old_margin, shop_content_padding = old_padding, shop_content_radius = old_radius } = new_style;
                 // 选项卡背景设置
                 const tabs_data = {
                     color_list: tabs_bg_color_list,