From fb02387014bcbd520eecc5478ac3c418357a07a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Wed, 25 Sep 2024 13:55:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/goods-list.vue | 18 ++++++++++--------
 components/diy/seckill.vue    | 14 +++++++-------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue
index d0cf1771..a216ed52 100644
--- a/components/diy/goods-list.vue
+++ b/components/diy/goods-list.vue
@@ -58,7 +58,7 @@
                                         <block v-if="form.shop_type == 'text'">
                                             <view class="plr-11 ptb-3 round" :style="button_style + ('color:' + new_style.shop_button_text_color)">{{ form.shop_button_text }}</view>
                                         </block>
-                                        <view v-else class="round plr-6 ptb-5" :style="button_gradient()">
+                                        <view v-else class="round plr-6 ptb-5" :style="button_gradient">
                                             <iconfont :name="'icon-' + (!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart')" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size * 2 + 'rpx'"></iconfont>
                                         </view>
                                         <view v-if="form.shop_button_effect == '1'" class="cart-badge-icon pa badge-style">
@@ -88,7 +88,7 @@
                                     <block v-if="form.shop_type == 'text'">
                                         <view class="plr-11 ptb-3 round" :style="button_style + ('color:' + new_style.shop_button_text_color)">{{ form.shop_button_text }}</view>
                                     </block>
-                                    <view v-else class="round plr-6 ptb-5" :style="button_gradient()">
+                                    <view v-else class="round plr-6 ptb-5" :style="button_gradient">
                                         <iconfont :name="'icon-' + (!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart')" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size * 2 + 'rpx'"></iconfont>
                                     </view>
                                     <view v-if="form.shop_button_effect == '1'" class="cart-badge-icon pa badge-style">
@@ -140,7 +140,7 @@
                                         <block v-if="form.shop_type == 'text'">
                                             <view class="plr-11 ptb-3 round" :style="button_style + ('color:' + new_style.shop_button_text_color)">{{ form.shop_button_text }}</view>
                                         </block>
-                                        <view v-else class="round plr-6 ptb-5" :style="button_gradient()">
+                                        <view v-else class="round plr-6 ptb-5" :style="button_gradient">
                                             <iconfont :name="'icon-' + (!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart')" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size * 2 + 'rpx'"></iconfont>
                                         </view>
                                         <view v-if="form.shop_button_effect == '1'" class="cart-badge-icon pa badge-style">
@@ -254,6 +254,12 @@
                 button_style: '',
             };
         },
+        computed: {
+            // 按钮渐变色处理
+            button_gradient() {
+                return gradient_handle(this.new_style.shop_button_color, '180deg');
+            }
+        },
         created() {
             this.setData({
                 form: this.value.content,
@@ -417,16 +423,12 @@
             style_config(typeface, size, color, type) {
                 let style = `font-weight:${typeface}; font-size: ${size * 2}rpx;`;
                 if (type == 'gradient') {
-                    style += this.button_gradient();
+                    style += this.button_gradient;
                 } else {
                     style += `color: ${color};`;
                 }
                 return style;
             },
-            // 按钮渐变色处理
-            button_gradient() {
-                return gradient_handle(this.new_style.shop_button_color, '180deg');
-            },
             // icon标志显示样式
             icon_style(item) {
                 let style = `background: ${item.bg_color};color: ${item.color};`;
diff --git a/components/diy/seckill.vue b/components/diy/seckill.vue
index e82a0093..69238cb5 100644
--- a/components/diy/seckill.vue
+++ b/components/diy/seckill.vue
@@ -86,7 +86,7 @@
                                         <template v-if="form.shop_type == 'text'">
                                             <view class="plr-11 ptb-3 round cr-white" :style="button_style + 'color:' + new_style.shop_button_text_color">{{ form.shop_button_text }}</view>
                                         </template>
-                                        <view v-else class="round plr-6 ptb-5" :styles="button_gradient()">
+                                        <view v-else class="round plr-6 ptb-5" :styles="button_gradient">
                                             <iconfont :name="'icon-' + (!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart')" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size * 2 + 'rpx'"></iconfont>
                                         </view>
                                     </view>
@@ -149,7 +149,7 @@
                                         <template v-if="form.shop_type == 'text'">
                                             <view class="plr-11 ptb-3 round cr-white" :style="button_style + 'color:' + new_style.shop_button_text_color">{{ form.shop_button_text }}</view>
                                         </template>
-                                        <view v-else class="round plr-6 ptb-5" :styles="button_gradient()">
+                                        <view v-else class="round plr-6 ptb-5" :styles="button_gradient">
                                             <iconfont :name="'icon-' + (!isEmpty(form.shop_button_icon_class) ? form.shop_button_icon_class : 'cart')" :color="new_style.shop_icon_color" :size="new_style.shop_icon_size * 2 + 'rpx'"></iconfont>
                                         </view>
                                     </view>
@@ -237,6 +237,10 @@
             icon_time_check() {
                 return `${this.time_bg};line-height: 1;background-clip: text;-webkit-background-clip: text;-webkit-text-fill-color: transparent;`;
             },
+            // 按钮渐变色处理
+            button_gradient() {
+                return gradient_handle(this.new_style.shop_button_color, '180deg');
+            }
         },
         created() {
             this.setData({
@@ -444,16 +448,12 @@
             style_config(typeface, size, color, type) {
                 let style = `font-weight:${typeface}; font-size: ${size * 2}rpx;`;
                 if (type == 'gradient') {
-                    style += this.button_gradient();
+                    style += this.button_gradient;
                 } else {
                     style += `color: ${color};`;
                 }
                 return style;
             },
-            // 按钮渐变色处理
-            button_gradient() {
-                return gradient_handle(this.new_style.shop_button_color, '180deg');
-            },
             get_multicolumn_columns_width() {
                 let model_number = this.form.carousel_col;
                 if (this.form.shop_style_type == '1') {