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

---
 src/components/model-seckill/index.vue        | 16 +++----
 .../model-seckill/model-seckill-content.vue   |  5 ++
 .../model-seckill/model-seckill-styles.vue    | 46 +++++++++++++------
 src/config/const/seckill.ts                   | 16 ++++++-
 4 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/src/components/model-seckill/index.vue b/src/components/model-seckill/index.vue
index d128230d..87b6365b 100644
--- a/src/components/model-seckill/index.vue
+++ b/src/components/model-seckill/index.vue
@@ -73,12 +73,12 @@
                                     <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) || typeof item.min_price == 'number')" 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 v-if="form.shop_style_type == '1'" class="size-10 pr-4">{{ form.seckill_pirce_title }}</span>
+                                                <span :style="trends_config('price_symbol')">{{ 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>
+                                                <span v-if="is_show('price_unit')" :style="trends_config('price_unit')">{{ item.show_price_unit }}</span>
                                             </div>
-                                            <div v-if="is_show('original_price') && (!isEmpty(item.min_original_price) || typeof item.min_original_price == 'number')" class="size-11 flex" :style="`color: ${new_style.original_price_color}`">
+                                            <div v-if="is_show('original_price') && (!isEmpty(item.min_original_price) || typeof item.min_original_price == 'number')" class="size-11 flex" :style="trends_config('original_price')">
                                                 <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')">
@@ -137,11 +137,11 @@
                                     </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) || typeof item.min_price == 'number')" 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
+                                            <div v-if="is_show('price') && (!isEmpty(item.min_price) || typeof item.min_price == 'number')" class="num" :style="trends_config('original_price')">
+                                                <span v-if="form.shop_style_type == '1'" class="size-10 pr-4">{{ form.seckill_pirce_title }}</span>
+                                                <span :style="trends_config('price_symbol')">{{ 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>
+                                                <span v-if="is_show('price_unit')" :style="trends_config('price_unit')">{{ item.show_price_unit }}</span>
                                             </div>
                                             <div v-if="is_show('original_price') && (!isEmpty(item.min_original_price) || typeof item.min_original_price == 'number')" class="size-11 flex" :style="`color: ${new_style.original_price_color}`">
                                                 <span class="original-price text-line-1 flex-1"
diff --git a/src/components/model-seckill/model-seckill-content.vue b/src/components/model-seckill/model-seckill-content.vue
index 83d7bf68..7e110ace 100644
--- a/src/components/model-seckill/model-seckill-content.vue
+++ b/src/components/model-seckill/model-seckill-content.vue
@@ -64,6 +64,11 @@
                         <el-checkbox v-for="item in base_list.list_show_list" :key="item.value" :value="item.value">{{ item.name }}</el-checkbox>
                     </el-checkbox-group>
                 </el-form-item>
+                <template v-if="form.shop_style_type == '1'">
+                    <el-form-item label="秒杀名称">
+                        <el-input v-model="form.seckill_pirce_title" placeholder="请输入秒杀名称"></el-input>
+                    </el-form-item>
+                </template>
                 <el-form-item label="秒杀按钮">
                     <el-row class="w">
                         <el-col :span="24"><el-switch v-model="form.is_shop_show" active-value="1" inactive-value="0"></el-switch></el-col>
diff --git a/src/components/model-seckill/model-seckill-styles.vue b/src/components/model-seckill/model-seckill-styles.vue
index d57ccb92..bc6527b9 100644
--- a/src/components/model-seckill/model-seckill-styles.vue
+++ b/src/components/model-seckill/model-seckill-styles.vue
@@ -52,22 +52,38 @@
                         <upload v-model="form.shop_background_img" :limit="1" @update:model-value="shop_background_img_change"></upload>
                     </div>
                 </el-form-item>
-                <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>
+                <template v-if="data.is_show.includes('title')">
+                    <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>
+                </template>
+                <template v-if="data.is_show.includes('simple_desc')">
+                    <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>
+                </template>
+                <template v-if="data.is_show.includes('price')">
+                    <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>
+                    <el-form-item label="售价符号">
+                        <color-text-size-group v-model:color="form.shop_price_symbol_color" v-model:size="form.shop_price_symbol_size" default-color="#EA3323" :type-list="['color', 'size']"></color-text-size-group>
+                    </el-form-item>
+                    <template v-if="data.is_show.includes('price_unit')">
+                        <el-form-item label="售价单位">
+                            <color-text-size-group v-model:color="form.shop_price_unit_color" v-model:size="form.shop_price_unit_size" default-color="#EA3323" :type-list="['color', 'size']"></color-text-size-group>
                         </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>
-                <el-form-item label="原价价格">
-                    <color-picker v-model="form.original_price_color"></color-picker>
-                </el-form-item>
+                    </template>
+                </template> 
+                <template v-if="data.is_show.includes('original_price')">
+                    <el-form-item label="原价价格">
+                        <color-text-size-group v-model:color="form.shop_original_price_color" v-model:size="form.shop_original_price_size" default-color="#999" :type-list="['color', 'size']"></color-text-size-group>
+                    </el-form-item>
+                </template>
                 <el-form-item label="内容圆角">
                     <radius :value="form.shop_radius"></radius>
                 </el-form-item>
diff --git a/src/config/const/seckill.ts b/src/config/const/seckill.ts
index 3a8e9fc2..0118718e 100644
--- a/src/config/const/seckill.ts
+++ b/src/config/const/seckill.ts
@@ -13,6 +13,7 @@ interface DefaultSeckill {
         button_status: string;
         button_text: string;
         shop_style_type: string;
+        seckill_pirce_title: string;
         carousel_col: number;
         shop_number: number;
         is_show: string[];
@@ -63,13 +64,18 @@ interface DefaultSeckill {
         shop_price_typeface: string;
         shop_price_size: number;
         shop_price_color: string;
+        shop_price_symbol_color: string;
+        shop_price_symbol_size: number;
+        shop_price_unit_color: string;
+        shop_price_unit_size: number;
+        shop_original_price_color: string;
+        shop_original_price_size: number;
         shop_button_typeface: string;
         shop_button_size: number;
         shop_button_color: color_list[];
         shop_button_text_color: string;
         shop_icon_size: number;
         shop_icon_color: string;
-        original_price_color: string;
         subscript_style: object,
         progress_bg_color: string;
         progress_actived_color_list: color_list[];
@@ -98,6 +104,7 @@ const defaultSeckill: DefaultSeckill = {
         button_text: '更多',
         // 风格类型
         shop_style_type: '1',
+        seckill_pirce_title: '秒杀价',
         // 轮播数量
         carousel_col: 3,
         shop_number: 10,
@@ -191,6 +198,12 @@ const defaultSeckill: DefaultSeckill = {
         shop_price_typeface: '500',
         shop_price_size: 18,
         shop_price_color: '#EA3323;',
+        shop_price_symbol_color: '#EA3323',
+        shop_price_symbol_size: 9,
+        shop_price_unit_color: '#EA3323',
+        shop_price_unit_size: 9,
+        shop_original_price_color: '#999',
+        shop_original_price_size: 12,
         shop_button_typeface: '400',
         shop_button_size: 12,
         shop_button_color: [
@@ -206,7 +219,6 @@ const defaultSeckill: DefaultSeckill = {
         shop_button_text_color: '#fff',
         shop_icon_size: 10,
         shop_icon_color: '#fff',
-        original_price_color: '#999',
         subscript_style: subscriptStyle,
         // 进度条设置，暂时隐藏
         progress_bg_color: '#FFEDED',