From d5af5ebbebab41be65c09bad39335b91dd1ae36e 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, 5 Sep 2024 18:00:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/color-text-size-group/index.vue    |  8 +---
 .../model-notice/model-notice-styles.vue      | 14 ++-----
 .../model-seckill/model-seckill-content.vue   |  1 -
 .../model-seckill/model-seckill-styles.vue    | 38 +++++++++----------
 src/styles/index.scss                         |  7 ++++
 5 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/src/components/common/color-text-size-group/index.vue b/src/components/common/color-text-size-group/index.vue
index 75063f8a..3f114aa7 100644
--- a/src/components/common/color-text-size-group/index.vue
+++ b/src/components/common/color-text-size-group/index.vue
@@ -4,7 +4,7 @@
         <el-radio-group v-if="typeList.includes('typeface')" v-model="typeface">
             <el-radio v-for="item in font_weight" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
         </el-radio-group>
-        <el-form-item v-if="typeList.includes('size')" label="字号" label-width="40" class="mb-0 w word-size">
+        <el-form-item v-if="typeList.includes('size')" label="字号" label-width="40" class="mb-0 w form-item-child-label">
             <slider v-model="size" :max="100"></slider>
         </el-form-item>
     </div>
@@ -39,10 +39,4 @@ const font_weight = [
 </script>
 
 <style lang="scss" scoped>
-.word-size {
-    :deep(.el-form-item__label) {
-        color: #999;
-        font-size: 1.2rem;
-    }
-}
 </style>
\ No newline at end of file
diff --git a/src/components/model-notice/model-notice-styles.vue b/src/components/model-notice/model-notice-styles.vue
index 8447908f..e293bb78 100644
--- a/src/components/model-notice/model-notice-styles.vue
+++ b/src/components/model-notice/model-notice-styles.vue
@@ -15,10 +15,10 @@
                     <template v-if="!isEmpty(substance.icon_class)">
                         <el-form-item label="左侧图标">
                             <div class="flex-col w gap-10">
-                                <el-form-item label="大小" label-width="40" class="word-size">
+                                <el-form-item label="大小" label-width="40" class="form-item-child-label">
                                     <slider v-model="form.icon_size" :max="100"></slider>
                                 </el-form-item>
-                                <el-form-item label="颜色" label-width="40" class="word-size">
+                                <el-form-item label="颜色" label-width="40" class="form-item-child-label">
                                     <color-picker v-model="form.icon_color" default-color="#999"></color-picker>
                                 </el-form-item>
                             </div>
@@ -27,10 +27,10 @@
                     <template v-else>
                         <el-form-item label="左侧图片">
                             <div class="flex-col w gap-10">
-                                <el-form-item label="宽度" label-width="40" class="word-size">
+                                <el-form-item label="宽度" label-width="40" class="form-item-child-label">
                                     <slider v-model="form.title_width" :max="1000"></slider>
                                 </el-form-item>
-                                <el-form-item label="高度" label-width="40" class="word-size">
+                                <el-form-item label="高度" label-width="40" class="form-item-child-label">
                                     <slider v-model="form.title_height" :max="1000"></slider>
                                 </el-form-item>
                             </div>
@@ -125,10 +125,4 @@ const mult_color_picker_event = (arry: color_list[], type: number) => {
         flex-direction: column;
     }
 }
-.word-size {
-    :deep(.el-form-item__label) {
-        color: #999;
-        font-size: 1.2rem;
-    }
-}
 </style>
diff --git a/src/components/model-seckill/model-seckill-content.vue b/src/components/model-seckill/model-seckill-content.vue
index adaf510c..8bea6998 100644
--- a/src/components/model-seckill/model-seckill-content.vue
+++ b/src/components/model-seckill/model-seckill-content.vue
@@ -38,7 +38,6 @@
                             <el-input v-model="form.button_text" placeholder="请输入按钮文字"></el-input>
                         </el-form-item>
                     </template>
-                    
                 </template>
             </card-container>
             <div class="divider-line"></div>
diff --git a/src/components/model-seckill/model-seckill-styles.vue b/src/components/model-seckill/model-seckill-styles.vue
index fdda450a..5067b844 100644
--- a/src/components/model-seckill/model-seckill-styles.vue
+++ b/src/components/model-seckill/model-seckill-styles.vue
@@ -50,12 +50,6 @@
             </template>
             <card-container>
                 <div class="mb-12">商品样式</div>
-                <el-form-item label="内容圆角">
-                    <radius :value="form.shop_radius"></radius>
-                </el-form-item>
-                <el-form-item label="图片圆角">
-                    <radius :value="form.shop_img_radius"></radius>
-                </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>
@@ -65,6 +59,25 @@
                 <el-form-item label="原价价格">
                     <color-picker v-model="form.original_price_color"></color-picker>
                 </el-form-item>
+                <el-form-item label="秒杀角标">
+                    <div class="flex-col gap-10">
+                        <el-radio-group v-model="form.seckill_subscript_location">
+                            <el-radio v-for="item in base_list.location_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
+                        </el-radio-group>
+                        <el-form-item label="文字" label-width="40" class="form-item-child-label">
+                            <color-picker v-model="form.seckill_subscript_text_color"></color-picker>
+                        </el-form-item>
+                        <el-form-item label="背景" label-width="40" class="form-item-child-label">
+                            <color-picker v-model="form.seckill_subscript_bg_color"></color-picker>
+                        </el-form-item>
+                    </div>
+                </el-form-item>
+                <el-form-item label="内容圆角">
+                    <radius :value="form.shop_radius"></radius>
+                </el-form-item>
+                <el-form-item label="图片圆角">
+                    <radius :value="form.shop_img_radius"></radius>
+                </el-form-item>
                 <el-form-item label="内间距">
                     <padding :value="form.shop_padding"></padding>
                 </el-form-item>
@@ -79,19 +92,6 @@
                         <slider v-model="form.content_outer_height" :max="1000"></slider>
                     </el-form-item>
                 </template>
-                <el-form-item label="秒杀角标">
-                    <div class="flex-col gap-10">
-                        <el-radio-group v-model="form.seckill_subscript_location">
-                            <el-radio v-for="item in base_list.location_list" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
-                        </el-radio-group>
-                        <el-form-item label="文字" style="color: #333;" label-width="40">
-                            <color-picker v-model="form.seckill_subscript_text_color"></color-picker>
-                        </el-form-item>
-                        <el-form-item label="背景" style="color: #333;" label-width="40">
-                            <color-picker v-model="form.seckill_subscript_bg_color"></color-picker>
-                        </el-form-item>
-                    </div>
-                </el-form-item>
             </card-container>
             <!-- 秒杀按钮 -->
             <template v-if="data.is_shop_show == '1'">
diff --git a/src/styles/index.scss b/src/styles/index.scss
index b9e0292a..263fef27 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -205,3 +205,10 @@ p {
     --el-loading-spinner-size: 13rem;
     --el-loading-fullscreen-spinner-size: 13rem;
 }
+// el-form-item 子级form-item label样式调整
+.form-item-child-label {
+    .el-form-item__label {
+        color: #999;
+        font-size: 1.2rem;
+    }
+}