From 0cacc341fc4b820c799beac3cc667021e6fa74b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Fri, 18 Oct 2024 15:17:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=92=E6=9D=80=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-goods-list/index.vue     | 32 ++++++++++++-------
 src/components/model-seckill/index.vue        | 19 ++++++++---
 .../model-seckill/model-seckill-content.vue   |  1 +
 .../model-seckill/model-seckill-styles.vue    |  9 +++++-
 src/config/const/seckill.ts                   |  8 +++++
 5 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/src/components/model-goods-list/index.vue b/src/components/model-goods-list/index.vue
index 0f1aaae8..09f0dd83 100644
--- a/src/components/model-goods-list/index.vue
+++ b/src/components/model-goods-list/index.vue
@@ -6,7 +6,7 @@
                     <div v-for="(item, index) in list" :key="index" class="re" :class="layout_type" :style="layout_style">
                         <template v-if="theme == '6'">
                             <div :class="['flex-row align-c jc-sb ptb-15 mlr-10 gap-20', { 'br-b-e': index != list.length - 1 }]">
-                                <div v-if="is_show('title')" :class="text_line" :style="trends_config('title')">{{ item.title }}</div>
+                                <div v-if="is_show('title')" :class="text_line" :style="trends_config('title', 'title')">{{ item.title }}</div>
                                 <div v-if="is_show('price') && !isEmpty(item.min_price)" class="num nowrap" :style="`color: ${new_style.shop_price_color}`">
                                     <span class="identifying">{{ item.show_price_symbol }}</span
                                     ><span :style="trends_config('price')">{{ item.min_price }}</span>
@@ -23,12 +23,12 @@
                                     <image-empty v-model="item.images" :class="`flex-img${theme}`" :style="content_img_radius"></image-empty>
                                 </template>
                             </template>
-                            <div class="flex-col flex-1 jc-sb content gap-10" :style="content_style">
+                            <div v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('original_price') || is_show('sales_count') || is_show('plugins_view_icon') || form.is_shop_show == '1'" class="flex-col flex-1 jc-sb content gap-10" :style="content_style">
                                 <div class="flex-col gap-10 top-title">
-                                    <div v-if="is_show('shop')" class="flex-col" :style="`gap: ${ item.title_simple_desc_spacing }px;`">
+                                    <div v-if="is_show('title') || (['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc'))" class="flex-col" :style="`gap: ${ new_style.title_simple_desc_spacing }px;`">
+                                        <div v-if="is_show('title')" :class="text_line" :style="trends_config('title', 'title')">{{ item.title }}</div>
+                                        <div v-if="['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc')" class="text-line-1" :style="trends_config('simple_desc', 'desc')">{{ item.simple_desc }}</div>
                                     </div>
-                                    <div v-if="is_show('title')" :class="text_line" :style="trends_config('title')">{{ item.title }}</div>
-                                    <div v-if="['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc')" class="text-line-1" :style="trends_config('simple_desc')">{{ item.simple_desc }}</div>
                                     <div v-if="show_content && is_show('plugins_view_icon') && !isEmpty(item.plugins_view_icon_data)" class="flex-row gap-5 align-c">
                                         <div v-for="(icon_data, icon_index) in item.plugins_view_icon_data" :key="icon_index" class="radius-sm size-9 pl-3 pr-3" :style="icon_style(icon_data)">{{ icon_data.name }}</div>
                                     </div>
@@ -110,10 +110,12 @@
                                         <image-empty v-model="item.images" :class="`flex-img${theme}`" :style="content_img_radius"></image-empty>
                                     </template>
                                 </template>
-                                <div class="flex-col flex-1 jc-sb content gap-10" :style="content_style">
+                                <div v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('plugins_view_icon') || is_show('original_price') || form.is_shop_show == '1'" class="flex-col flex-1 jc-sb content gap-10" :style="content_style">
                                     <div class="flex-col gap-10 top-title">
-                                        <div v-if="is_show('title')" :class="text_line" :style="trends_config('title')">{{ item.title }}</div>
-                                        <div v-if="['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc')" class="text-line-1" :style="trends_config('simple_desc')">{{ item.simple_desc }}</div>
+                                        <div v-if="is_show('title') || (['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc'))" class="flex-col" :style="`gap: ${ new_style.title_simple_desc_spacing }px;`">
+                                            <div v-if="is_show('title')" :class="text_line" :style="trends_config('title', 'title')">{{ item.title }}</div>
+                                            <div v-if="['0', '1', '2', '3', '5'].includes(theme) && is_show('simple_desc')" class="text-line-1" :style="trends_config('simple_desc', 'desc')">{{ item.simple_desc }}</div>
+                                        </div>
                                         <div v-if="show_content && is_show('plugins_view_icon') && !isEmpty(item.plugins_view_icon_data)" class="flex-row gap-5 align-c">
                                             <div v-for="(icon_data, icon_index) in item.plugins_view_icon_data" :key="icon_index" class="radius-sm size-9 pl-3 pr-3" :style="icon_style(icon_data)">{{ icon_data.name }}</div>
                                         </div>
