From 75823041000f7ffdeecf2c73bdb2634c4e3e1ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com> Date: Mon, 13 Jan 2025 16:51:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E7=B2=97=E7=9A=84?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/qrcode/index.vue | 2 +- .../common/color-text-size-group/index.vue | 2 +- .../common/custom-module/model-text/index.vue | 4 +-- .../model-text/model-text-style.vue | 2 +- .../common/product-show-config/index.vue | 2 +- .../model-article-list-content.vue | 2 +- .../model-article-tabs-content.vue | 2 +- src/components/model-coupon/index.vue | 32 +++++++++---------- .../model-data-magic-content.vue | 4 +-- .../model-seckill/model-seckill-setting.vue | 4 +-- src/components/model-title/index.vue | 8 ++--- .../model-title/model-title-styles.vue | 4 +-- src/components/model-user-info/index.vue | 4 +-- .../model-user-info-styles.vue | 2 +- src/components/page-settings/page-setting.vue | 2 +- src/config/const/article-list.ts | 2 +- src/config/const/article-tabs.ts | 6 ++-- src/config/const/goods-list.ts | 4 +-- src/config/const/goods-tabs.ts | 8 ++--- src/config/const/header-nav.ts | 2 +- src/config/const/seckill.ts | 4 +-- src/config/const/tabs-carousel.ts | 4 +-- src/config/const/tabs.ts | 4 +-- src/config/const/user-info.ts | 4 +-- src/styles/common.scss | 2 +- .../layout/components/settings/index.vue | 2 +- .../tabbar/components/settings/index.vue | 2 +- 27 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/components/base/qrcode/index.vue b/src/components/base/qrcode/index.vue index 147933f8..57dc66c6 100644 --- a/src/components/base/qrcode/index.vue +++ b/src/components/base/qrcode/index.vue @@ -84,7 +84,7 @@ onMounted(() => { inset: 0; z-index: 1; color: #fff; - font-weight: 500; + font-weight: bold; display: flex; align-items: center; justify-content: center; diff --git a/src/components/common/color-text-size-group/index.vue b/src/components/common/color-text-size-group/index.vue index 5083ef16..6e6814c7 100644 --- a/src/components/common/color-text-size-group/index.vue +++ b/src/components/common/color-text-size-group/index.vue @@ -39,7 +39,7 @@ const size = defineModel('size', { }); const font_weight = [ - { name: '加粗', value: '500' }, + { name: '加粗', value: 'bold' }, { name: '正常', value: '400' }, ]; diff --git a/src/components/common/custom-module/model-text/index.vue b/src/components/common/custom-module/model-text/index.vue index fc5daf1b..5b7ca57e 100644 --- a/src/components/common/custom-module/model-text/index.vue +++ b/src/components/common/custom-module/model-text/index.vue @@ -175,8 +175,8 @@ const text_style = computed(() => { let style = `font-size: ${ form.value.text_size * props.scale }px;line-height: ${ (typeof form.value.line_text_size === "number" ? form.value.line_text_size : form.value.text_size) * props.scale}px;color: ${ form.value.text_color }; text-align: ${ form.value.text_location }; transform: rotate(${form.value.text_rotate}deg);text-decoration: ${ form.value.text_option };${ padding_computer(form.value.text_padding, props.scale) };`; if (form.value.text_weight == 'italic') { style += `font-style: italic`; - } else if (form.value.text_weight == '500') { - style += `font-weight: 500`; + } else if (['bold', '500'].includes(form.value.text_weight)) { + style += `font-weight: bold;`; } return style; }); diff --git a/src/components/common/custom-module/model-text/model-text-style.vue b/src/components/common/custom-module/model-text/model-text-style.vue index 9ee3188d..a32ab649 100644 --- a/src/components/common/custom-module/model-text/model-text-style.vue +++ b/src/components/common/custom-module/model-text/model-text-style.vue @@ -45,7 +45,7 @@ - 加粗 + 加粗 正常 倾斜 diff --git a/src/components/common/product-show-config/index.vue b/src/components/common/product-show-config/index.vue index 42882b3b..2e89bf23 100644 --- a/src/components/common/product-show-config/index.vue +++ b/src/components/common/product-show-config/index.vue @@ -109,7 +109,7 @@ const change_shop_type = () => { display: flex; align-items: flex-end; justify-content: center; - font-weight: 700; + font-weight: bold; } } :deep(.el-checkbox-group .el-checkbox){ diff --git a/src/components/model-article-list/model-article-list-content.vue b/src/components/model-article-list/model-article-list-content.vue index c4b86018..8a6dcf9a 100644 --- a/src/components/model-article-list/model-article-list-content.vue +++ b/src/components/model-article-list/model-article-list-content.vue @@ -207,7 +207,7 @@ const switch_chage = (val: string | number | boolean) => { data.value.name_weight = '400'; } else { data.value.name_color = '#333'; - data.value.name_weight = '500'; + data.value.name_weight = 'bold'; } }; diff --git a/src/components/model-article-tabs/model-article-tabs-content.vue b/src/components/model-article-tabs/model-article-tabs-content.vue index 13dbc3a3..e86a67d3 100644 --- a/src/components/model-article-tabs/model-article-tabs-content.vue +++ b/src/components/model-article-tabs/model-article-tabs-content.vue @@ -323,7 +323,7 @@ const switch_chage = (val: string | number | boolean) => { styles.name_weight = '400'; } else { styles.name_color = '#333'; - styles.name_weight = '500'; + styles.name_weight = 'bold'; } }; diff --git a/src/components/model-coupon/index.vue b/src/components/model-coupon/index.vue index dfad3dc1..a7316464 100644 --- a/src/components/model-coupon/index.vue +++ b/src/components/model-coupon/index.vue @@ -316,7 +316,7 @@ const theme_7_background_style = computed(() => { .number { font-size: 3rem; line-height: 2.4rem; - font-weight: 500; + font-weight: bold; padding: 0 0.4rem; } } @@ -365,14 +365,14 @@ const theme_7_background_style = computed(() => { } .number { font-size: 2.6rem; - font-weight: 500; + font-weight: bold; padding: 0 0.4rem; } } .name { font-size: 0.8rem; color: v-bind('theme_style.name_color'); - font-weight: 500; + font-weight: bold; margin-bottom: 0.4rem; } .desc { @@ -453,12 +453,12 @@ const theme_7_background_style = computed(() => { .name { font-size: 1.8rem; color: v-bind('theme_style.name_color'); - font-weight: 500; + font-weight: bold; line-height: 2.5rem; } .desc { font-size: 1.4rem; - font-weight: 500; + font-weight: bold; color: v-bind('theme_style.desc_color'); line-height: 2rem; } @@ -490,7 +490,7 @@ const theme_7_background_style = computed(() => { color: v-bind('theme_style.btn_color'); position: relative; font-size: 1.8rem; - font-weight: 500; + font-weight: bold; text-align: center; .icon { font-size: 2rem; @@ -596,7 +596,7 @@ const theme_7_background_style = computed(() => { } .title { font-size: 1.6rem; - font-weight: 500; + font-weight: bold; color: v-bind('theme_style.content_title_color'); line-height: 2.2rem; } @@ -650,11 +650,11 @@ const theme_7_background_style = computed(() => { margin-bottom: 0.5rem; .symbol { font-size: 1.2rem; - font-weight: 500; + font-weight: bold; } .number { font-size: 2.4rem; - font-weight: 500; + font-weight: bold; line-height: 20px; padding-left: 0.4rem; } @@ -682,7 +682,7 @@ const theme_7_background_style = computed(() => { color: v-bind('theme_style.btn_color'); position: relative; font-size: 1.2rem; - font-weight: 500; + font-weight: bold; text-align: center; letter-spacing: 0.2rem; } @@ -744,11 +744,11 @@ const theme_7_background_style = computed(() => { margin-bottom: 0.1rem; .symbol { font-size: 2rem; - font-weight: 500; + font-weight: bold; } .number { font-size: 3.2rem; - font-weight: 500; + font-weight: bold; line-height: 3.2rem; padding-left: 0.4rem; } @@ -766,7 +766,7 @@ const theme_7_background_style = computed(() => { position: relative; font-size: 1.4rem; line-height: 2.2rem; - font-weight: 500; + font-weight: bold; text-align: center; } } @@ -822,11 +822,11 @@ const theme_7_background_style = computed(() => { margin-bottom: 0.5rem; .symbol { font-size: 1.2rem; - font-weight: 500; + font-weight: bold; } .number { font-size: 2.4rem; - font-weight: 500; + font-weight: bold; line-height: 2rem; padding-left: 0.4rem; } @@ -857,7 +857,7 @@ const theme_7_background_style = computed(() => { width: 100%; color: v-bind('theme_style.btn_color'); font-size: 1rem; - font-weight: 500; + font-weight: bold; text-align: center; letter-spacing: 0.2rem; height: 100%; 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 7092575c..f3aee506 100644 --- a/src/components/model-data-magic/model-data-magic-content.vue +++ b/src/components/model-data-magic/model-data-magic-content.vue @@ -125,10 +125,10 @@ const data_style = { subtitle_color: '#FF852A', subtitle_typeface: '400', subtitle_size: 14, - goods_title_typeface: '500', + goods_title_typeface: 'bold', goods_title_size: 14, goods_title_color: "#333333", - goods_price_typeface: '500', + goods_price_typeface: 'bold', goods_price_size: 18, goods_price_color: "#EA3323;", goods_color_list: [{ color: '', color_percentage: undefined }], diff --git a/src/components/model-seckill/model-seckill-setting.vue b/src/components/model-seckill/model-seckill-setting.vue index 0c59ad43..391bbd7a 100644 --- a/src/components/model-seckill/model-seckill-setting.vue +++ b/src/components/model-seckill/model-seckill-setting.vue @@ -84,10 +84,10 @@ onBeforeMount(async () => { content_outer_spacing: 10, // 商品间距 content_spacing: 10, content_outer_height: 232, - shop_title_typeface: '500', + shop_title_typeface: 'bold', shop_title_size: 14, shop_title_color: "#333333", - shop_price_typeface: '500', + shop_price_typeface: 'bold', shop_price_size: 18, shop_price_color: "#EA3323;", shop_button_typeface:'400', diff --git a/src/components/model-title/index.vue b/src/components/model-title/index.vue index 1cc99cc0..baa0e424 100644 --- a/src/components/model-title/index.vue +++ b/src/components/model-title/index.vue @@ -60,8 +60,8 @@ const title_style = computed(() => { let common_styles = ''; if (new_style.value.title_weight == 'italic') { common_styles += `font-style: italic`; - } else if (new_style.value.title_weight == '500') { - common_styles += `font-weight: 500`; + } else if (['bold', '500'].includes(new_style.value.title_weight)) { + common_styles += `font-weight: bold;`; } return `color:${new_style.value.title_color}; font-size: ${new_style.value.title_size}px; ${common_styles}`; }); @@ -70,8 +70,8 @@ const subtitle_style = computed(() => { let common_styles = ''; if (new_style.value.subtitle_weight == 'italic') { common_styles += `font-style: italic`; - } else if (new_style.value.subtitle_weight == '500') { - common_styles += `font-weight: 500`; + } else if (['bold', '500'].includes(new_style.value.subtitle_weight)) { + common_styles += `font-weight: bold;`; } return `color:${new_style.value.subtitle_color}; font-size: ${new_style.value.subtitle_size}px; ${common_styles}`; }); diff --git a/src/components/model-title/model-title-styles.vue b/src/components/model-title/model-title-styles.vue index c14072c3..16b23e0e 100644 --- a/src/components/model-title/model-title-styles.vue +++ b/src/components/model-title/model-title-styles.vue @@ -24,7 +24,7 @@
- 加粗 + 加粗 正常 倾斜 @@ -38,7 +38,7 @@
- 加粗 + 加粗 正常 倾斜 diff --git a/src/components/model-user-info/index.vue b/src/components/model-user-info/index.vue index abb3b61e..0c779ae7 100644 --- a/src/components/model-user-info/index.vue +++ b/src/components/model-user-info/index.vue @@ -73,7 +73,7 @@ const base_data = reactive({ // 用户名颜色 user_name_color: 'rgba(0, 0, 0, 1)', // 用户名样式 - user_name_weight: '500', + user_name_weight: 'bold', // 用户名字号 user_name_size: 16, // 用户ID颜色 @@ -102,7 +102,7 @@ const base_data = reactive({ // 统计数字颜色 stats_number_color: 'rgba(0, 0, 0, 1)', // 统计数字样式 - stats_number_weight: '500', + stats_number_weight: 'bold', // 统计数字字号 stats_number_size: 16, }); diff --git a/src/components/model-user-info/model-user-info-styles.vue b/src/components/model-user-info/model-user-info-styles.vue index b5cc5142..b362240a 100644 --- a/src/components/model-user-info/model-user-info-styles.vue +++ b/src/components/model-user-info/model-user-info-styles.vue @@ -110,7 +110,7 @@ const props = defineProps({ }, }); const font_weight = reactive([ - { name: '加粗', value: '500' }, + { name: '加粗', value: 'bold' }, { name: '正常', value: '400' }, ]); // 默认值 diff --git a/src/components/page-settings/page-setting.vue b/src/components/page-settings/page-setting.vue index aaf27d96..9835745c 100644 --- a/src/components/page-settings/page-setting.vue +++ b/src/components/page-settings/page-setting.vue @@ -45,7 +45,7 @@ const default_data = { header_background_img_style: '2', header_background_img: [], header_background_title_color: '#333', - header_background_title_typeface: '500', + header_background_title_typeface: 'bold', header_background_title_size: 14, data_alone_row_space: 5, function_buttons_type: '0', diff --git a/src/config/const/article-list.ts b/src/config/const/article-list.ts index d3d75549..253c918d 100644 --- a/src/config/const/article-list.ts +++ b/src/config/const/article-list.ts @@ -114,7 +114,7 @@ const defaultArticleList: DefaultArticleList = { article_color_list: [{ color: '#fff', color_percentage: undefined }], article_background_img_style: '0', article_background_img: [], - name_weight: '500', + name_weight: 'bold', name_size: 14, name_color: '#333', name_bg_color_list: [{ color: 'rgba(0, 0, 0, 0.7)', color_percentage: undefined }], diff --git a/src/config/const/article-tabs.ts b/src/config/const/article-tabs.ts index d14f9419..38fe5a23 100644 --- a/src/config/const/article-tabs.ts +++ b/src/config/const/article-tabs.ts @@ -162,10 +162,10 @@ const defaultArticleTabs: DefaultArticleTabs = { { color: '#FF9898', color_percentage: undefined }, ], tabs_direction: '90deg', - tabs_weight_checked: '500', + tabs_weight_checked: 'bold', tabs_size_checked: 14, tabs_color_checked: 'rgba(51,51,51,1)', - tabs_weight: '500', + tabs_weight: 'bold', tabs_size: 14, tabs_color: 'rgba(51,51,51,1)', // 选项卡图标和图片设置 @@ -280,7 +280,7 @@ const defaultArticleTabs: DefaultArticleTabs = { article_color_list: [{ color: '#fff', color_percentage: undefined }], article_background_img_style: '0', article_background_img: [], - name_weight: '500', + name_weight: 'bold', name_size: 14, name_color: '#333', name_bg_color_list: [{ color: 'rgba(0, 0, 0, 0.7)', color_percentage: undefined }], diff --git a/src/config/const/goods-list.ts b/src/config/const/goods-list.ts index a5705c67..3b71d5d4 100644 --- a/src/config/const/goods-list.ts +++ b/src/config/const/goods-list.ts @@ -207,14 +207,14 @@ const defaultProductList: DefaultProductList = { interval_time: 3, rolling_fashion: 'translation', // 滚动方式 translation 平移 cut-screen 切屏 // 商品内容大小和颜色设置 - shop_title_typeface: '500', + shop_title_typeface: 'bold', 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_typeface: 'bold', shop_price_size: 18, shop_price_color: "#EA3323;", shop_price_symbol_color: '#EA3323', diff --git a/src/config/const/goods-tabs.ts b/src/config/const/goods-tabs.ts index 7ae30baf..b69e879d 100644 --- a/src/config/const/goods-tabs.ts +++ b/src/config/const/goods-tabs.ts @@ -195,10 +195,10 @@ const defaultProductList: DefaultProductList = { { color: '#FF9898', color_percentage: undefined }, ], tabs_direction: '90deg', - tabs_weight_checked: '500', + tabs_weight_checked: 'bold', tabs_size_checked: 14, tabs_color_checked: 'rgba(51,51,51,1)', - tabs_weight: '500', + tabs_weight: 'bold', tabs_size: 14, tabs_color: 'rgba(51,51,51,1)', tabs_icon_color_checked: 'rgba(51,51,51,1)', @@ -383,14 +383,14 @@ const defaultProductList: DefaultProductList = { interval_time: 3, rolling_fashion: 'translation', // 滚动方式 translation 平移 cut-screen 切屏 // 商品标题等内容处理 - shop_title_typeface: '500', + shop_title_typeface: 'bold', 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_typeface: 'bold', shop_price_size: 18, shop_price_color: '#EA3323;', shop_price_symbol_color: '#EA3323', diff --git a/src/config/const/header-nav.ts b/src/config/const/header-nav.ts index 967a22cf..1d777671 100644 --- a/src/config/const/header-nav.ts +++ b/src/config/const/header-nav.ts @@ -159,7 +159,7 @@ const defaultFooterNav: DefaultFooterNav = { header_background_img_style: '2', header_background_img: [], header_background_title_color: '#333', - header_background_title_typeface: '500', + header_background_title_typeface: 'bold', header_background_title_size: 14, // 换行间距 data_alone_row_space: 5, diff --git a/src/config/const/seckill.ts b/src/config/const/seckill.ts index 485d2af5..935ff256 100644 --- a/src/config/const/seckill.ts +++ b/src/config/const/seckill.ts @@ -304,14 +304,14 @@ const defaultSeckill: DefaultSeckill = { box_shadow_blur: 0, box_shadow_spread: 0, }, - shop_title_typeface: '500', + shop_title_typeface: 'bold', 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_typeface: 'bold', shop_price_size: 18, shop_price_color: '#EA3323;', shop_price_symbol_color: '#EA3323', diff --git a/src/config/const/tabs-carousel.ts b/src/config/const/tabs-carousel.ts index b877a14a..185132ce 100644 --- a/src/config/const/tabs-carousel.ts +++ b/src/config/const/tabs-carousel.ts @@ -205,10 +205,10 @@ const defaultTabs: defaultTabs = { { color: '#FF9898', color_percentage: undefined }, ], tabs_direction: '90deg', - tabs_weight_checked: '500', + tabs_weight_checked: 'bold', tabs_size_checked: 14, tabs_color_checked: 'rgba(51,51,51,1)', - tabs_weight: '500', + tabs_weight: 'bold', tabs_size: 14, tabs_color: 'rgba(51,51,51,1)', tabs_icon_color_checked: 'rgba(51,51,51,1)', diff --git a/src/config/const/tabs.ts b/src/config/const/tabs.ts index 77e16ec5..c707e448 100644 --- a/src/config/const/tabs.ts +++ b/src/config/const/tabs.ts @@ -69,10 +69,10 @@ const defaultTabs: defaultTabs = { { color: '#FF9898', color_percentage: undefined }, ], tabs_direction: '90deg', - tabs_weight_checked: '500', + tabs_weight_checked: 'bold', tabs_size_checked: 14, tabs_color_checked: 'rgba(51,51,51,1)', - tabs_weight: '500', + tabs_weight: 'bold', tabs_size: 14, tabs_color: 'rgba(51,51,51,1)', tabs_icon_color_checked: 'rgba(51,51,51,1)', diff --git a/src/config/const/user-info.ts b/src/config/const/user-info.ts index 0e23f099..bb5e0ee9 100644 --- a/src/config/const/user-info.ts +++ b/src/config/const/user-info.ts @@ -41,7 +41,7 @@ const defaultUserInfo: DefaultUserInfo = { style: { user_avatar_size: '60', user_name_color: 'rgba(0, 0, 0, 1)', - user_name_weight: '500', + user_name_weight: 'bold', user_name_size: 16, number_code_color_list: [ { color: 'rgba(254, 184, 143, 1)', color_percentage: undefined }, @@ -57,7 +57,7 @@ const defaultUserInfo: DefaultUserInfo = { stats_name_weight: '400', stats_name_size: 12, stats_number_color: 'rgba(0, 0, 0, 1)', - stats_number_weight: '500', + stats_number_weight: 'bold', stats_number_size: 16, common_style: { ...defaultCommon, diff --git a/src/styles/common.scss b/src/styles/common.scss index dae767d5..a5746222 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -122,7 +122,7 @@ font-weight: 500; } .fw-b { - font-weight: 700; + font-weight: bold; } /** diff --git a/src/views/layout/components/settings/index.vue b/src/views/layout/components/settings/index.vue index f760703f..71532628 100644 --- a/src/views/layout/components/settings/index.vue +++ b/src/views/layout/components/settings/index.vue @@ -133,7 +133,7 @@ const radio = ref('1'); // 创建一个响应式的数字变量，初始值为0 height: 7.8rem; .title { font-size: 16px; - font-weight: 500; + font-weight: bold; color: #333; } .radio-group { diff --git a/src/views/tabbar/components/settings/index.vue b/src/views/tabbar/components/settings/index.vue index b808ede7..f7f581d9 100644 --- a/src/views/tabbar/components/settings/index.vue +++ b/src/views/tabbar/components/settings/index.vue @@ -42,7 +42,7 @@ const footer_config = { padding: 2.1rem 3.8rem; .title { font-size: 16px; - font-weight: 500; + font-weight: bold; color: #333; } .radio-group {