From dd4989c118b73786f866c2e67d95588e36b58300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Wed, 4 Sep 2024 15:50:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=92=E6=9D=80=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=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                | 9 ++++-----
 src/components/model-seckill/model-seckill-styles.vue | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/model-seckill/index.vue b/src/components/model-seckill/index.vue
index 39775304..debcb4cb 100644
--- a/src/components/model-seckill/index.vue
+++ b/src/components/model-seckill/index.vue
@@ -34,7 +34,7 @@
                 <div class="flex flex-wrap" :style="`gap: ${ content_outer_spacing }px;`">
                     <div v-for="(item, index) in list" :key="index" :class="layout_type" :style="`${ content_radius }; ${ shop_style_type == '1' ? content_padding : '' }`">
                         <template v-if="!isEmpty(item)">
-                            <div class="oh re">
+                            <div class="oh re" :class="`flex-img${shop_style_type}`">
                                 <template v-if="!isEmpty(item.new_cover)">
                                     <image-empty v-model="item.new_cover[0]" :class="`flex-img${shop_style_type}`" :style="content_img_radius"></image-empty>
                                 </template>
@@ -60,7 +60,7 @@
                             <div class="flex-row align-e gap-10 jc-sb">
                                 <div class="flex-col gap-5">
                                     <div v-if="is_show('price')" class="num" :style="`color: ${new_style.shop_price_color}`">
-                                        <span v-if="form.shop_style_type == '1'" class="size-10 pl-4">秒杀价</span>
+                                        <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>
@@ -102,7 +102,7 @@
                 >
                     <swiper-slide v-for="(item, index) in list" :key="index" :class="layout_type" :style="`${ content_radius }; ${ shop_style_type == '1' ? content_padding : '' }`">
                         <template v-if="!isEmpty(item)">
-                            <div class="oh re">
+                            <div class="oh re w h">
                                 <template v-if="!isEmpty(item.new_cover)">
                                     <image-empty v-model="item.new_cover[0]" :class="`flex-img${shop_style_type}`" :style="content_img_radius"></image-empty>
                                 </template>
@@ -128,7 +128,7 @@
                             <div class="flex-row align-e gap-10 jc-sb">
                                 <div class="flex-col gap-5">
                                     <div v-if="is_show('price')" class="num" :style="`color: ${new_style.shop_price_color}`">
-                                        <span v-if="form.shop_style_type == '1'" class="size-10 pl-4">秒杀价</span>
+                                        <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>
@@ -439,7 +439,6 @@ const corner_marker = computed(() => {
 .flex-img3 {
     background: #f4fcff;
     width: 100%;
-    min-height: 10.4rem;
 }
 .slide-bottom {
     height: 1rem;
diff --git a/src/components/model-seckill/model-seckill-styles.vue b/src/components/model-seckill/model-seckill-styles.vue
index 1e7a21b3..4ed5048d 100644
--- a/src/components/model-seckill/model-seckill-styles.vue
+++ b/src/components/model-seckill/model-seckill-styles.vue
@@ -59,8 +59,8 @@
                 <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-picker v-model="form.price_color"></color-picker>
+                <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>