@@ -125,7 +127,7 @@
                                                 ><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="show_content && (!isEmpty(item.min_original_price) || typeof item.min_original_price == 'number')" class="size-10 flex">
+                                            <div v-if="show_content && is_show('original_price') && (!isEmpty(item.min_original_price) || typeof item.min_original_price == 'number')" class="size-10 flex">
                                                 <img class="original-price-left" :src="form.static_img[0].url" />
                                                 <span :class="['original-price text-line-1', { 'flex-1': form.is_price_solo == '1' }]"
                                                     >{{ item.show_original_price_symbol }}{{ item.min_original_price }}
@@ -375,7 +377,7 @@ const text_line = computed(() => {
     if (['1', '6'].includes(theme.value)) {
         line = 'text-line-1';
     } else if (['0', '2', '3', '4', '5'].includes(theme.value)) {
-        line = 'text-line-2 multi-text';
+        line = 'text-line-2';
     }
     return line;
 });
@@ -392,6 +394,14 @@ const style_config = (typeface: string, size: number, color: string | object, ty
     let style = `font-weight:${typeface}; font-size: ${size}px;`;
     if (type == 'gradient') {
         style += button_gradient();
+    } else if (type == 'title') {
+        if (['1', '6'].includes(theme.value)) {
+            style += `line-height: ${size}px;height: ${size}px;color: ${color};`;
+        } else if (['0', '2', '3', '4', '5'].includes(theme.value)) {
+            style += `line-height: ${size > 0 ? size + 3 : 0}px;height: ${size > 0 ? (size + 3) * 2 : 0}px;color: ${color};`;
+        }
+    } else if (type == 'desc') {
+        style += `line-height: ${size}px;height: ${size}px;color: ${color};`;
     } else {
         style += `color: ${color};`;
     }
@@ -532,7 +542,7 @@ watchEffect(() => {
 .flex-img0 {
     height: auto;
     min-height: 11rem;
-    max-height: 12rem;
+    // max-height: 12rem;
     width: 11rem;
 }
 .flex-img1 {
diff --git a/src/components/model-seckill/index.vue b/src/components/model-seckill/index.vue
index 91a90797..8acec8e8 100644
--- a/src/components/model-seckill/index.vue
+++ b/src/components/model-seckill/index.vue
@@ -52,10 +52,13 @@
                                     </div>
                                 </div>
                             </template>
-                            <div class="flex-col gap-10 w flex-1 jc-sb" :style="content_style">
+                            <div v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('original_price') || form.is_shop_show == '1'" 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 multi-text">{{ item.title }}</div>
+                                    <div v-if="is_show('title') || is_show('simple_desc')" class="flex-col" :style="`gap: ${ new_style.title_simple_desc_spacing }px;`">
+                                        <div v-if="is_show('title')" :style="trends_config('title', 'title')" class="text-line-2">{{ item.title }}</div>
+                                        <div v-if="is_show('simple_desc')" class="text-line-1" :style="trends_config('simple_desc', 'desc')">{{ item.simple_desc }}</div>
+                                    </div>
                                     <!-- 进度条 -->
                                     <!-- <div v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
                                         <div class="re flex-1">
@@ -113,10 +116,13 @@
                                     </div>
                                 </div>
                             </template>
-                            <div class="flex-col gap-10 w flex-1 jc-sb" :style="content_style">
+                            <div v-if="is_show('title') || is_show('simple_desc') || is_show('price') || is_show('original_price') || form.is_shop_show == '1'" 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 multi-text">{{ item.title }}</div>
+                                    <div v-if="is_show('title') || is_show('simple_desc')" class="flex-col" :style="`gap: ${ new_style.title_simple_desc_spacing }px;`">
+                                        <div v-if="is_show('title')" :style="trends_config('title', 'title')" class="text-line-2">{{ item.title }}</div>
+                                        <div v-if="is_show('simple_desc')" class="text-line-1" :style="trends_config('simple_desc', 'desc')">{{ item.simple_desc }}</div>
+                                    </div>
                                     <!-- 进度条 -->
                                     <div v-if="form.shop_style_type == '1'" class="flex-row align-c gap-6">
                                         <div class="re flex-1">
@@ -234,6 +240,7 @@ interface data_list {
     min_original_price: string;
     show_original_price_symbol: string;
     show_original_price_unit: string;
+    simple_desc: string;
     min_price: string;
     show_price_symbol: string;
     show_price_unit: string;
@@ -400,6 +407,10 @@ const style_config = (typeface: string, size: number, color: string | object, ty
     let style = `font-weight:${typeface}; font-size: ${size}px;`;
     if (type == 'gradient') {
         style += 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};`;
+    } else if (type == 'desc') {
+        style += `line-height: ${size}px;height: ${size}px;color: ${color};`;
     } else {
         style += `color: ${color};`;
     }
diff --git a/src/components/model-seckill/model-seckill-content.vue b/src/components/model-seckill/model-seckill-content.vue
index 3724838e..02337269 100644
--- a/src/components/model-seckill/model-seckill-content.vue
+++ b/src/components/model-seckill/model-seckill-content.vue
@@ -137,6 +137,7 @@ const base_list = {
     ],
     list_show_list: [
         { name: '商品名称', value: 'title'},
+        { name: '商品简述', value: 'simple_desc'},
         { name: '商品售价', value: 'price'},
         { name: '商品原价', value: 'original_price' },
         { name: '售价单位', value: 'price_unit' },
diff --git a/src/components/model-seckill/model-seckill-styles.vue b/src/components/model-seckill/model-seckill-styles.vue
index 9b37fd86..dee17605 100644
--- a/src/components/model-seckill/model-seckill-styles.vue
+++ b/src/components/model-seckill/model-seckill-styles.vue
@@ -4,7 +4,7 @@
             <template v-if="data.head_state == '1'">
                 <card-container>
                     <div class="mb-12">头部样式</div>
-                    <el-form-item v-if="data.topic_type == 'text'" label="标题设置">
+                    <el-form-item v-if="data.title_type == 'text'" label="标题设置">
                         <color-text-size-group v-model:color="form.title_color" v-model:size="form.title_size" :default-color="clone_form.title_color" :type-list="['color', 'size']"></color-text-size-group>
                     </el-form-item>
                     <el-form-item label="秒杀提示">
@@ -38,6 +38,13 @@
                 <el-form-item label="商品名称">
                     <color-text-size-group v-model:color="form.shop_title_color" v-model:typeface="form.shop_title_typeface" v-model:size="form.shop_title_size" default-color="#000000"></color-text-size-group>
                 </el-form-item>
+                <el-form-item label="商品简述">
+                    <color-text-size-group v-model:color="form.shop_simple_desc_color" v-model:size="form.shop_simple_desc_size" default-color="#999" :type-list="['color', 'size']">
+                        <el-form-item label="间距" label-width="40" class="mb-0 w form-item-child-label">
+                            <slider v-model="form.title_simple_desc_spacing" :max="100"></slider>
+                        </el-form-item>
+                    </color-text-size-group>
+                </el-form-item>
                 <el-form-item label="商品价格">
                     <color-text-size-group v-model:color="form.shop_price_color" v-model:typeface="form.shop_price_typeface" v-model:size="form.shop_price_size" default-color="#000000"></color-text-size-group>
                 </el-form-item>
diff --git a/src/config/const/seckill.ts b/src/config/const/seckill.ts
index 17628cfa..154ae90b 100644
--- a/src/config/const/seckill.ts
+++ b/src/config/const/seckill.ts
@@ -44,6 +44,10 @@ interface DefaultSeckill {
         shop_title_color: string;
         shop_title_typeface: string;
         shop_title_size: number;
+        shop_simple_desc_typeface: string;
+        shop_simple_desc_size: number;
+        shop_simple_desc_color: string;
+        title_simple_desc_spacing: 4,
         shop_price_typeface: string;
         shop_price_size: number;
         shop_price_color: string;
@@ -130,6 +134,10 @@ const defaultSeckill: DefaultSeckill = {
         shop_title_typeface: '500',
         shop_title_size: 14,
         shop_title_color: '#333333',
+        shop_simple_desc_typeface: '400',
+        shop_simple_desc_size: 12,    
+        shop_simple_desc_color: "#999",
+        title_simple_desc_spacing: 4,
         shop_price_typeface: '500',
         shop_price_size: 18,
         shop_price_color: '#EA3323;',