From ce4840aaaf639a88b2d3eb60d4aa91fe964f2425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 31 Oct 2024 13:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E9=83=A8=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BB=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-data-magic/components/product-list-show.vue       | 1 +
 src/components/model-data-magic/index.vue                   | 2 +-
 src/components/page-settings/index.vue                      | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/model-data-magic/components/product-list-show.vue b/src/components/model-data-magic/components/product-list-show.vue
index 993cdf5b..46445ddc 100644
--- a/src/components/model-data-magic/components/product-list-show.vue
+++ b/src/components/model-data-magic/components/product-list-show.vue
@@ -177,6 +177,7 @@ const gap_height = computed(() => 20 / 3 + 'px');
 }
 .identifying .num {
     font-size: 0.9rem;
+    line-height: 0.9rem;
 }
 
 .price-suspension {
diff --git a/src/components/model-data-magic/index.vue b/src/components/model-data-magic/index.vue
index d3a9976a..99dcf62e 100644
--- a/src/components/model-data-magic/index.vue
+++ b/src/components/model-data-magic/index.vue
@@ -280,7 +280,7 @@ watch(props.value.content, (val) => {
         
         // 商品名称和价格样式
         data_style.goods_title_style = goods_trends_config(item.data_style, 'title');
-        data_style.goods_price_style = goods_trends_config(item.data_style, 'price');
+        data_style.goods_price_style = goods_trends_config(item.data_style, 'price') + `line-height: ${ item.data_style.goods_price_size }px;`;
 
         const { is_roll, rotation_direction, interval_time } = data_style;
         const { goods_list, images_list } = data_content;
diff --git a/src/components/page-settings/index.vue b/src/components/page-settings/index.vue
index baaffa6c..36ac00e6 100644
--- a/src/components/page-settings/index.vue
+++ b/src/components/page-settings/index.vue
@@ -17,8 +17,8 @@
                                         <template v-if="new_style.up_slide_logo && new_style.up_slide_logo.length > 0">
                                             <!-- 有上滑logo的处理逻辑 -->
                                             <div class="logo-outer-style re">
-                                                <img class="logo-style" :style="up_slide_old_logo_style + 'width:' + ((props.scollTop - 5) / 90 < 1 ? 100 + '%;' : 0)" :src="form.logo[0].url" />
-                                                <img :class="['logo-style', {'abs left-0': (props.scollTop - 5) / 90 <= 1 }]" :style="'opacity:0;' + up_slide_opacity" :src="new_style.up_slide_logo[0].url" />
+                                                <img class="logo-style" :style="up_slide_old_logo_style + 'max-width:' + ((props.scollTop - 5) / 90 < 1 ? 100 + '%;' : 0)" :src="form.logo[0].url" />
+                                                <img :class="['logo-style left-0', {'abs': (props.scollTop - 5) / 90 < 1 }]" :style="'opacity:0;' + up_slide_opacity" :src="new_style.up_slide_logo[0].url" />
                                             </div>
                                         </template>
                                         <template v-else>
@@ -246,7 +246,7 @@ const position_class = computed(() => (form.value?.indicator_location == 'center
     .logo-style {
         max-height: 2.8rem;
         max-width: 100%;
-        transition: all 0.3s;
+        // transition: all 0.3s;
         :deep(.image-slot) {
             height: 2.8rem;
             width: 2.8rem;