From ebc9405dd05c099993ab5ef25b412c085efba4dd 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, 22 Oct 2024 14:22:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/carousel.vue   | 2 +-
 components/diy/goods-list.vue | 6 +++---
 components/diy/search.vue     | 6 +-----
 components/diy/seckill.vue    | 4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/components/diy/carousel.vue b/components/diy/carousel.vue
index 2abb4e95..fa436434 100644
--- a/components/diy/carousel.vue
+++ b/components/diy/carousel.vue
@@ -4,7 +4,7 @@
             <swiper circular="true" :autoplay="form.is_roll == '1'" :interval="form.interval_time * 1000" :display-multiple-items="slides_per_group" :duration="500" :style="{ height: swiper_height }" :previous-margin="previousMargin" :next-margin="nextMargin" @change="slideChange">
                 <block v-if="form.carousel_type == 'card'">
                     <swiper-item v-for="(item, index) in new_list" :key="index">
-                        <view class="flex-row align-c" :data-value="item.carousel_link.page" @tap="url_open">
+                        <view class="flex-row align-c ht-auto" :data-value="item.carousel_link.page" @tap="url_open">
                             <view class="swiper-item" :style="img_style" :class="['scale-defalt', { 'scale-1': animationData === index }]">
                                 <imageEmpty :propImageSrc="item.carousel_img[0]" :propStyle="img_style" :propImgFit="img_fit" propErrorStyle="width: 100rpx;height: 100rpx;"></imageEmpty>
                             </view>
diff --git a/components/diy/goods-list.vue b/components/diy/goods-list.vue
index ece7906f..a28d6379 100644
--- a/components/diy/goods-list.vue
+++ b/components/diy/goods-list.vue
@@ -405,12 +405,12 @@
                 let style = `font-weight:${typeface}; font-size: ${size * 2}rpx;`;
                 if (type == 'title') {
                     if (['1', '6'].includes(theme)) {
-                        style += `line-height: ${size}px;height: ${size}px;color: ${color};`;
+                        style += `line-height: ${size * 2}rpx;height: ${size * 2}rpx;color: ${color};`;
                     } else if (['0', '2', '3', '4', '5'].includes(theme)) {
-                        style += `line-height: ${size > 0 ? size + 3 : 0}px;height: ${size > 0 ? (size + 3) * 2 : 0}px;color: ${color};`;
+                        style += `line-height: ${size > 0 ? (size + 3) * 2 : 0}rpx;height: ${size > 0 ? (size + 3) * 4 : 0}rpx;color: ${color};`;
                     }
                 } else if (type == 'desc') {
-                    style += `line-height: ${size}px;height: ${size}px;color: ${color};`;
+                    style += `line-height: ${size * 2}rpx;height: ${size * 2}rpx;color: ${color};`;
                 } else {
                     if (type != 'buy_button') {
                         style += `color: ${color};`;
diff --git a/components/diy/search.vue b/components/diy/search.vue
index bae2a260..277357ba 100644
--- a/components/diy/search.vue
+++ b/components/diy/search.vue
@@ -2,7 +2,7 @@
     <view :style="style_container">
         <view :style="style_img_container">
             <view class="search wh-auto pr" :style="style">
-                <view class="box oh flex-row align-c gap-10" :style="box_style" @tap.stop="search_tap">
+                <view class="box oh flex-row align-c gap-10" :style="box_style" @tap="search_tap">
                     <view v-if="form.is_icon_show == '1'" class="search-icon" @tap.stop="search_icon_tap">
                         <template v-if="form.icon_img.length > 0">
                             <view class="img-box">
@@ -131,15 +131,12 @@ export default {
             return style;
         },
         search_tap() {
-            console.log('111');
             app.globalData.url_open('/pages/goods-search-start/goods-search-start?keywords=' + this.keywords);
         },
         serch_event() {
-            console.log('222');
             app.globalData.url_open('/pages/goods-search-start/goods-search-start?keywords=' + this.keywords);
         },
         serch_button_event() {
-            console.log('333');
             if (!isEmpty(this.keywords)) {
                 app.globalData.url_open('pages/goods-search/goods-search?keywords=' + this.keywords);
             }
@@ -160,7 +157,6 @@ export default {
             return style;
         },
         search_icon_tap() {
-            console.log('search_icon_tap');
             if (isEmpty(this.form.icon_link)) {
                 this.search_tap();
                 return;
diff --git a/components/diy/seckill.vue b/components/diy/seckill.vue
index 1cbfbe32..a53d89e6 100644
--- a/components/diy/seckill.vue
+++ b/components/diy/seckill.vue
@@ -470,9 +470,9 @@
                 if (type == 'gradient') {
                     style += this.button_gradient;
                 } else if (type == 'title') {
-                    style += `line-height: ${size > 0 ? size + 3 : 0}px;height: ${size > 0 ? (size + 3) * 2 : 0}px;color: ${color};`;
+                    style += `line-height: ${size > 0 ? (size + 3) * 2 : 0}rpx;height: ${size > 0 ? (size + 3) * 4 : 0}rpx;color: ${color};`;
                 } else if (type == 'desc') {
-                    style += `line-height: ${size}px;height: ${size}px;color: ${color};`;
+                    style += `line-height: ${size * 2}rpx;height: ${size * 2}rpx;color: ${color};`;
                 } else {
                     style += `color: ${color};`;
                 }