From 240fdfc3f37116d8ea4a8ff43a7b091e53cab735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Sat, 12 Oct 2024 18:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/common/common.js                    | 17 +++++++++++++----
 components/diy/modules/custom/model-icon.vue  |  6 +++---
 components/diy/modules/custom/model-image.vue |  4 ++--
 components/diy/modules/custom/model-lines.vue |  4 ++--
 components/diy/modules/custom/model-panel.vue |  4 ++--
 components/diy/modules/custom/model-text.vue  |  6 +++---
 6 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/common/js/common/common.js b/common/js/common/common.js
index c187e371..f2a16ca0 100644
--- a/common/js/common/common.js
+++ b/common/js/common/common.js
@@ -107,8 +107,12 @@ export function gradient_handle (color_list, direction, is_return_all = true) {
  * @param {string[], string} path
  * @returns {string}
  */
-export function padding_computer (new_style, scale = 1) {
-    return `padding: ${new_style.padding_top * scale * 2 || 0}rpx ${new_style.padding_right * scale * 2 || 0}rpx ${new_style.padding_bottom * scale * 2 || 0}rpx ${new_style.padding_left * scale * 2 || 0}rpx;`;
+export function padding_computer (new_style, scale = 1, is_custom = false) {
+    if (!is_custom) {
+        return `padding: ${new_style.padding_top * 2 || 0}rpx ${new_style.padding_right * 2 || 0}rpx ${new_style.padding_bottom * 2 || 0}rpx ${new_style.padding_left * 2 || 0}rpx;`;
+    } else {
+        return `padding: ${new_style.padding_top * scale || 0}px ${new_style.padding_right * scale || 0}px ${new_style.padding_bottom * scale || 0}px ${new_style.padding_left * scale || 0}px;`;
+    }
 }
 /**
  * 设置外边距的方法
@@ -125,8 +129,13 @@ export function margin_computer (new_style) {
  * @param {string[], string} path
  * @returns {string}
  */
-export function radius_computer (new_style, scale = 1) {
-    return `border-radius: ${new_style.radius_top_left * scale * 2 || 0}rpx ${new_style.radius_top_right * scale * 2 || 0}rpx ${new_style.radius_bottom_right * scale * 2 || 0}rpx ${new_style.radius_bottom_left * scale * 2 || 0}rpx;`;
+export function radius_computer (new_style, scale = 1, is_custom = false) {
+    if (!is_custom) {
+        return `border-radius: ${new_style.radius_top_left * 2 || 0}rpx ${new_style.radius_top_right * 2 || 0}rpx ${new_style.radius_bottom_right * 2 || 0}rpx ${new_style.radius_bottom_left * 2 || 0}rpx;`;
+    } else {
+        return `border-radius: ${new_style.radius_top_left * scale || 0}px ${new_style.radius_top_right * scale || 0}px ${new_style.radius_bottom_right * scale || 0}px ${new_style.radius_bottom_left * scale || 0}px;`;
+    }
+    
 }
 /**
  * 设置阴影样式
diff --git a/components/diy/modules/custom/model-icon.vue b/components/diy/modules/custom/model-icon.vue
index b7d8c184..34b36dcf 100644
--- a/components/diy/modules/custom/model-icon.vue
+++ b/components/diy/modules/custom/model-icon.vue
@@ -1,6 +1,6 @@
 <template>
     <view class="img-outer pr oh flex-row align-c wh-auto ht-auto" :style="com_style" :data-value="form.icon_link.page" @tap="url_event">
-        <iconfont :name="'icon-' + form.icon_class" :color="form.icon_color" :size="form.icon_size * propScale * 2 + 'rpx'"></iconfont>
+        <iconfont :name="'icon-' + form.icon_class" :color="form.icon_color" :size="form.icon_size * scale + 'px'"></iconfont>
     </view>
 </template>
 <script>
@@ -57,9 +57,9 @@
                 });
             },
             get_com_style(form) {
-                let style = `${ gradient_handle(form.color_list, form.direction) } ${ radius_computer(form.bg_radius, this.scale) };transform: rotate(${form.icon_rotate}deg);${ padding_computer(form.icon_padding, this.scale) };`;
+                let style = `${ gradient_handle(form.color_list, form.direction) } ${ radius_computer(form.bg_radius, this.scale, true) };transform: rotate(${form.icon_rotate}deg);${ padding_computer(form.icon_padding, this.scale, true) };`;
                 if (form.border_show == '1') {
-                    style += `border: ${form.border_size * this.scale * 2 }rpx ${form.border_style} ${form.border_color};box-sizing: border-box;`;
+                    style += `border: ${form.border_size * this.scale }px ${form.border_style} ${form.border_color};box-sizing: border-box;`;
                 }
                 if (form.icon_location == 'center') {
                     style += `justify-content: center;`;
diff --git a/components/diy/modules/custom/model-image.vue b/components/diy/modules/custom/model-image.vue
index 6c716e40..01428bf0 100644
--- a/components/diy/modules/custom/model-image.vue
+++ b/components/diy/modules/custom/model-image.vue
@@ -75,12 +75,12 @@
                 }
             },
             get_image_style(form) {
-                return `width: ${percentage_count(form.img_width, form.com_width)}; height: ${percentage_count(form.img_height, form.com_height)};transform: rotate(${form.img_rotate}deg); ${radius_computer(form.img_radius, this.scale)};`;
+                return `width: ${percentage_count(form.img_width, form.com_width)}; height: ${percentage_count(form.img_height, form.com_height)};transform: rotate(${form.img_rotate}deg); ${radius_computer(form.img_radius, this.scale, true)};`;
             },
             get_border_style(form) {
                 let style = ``;
                 if (form.border_show == '1') {
-                    style += `border: ${form.border_size * this.scale * 2}rpx ${form.border_style} ${form.border_color}; ${radius_computer(form.border_radius, this.scale)};box-sizing: border-box;`;
+                    style += `border: ${form.border_size * this.scale }px ${form.border_style} ${form.border_color}; ${radius_computer(form.border_radius, this.scale, true)};box-sizing: border-box;`;
                 }
                 return style;
             },
diff --git a/components/diy/modules/custom/model-lines.vue b/components/diy/modules/custom/model-lines.vue
index 2917110f..bbbd9e88 100644
--- a/components/diy/modules/custom/model-lines.vue
+++ b/components/diy/modules/custom/model-lines.vue
@@ -48,9 +48,9 @@
             },
             get_border_style(form) {
                 if (form.line_settings === 'horizontal') {
-                    return `margin: 10rpx 0;border-bottom: ${form.line_size * this.scale * 2}rpx ${form.line_style} ${form.line_color};`;
+                    return `margin: 10rpx 0;border-bottom: ${form.line_size * this.scale }px ${form.line_style} ${form.line_color};`;
                 } else {
-                    return `margin: 0 10rpx;border-right: ${form.line_size * this.scale * 2}rpx ${form.line_style} ${form.line_color};`;
+                    return `margin: 0 10rpx;border-right: ${form.line_size * this.scale }px ${form.line_style} ${form.line_color};`;
                 }
             }
         },
diff --git a/components/diy/modules/custom/model-panel.vue b/components/diy/modules/custom/model-panel.vue
index 537d359d..0f8ef132 100644
--- a/components/diy/modules/custom/model-panel.vue
+++ b/components/diy/modules/custom/model-panel.vue
@@ -60,9 +60,9 @@
                 });
             },
             get_com_style(form) {
-                let style = `${ gradient_handle(form.color_list, form.direction) } ${radius_computer(form.bg_radius, this.scale)}; transform: rotate(${form.panel_rotate}deg);`;
+                let style = `${ gradient_handle(form.color_list, form.direction) } ${radius_computer(form.bg_radius, this.scale, true)}; transform: rotate(${form.panel_rotate}deg);`;
                 if (form.border_show == '1') {
-                    style += `border: ${form.border_size * this.scale * 2}rpx ${form.border_style} ${form.border_color};`;
+                    style += `border: ${form.border_size * this.scale }px ${form.border_style} ${form.border_color};`;
                 }
                 return style;
             },
diff --git a/components/diy/modules/custom/model-text.vue b/components/diy/modules/custom/model-text.vue
index d8defe3b..5743f4ac 100644
--- a/components/diy/modules/custom/model-text.vue
+++ b/components/diy/modules/custom/model-text.vue
@@ -77,7 +77,7 @@
                 return text;
             },
             get_text_style(form) {
-                let style = `font-size: ${form.text_size * this.scale * 2}rpx;line-height: ${form.text_size * this.scale * 2}rpx;color: ${form.text_color}; text-align: ${form.text_location}; transform: rotate(${form.text_rotate}deg);text-decoration: ${form.text_option};${padding_computer(form.text_padding, this.scale)};box-sizing: border-box;`;
+                let style = `font-size: ${form.text_size * this.scale }px;line-height: ${form.text_size * this.scale }px;color: ${form.text_color}; text-align: ${form.text_location}; transform: rotate(${form.text_rotate}deg);text-decoration: ${form.text_option};${padding_computer(form.text_padding, this.scale, true)};box-sizing: border-box;`;
                 if (form.text_weight == 'italic') {
                     style += `font-style: italic`;
                 } else if (form.text_weight == '500') {
@@ -86,9 +86,9 @@
                 return style;
             },
             get_com_style(form) {
-                let style = `${ gradient_handle(form.color_list, form.direction) } ${radius_computer(form.bg_radius, this.scale)}`;
+                let style = `${ gradient_handle(form.color_list, form.direction) } ${radius_computer(form.bg_radius, this.scale, true)}`;
                 if (form.border_show == '1') {
-                    style += `border: ${form.border_size * this.scale * 2}rpx ${form.border_style} ${form.border_color};`;
+                    style += `border: ${form.border_size * this.scale }px ${form.border_style} ${form.border_color};`;
                 }
                 // 是富文本并且开启了上下滚动的开关
                 if (form.is_rich_text == '1' && form.is_up_down == '1') {