From e4c8e00f8d8e8b20b4a13001c2d6330fad0e23fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 27 Aug 2024 10:52:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E9=80=89=E9=A1=B9=E5=8D=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/text-size-type/index.vue           |  4 +--
 .../model-article-tabs-styles.vue             | 26 ++++++-------------
 .../model-data-magic-content.vue              |  4 +--
 .../model-shop-tabs-styles.vue                | 16 ++++++------
 .../model-tabs/model-tabs-styles.vue          |  4 +--
 src/layout/components/main/default/notice.ts  |  4 +--
 .../components/main/default/shop-list.ts      |  6 ++---
 .../components/main/default/shop-tabs.ts      |  6 ++---
 8 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/src/components/common/text-size-type/index.vue b/src/components/common/text-size-type/index.vue
index cb43df99..18e57a9f 100644
--- a/src/components/common/text-size-type/index.vue
+++ b/src/components/common/text-size-type/index.vue
@@ -10,7 +10,7 @@
 <script setup lang="ts">
 const typeface = defineModel('typeface', {
     type: String,
-    default: 'normal'
+    default: '400'
 });
 const size = defineModel('size', {
     type: Number,
@@ -19,7 +19,7 @@ const size = defineModel('size', {
 
 const font_weight = [
     { name: '加粗', value: '500' },
-    { name: '正常', value: 'normal' },
+    { name: '正常', value: '400' },
 ];
 </script>
 
diff --git a/src/components/model-article-tabs/model-article-tabs-styles.vue b/src/components/model-article-tabs/model-article-tabs-styles.vue
index 9762d32e..0a3ea543 100644
--- a/src/components/model-article-tabs/model-article-tabs-styles.vue
+++ b/src/components/model-article-tabs/model-article-tabs-styles.vue
@@ -7,26 +7,16 @@
                     <mult-color-picker :value="form.tabs_checked" :type="form.tabs_direction" @update:value="tabs_checked_event"></mult-color-picker>
                 </el-form-item>
                 <el-form-item label="选中文字">
-                    <el-radio-group v-model="form.tabs_weight_checked">
-                        <el-radio v-for="item in font_weight" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="字号">
-                    <slider v-model="form.tabs_size_checked"></slider>
-                </el-form-item>
-                <el-form-item label="文字色值">
-                    <color-picker v-model="form.tabs_color_checked"></color-picker>
+                    <div class="flex-col w h gap-10">
+                        <color-picker v-model="form.tabs_color_checked" default-color="rgba(51,51,51,1)"></color-picker>
+                        <text-size-type v-model:typeface="form.tabs_weight_checked" v-model:size="form.tabs_size_checked"></text-size-type>
+                    </div>
                 </el-form-item>
                 <el-form-item label="未选文字">
-                    <el-radio-group v-model="form.tabs_weight">
-                        <el-radio v-for="item in font_weight" :key="item.value" :value="item.value">{{ item.name }}</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="字号">
-                    <slider v-model="form.tabs_size"></slider>
-                </el-form-item>
-                <el-form-item label="文字色值">
-                    <color-picker v-model="form.tabs_color"></color-picker>
+                    <div class="flex-col w h gap-10">
+                        <color-picker v-model="form.tabs_color" default-color="rgba(51,51,51,1)"></color-picker>
+                        <text-size-type v-model:typeface="form.tabs_weight" v-model:size="form.tabs_size"></text-size-type>
+                    </div>
                 </el-form-item>
             </card-container>
             <card-container class="mb-8">
diff --git a/src/components/model-data-magic/model-data-magic-content.vue b/src/components/model-data-magic/model-data-magic-content.vue
index 0537a211..641a8071 100644
--- a/src/components/model-data-magic/model-data-magic-content.vue
+++ b/src/components/model-data-magic/model-data-magic-content.vue
@@ -63,10 +63,10 @@ const data_style = {
     rotation_direction: 'horizontal',
     interval_time: 2,
     heading_color: '#000',
-    heading_typeface: 'normal',
+    heading_typeface: '400',
     heading_size: 20,
     subtitle_color: '#FF852A',
-    subtitle_typeface: 'normal',
+    subtitle_typeface: '400',
     subtitle_size: 14,
     chunk_padding: {
         padding: 0,
diff --git a/src/components/model-shop-tabs/model-shop-tabs-styles.vue b/src/components/model-shop-tabs/model-shop-tabs-styles.vue
index 6a746328..5b1a6fe0 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-styles.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-styles.vue
@@ -7,16 +7,16 @@
                     <mult-color-picker :value="form.tabs_checked" :type="form.tabs_direction" @update:value="tabs_checked_event"></mult-color-picker>
                 </el-form-item>
                 <el-form-item label="选中文字">
-                    <text-size-type v-model:typeface="form.tabs_weight_checked" v-model:size="form.tabs_size_checked"></text-size-type>
-                </el-form-item>
-                <el-form-item label="文字色值">
-                    <color-picker v-model="form.tabs_color_checked" default-color="rgba(51,51,51,1)"></color-picker>
+                    <div class="flex-col w h gap-10">
+                        <color-picker v-model="form.tabs_color_checked" default-color="rgba(51,51,51,1)"></color-picker>
+                        <text-size-type v-model:typeface="form.tabs_weight_checked" v-model:size="form.tabs_size_checked"></text-size-type>
+                    </div>
                 </el-form-item>
                 <el-form-item label="未选文字">
-                    <text-size-type v-model:typeface="form.tabs_weight" v-model:size="form.tabs_size"></text-size-type>
-                </el-form-item>
-                <el-form-item label="文字色值">
-                    <color-picker v-model="form.tabs_color" default-color="#000000"></color-picker>
+                    <div class="flex-col w h gap-10">
+                        <color-picker v-model="form.tabs_color" default-color="rgba(51,51,51,1)"></color-picker>
+                        <text-size-type v-model:typeface="form.tabs_weight" v-model:size="form.tabs_size"></text-size-type>
+                    </div>
                 </el-form-item>
             </card-container>
             <card-container class="mb-8">
diff --git a/src/components/model-tabs/model-tabs-styles.vue b/src/components/model-tabs/model-tabs-styles.vue
index 7c94d943..95b39348 100644
--- a/src/components/model-tabs/model-tabs-styles.vue
+++ b/src/components/model-tabs/model-tabs-styles.vue
@@ -8,13 +8,13 @@
                 </el-form-item>
                 <el-form-item label="选中文字" class="">
                     <div class="flex-col w h gap-10">
-                        <color-picker v-model="form.tabs_color_checked" default-color="#000000"></color-picker>
+                        <color-picker v-model="form.tabs_color_checked" default-color="rgba(51,51,51,1)"></color-picker>
                         <text-size-type v-model:typeface="form.tabs_weight_checked" v-model:size="form.tabs_size_checked"></text-size-type>
                     </div>
                 </el-form-item>
                 <el-form-item label="未选文字">
                     <div class="flex-col w h gap-10">
-                        <color-picker v-model="form.tabs_color" default-color="#000000"></color-picker>
+                        <color-picker v-model="form.tabs_color" default-color="rgba(51,51,51,1)"></color-picker>
                         <text-size-type v-model:typeface="form.tabs_weight" v-model:size="form.tabs_size"></text-size-type>
                     </div>
                 </el-form-item>
diff --git a/src/layout/components/main/default/notice.ts b/src/layout/components/main/default/notice.ts
index ca0de4dc..ff65e7e5 100644
--- a/src/layout/components/main/default/notice.ts
+++ b/src/layout/components/main/default/notice.ts
@@ -54,7 +54,7 @@ const defaultSearch: defaultSearch = {
     },
     style: {
         news_color: '#000',
-        news_typeface: 'normal',
+        news_typeface: '400',
         news_size: 12,
         topic_color_list: [
             {
@@ -67,7 +67,7 @@ const defaultSearch: defaultSearch = {
             },
         ],
         topic_color: '#000',
-        topic_typeface: 'normal',
+        topic_typeface: '400',
         topic_size: 14,
         topic_width: 24,
         topic_height: 24,
diff --git a/src/layout/components/main/default/shop-list.ts b/src/layout/components/main/default/shop-list.ts
index f2c9c5cb..766d2217 100644
--- a/src/layout/components/main/default/shop-list.ts
+++ b/src/layout/components/main/default/shop-list.ts
@@ -93,13 +93,13 @@ const defaultProductList: DefaultProductList = {
         shop_price_typeface: '500',
         shop_price_size: 18,
         shop_price_color: "#EA3323;",
-        shop_sold_number_typeface: 'normal',
+        shop_sold_number_typeface: '400',
         shop_sold_number_size: 10,
         shop_sold_number_color: "#999999",
-        shop_score_typeface: 'normal',
+        shop_score_typeface: '400',
         shop_score_size: 10,
         shop_score_color: "#999999",
-        shop_button_typeface:'normal',
+        shop_button_typeface:'400',
         shop_button_size: 12,
         shop_button_color: [
             {
diff --git a/src/layout/components/main/default/shop-tabs.ts b/src/layout/components/main/default/shop-tabs.ts
index abaf3ae6..317659fe 100644
--- a/src/layout/components/main/default/shop-tabs.ts
+++ b/src/layout/components/main/default/shop-tabs.ts
@@ -117,13 +117,13 @@ const defaultProductList: DefaultProductList = {
         shop_price_typeface: '500',
         shop_price_size: 18,
         shop_price_color: "#EA3323;",
-        shop_sold_number_typeface: 'normal',
+        shop_sold_number_typeface: '400',
         shop_sold_number_size: 10,
         shop_sold_number_color: "#999999",
-        shop_score_typeface: 'normal',
+        shop_score_typeface: '400',
         shop_score_size: 10,
         shop_score_color: "#999999",
-        shop_button_typeface:'normal',
+        shop_button_typeface:'400',
         shop_button_size: 12,
         shop_button_color: [
             {