From 8251c7593982e6581be80e687fb69890ee105ddf 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, 17 Oct 2024 18:55:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=92=E6=9D=80=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-seckill/index.vue |  8 ++++----
 src/styles/common.scss                 | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/components/model-seckill/index.vue b/src/components/model-seckill/index.vue
index 174f2273..16006de2 100644
--- a/src/components/model-seckill/index.vue
+++ b/src/components/model-seckill/index.vue
@@ -55,7 +55,7 @@
                             <div class="flex-col gap-10 w flex-1 jc-sb" :style="content_style">
                                 <div class="flex-col gap-10 w">
                                     <!-- 标题 -->
-                                    <div v-if="is_show('title')" :style="trends_config('title')" class="text-line-2">{{ item.title }}</div>
+                                    <div v-if="is_show('title')" :style="trends_config('title')" class="text-line-2 multi-text">{{ item.title }}</div>
                                     <!-- 进度条 -->
                                     <!-- <div v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
                                         <div class="re flex-1">
@@ -69,13 +69,13 @@
                                 </div>
                                 <div class="flex-row align-e gap-10 jc-sb">
                                     <div class="flex-col gap-5">
-                                        <div v-if="is_show('price') && !isEmpty(item.min_price)" class="num" :style="`color: ${new_style.shop_price_color}`">
+                                        <div v-if="is_show('price') && (!isEmpty(item.min_price) || !isNaN(Number(item.min_price)))" class="num" :style="`color: ${new_style.shop_price_color}`">
                                             <span v-if="form.shop_style_type == '1'" class="size-10 pr-4">秒杀价</span>
                                             <span class="identifying">{{ item.show_price_symbol }}</span
                                             ><span :style="trends_config('price')">{{ item.min_price }}</span>
                                             <span v-if="is_show('price_unit')" class="identifying">{{ item.show_price_unit }}</span>
                                         </div>
-                                        <div v-if="is_show('original_price') && !isEmpty(item.min_original_price)" class="size-11 flex" :style="`color: ${new_style.original_price_color}`">
+                                        <div v-if="is_show('original_price') && (!isEmpty(item.min_original_price) || !isNaN(Number(item.min_original_price)))" class="size-11 flex" :style="`color: ${new_style.original_price_color}`">
                                             <span class="original-price text-line-1 flex-1"
                                                 >{{ item.show_original_price_symbol }}{{ item.min_original_price }}
                                                 <template v-if="is_show('original_price_unit')">
@@ -116,7 +116,7 @@
                             <div class="flex-col gap-10 w flex-1 jc-sb" :style="content_style">
                                 <div class="flex-col gap-10 w">
                                     <!-- 标题 -->
-                                    <div v-if="is_show('title')" :style="trends_config('title')" class="text-line-2">{{ item.title }}</div>
+                                    <div v-if="is_show('title')" :style="trends_config('title')" class="text-line-2 multi-text">{{ item.title }}</div>
                                     <!-- 进度条 -->
                                     <div v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
                                         <div class="re flex-1">
diff --git a/src/styles/common.scss b/src/styles/common.scss
index ff2ea2af..b717bad5 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -270,4 +270,18 @@
     -moz-user-select: none;
     -ms-user-select: none;
     user-select: none;
+}
+// 显示两行
+.multi-text {
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    line-clamp: 2;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    min-height: 3.2rem;
+    line-height: 1.6rem;
+    font-size: 1.4rem;
+    white-space: initial;
 }
\ No newline at end of file