diff --git a/src/assets/fonts/Alibaba-PuHuiTi-Bold.woff2 b/src/assets/fonts/Alibaba-PuHuiTi-Bold.woff2 deleted file mode 100644 index 1d97b91..0000000 Binary files a/src/assets/fonts/Alibaba-PuHuiTi-Bold.woff2 and /dev/null differ diff --git a/src/assets/fonts/Alibaba-PuHuiTi-Medium.woff2 b/src/assets/fonts/Alibaba-PuHuiTi-Medium.woff2 deleted file mode 100644 index 61d1468..0000000 Binary files a/src/assets/fonts/Alibaba-PuHuiTi-Medium.woff2 and /dev/null differ diff --git a/src/assets/fonts/Alibaba-PuHuiTi-Regular.woff2 b/src/assets/fonts/Alibaba-PuHuiTi-Regular.woff2 deleted file mode 100644 index bc37329..0000000 Binary files a/src/assets/fonts/Alibaba-PuHuiTi-Regular.woff2 and /dev/null differ diff --git a/src/assets/fonts/Manrope-Bold.ttf b/src/assets/fonts/Manrope-Bold.ttf new file mode 100644 index 0000000..2f84ae3 Binary files /dev/null and b/src/assets/fonts/Manrope-Bold.ttf differ diff --git a/src/assets/fonts/Manrope-Medium.ttf b/src/assets/fonts/Manrope-Medium.ttf new file mode 100644 index 0000000..c73d774 Binary files /dev/null and b/src/assets/fonts/Manrope-Medium.ttf differ diff --git a/src/assets/fonts/Manrope-Regular.ttf b/src/assets/fonts/Manrope-Regular.ttf new file mode 100644 index 0000000..c02b01b Binary files /dev/null and b/src/assets/fonts/Manrope-Regular.ttf differ diff --git a/src/assets/fonts/Manrope-SemiBold.ttf b/src/assets/fonts/Manrope-SemiBold.ttf new file mode 100644 index 0000000..30ee031 Binary files /dev/null and b/src/assets/fonts/Manrope-SemiBold.ttf differ diff --git a/src/styles/font.scss b/src/styles/font.scss index f944b4a..e6195d3 100644 --- a/src/styles/font.scss +++ b/src/styles/font.scss @@ -1,30 +1,18 @@ -// @font-face { -// font-family: $font-family-regular; -// src: url('@/assets/fonts/Alibaba-PuHuiTi-Regular.woff2') format('woff2'); -// font-display: swap; -// } +@font-face { + font-family: 'Manrope-Regular'; + src: url('@/assets/fonts/Manrope-Regular.ttf'); +} +@font-face { + font-family: 'Manrope-Medium'; + src: url('@/assets/fonts/Manrope-Medium.ttf'); +} -// @font-face { -// font-family: $font-family-medium; -// src: url('@/assets/fonts/Alibaba-PuHuiTi-Medium.woff2') format('woff2'); -// font-display: swap; -// } +@font-face { + font-family: 'Manrope-Bold'; + src: url('@/assets/fonts/Manrope-Bold.ttf'); +} -// @font-face { -// font-family: 'PuHuiTi-Bold'; -// src: url('@/assets/fonts/Alibaba-PuHuiTi-Bold.woff2') format('woff2'); -// font-display: swap; -// } - -// // 使用统一的字体族名 -// .font-family-puhui-regular { -// font-family: $font-family-regular !important; -// } - -// .font-family-puhui-medium { -// font-family: $font-family-medium !important; -// } - -// .font-family-puhui-bold { -// font-family: 'PuHuiTi-Bold' !important; -// } +@font-face { + font-family: 'Manrope-SemiBold'; + src: url('@/assets/fonts/Manrope-SemiBold.ttf'); +} diff --git a/src/styles/lib/variable.scss b/src/styles/lib/variable.scss index 5ee4b32..f1d0368 100644 --- a/src/styles/lib/variable.scss +++ b/src/styles/lib/variable.scss @@ -1,8 +1,15 @@ + +// 汉字字体 $font-family-regular: 'PingFangSC-Regular', 'Microsoft Yahei', Arial, sans-serif; $font-family-medium: 'PingFangSC-Medium', 'Microsoft Yahei', Arial, sans-serif; $font-family-light: 'PingFangSC-Light', 'Microsoft Yahei', Arial, sans-serif; $font-family-bold: 'PingFangSC-Semibold', 'PingFangSC-Regular', 'Microsoft Yahei', Arial, sans-serif; +// 数字字体包 +$font-family-manrope-regular: 'Manrope-Regular'; +$font-family-manrope-medium: 'Manrope-Medium'; +$font-family-manrope-bold: 'Manrope-Bold'; +$font-family-manrope-semiBold: 'Manrope-SemiBold'; $color-background: #f9f9f9; -$font-size-14: 14px; \ No newline at end of file +$font-size-14: 14px; diff --git a/src/views/components/dataEngine/keyWord.vue b/src/views/components/dataEngine/keyWord.vue index d9d0de2..6c2899d 100644 --- a/src/views/components/dataEngine/keyWord.vue +++ b/src/views/components/dataEngine/keyWord.vue @@ -674,7 +674,7 @@ onMounted(() => { font-weight: 400; line-height: 22px; /* 157.143% */ &.num { - font-family: 'HarmonyOS Sans SC'; + font-family: $font-family-manrope-regular; } } diff --git a/src/views/components/dataEngine/userPersona.vue b/src/views/components/dataEngine/userPersona.vue index 43f249a..ee736a0 100644 --- a/src/views/components/dataEngine/userPersona.vue +++ b/src/views/components/dataEngine/userPersona.vue @@ -617,7 +617,7 @@ onMounted(() => { font-weight: 400; line-height: 22px; /* 157.143% */ &.num { - font-family: 'HarmonyOS Sans SC'; + font-family: $font-family-manrope-regular; } } :deep(.arco-tabs) { diff --git a/src/views/property-marketing/media-account/account-dashboard/style.scss b/src/views/property-marketing/media-account/account-dashboard/style.scss index 2413784..050075c 100644 --- a/src/views/property-marketing/media-account/account-dashboard/style.scss +++ b/src/views/property-marketing/media-account/account-dashboard/style.scss @@ -45,7 +45,7 @@ } .value { color: var(--Text-1, #211f24); - font-family: 'HarmonyOS Sans SC'; + font-family: $font-family-manrope-regular; font-size: 18px; font-style: normal; font-weight: 500; diff --git a/src/views/property-marketing/media-account/account-manage/components/account-table/index.vue b/src/views/property-marketing/media-account/account-manage/components/account-table/index.vue index 9e0f558..23eb39a 100644 --- a/src/views/property-marketing/media-account/account-manage/components/account-table/index.vue +++ b/src/views/property-marketing/media-account/account-manage/components/account-table/index.vue @@ -25,11 +25,11 @@
账号ID - {{ item.account_id || '-' }} + {{ item.account_id || '-' }}
手机号码 - {{ item.mobile || '-' }} + {{ item.mobile || '-' }}
运营人员 diff --git a/src/views/property-marketing/media-account/account-manage/components/account-table/style.scss b/src/views/property-marketing/media-account/account-manage/components/account-table/style.scss index 1affd88..e27be09 100644 --- a/src/views/property-marketing/media-account/account-manage/components/account-table/style.scss +++ b/src/views/property-marketing/media-account/account-manage/components/account-table/style.scss @@ -49,6 +49,9 @@ font-style: normal; font-weight: 400; line-height: 20px; /* 166.667% */ + &.num { + font-family: $font-family-manrope-regular; + } } .tag-box { display: flex; diff --git a/src/views/property-marketing/put-account/account-manage/components/account-table/index.vue b/src/views/property-marketing/put-account/account-manage/components/account-table/index.vue index bf4179d..e778bfe 100644 --- a/src/views/property-marketing/put-account/account-manage/components/account-table/index.vue +++ b/src/views/property-marketing/put-account/account-manage/components/account-table/index.vue @@ -25,11 +25,11 @@
账号ID - {{ item.account_id || '-' }} + {{ item.account_id || '-' }}
手机号码 - {{ item.mobile }} + {{ item.mobile }}
运营人员 diff --git a/src/views/property-marketing/put-account/account-manage/components/account-table/style.scss b/src/views/property-marketing/put-account/account-manage/components/account-table/style.scss index 960b3be..8bb6a61 100644 --- a/src/views/property-marketing/put-account/account-manage/components/account-table/style.scss +++ b/src/views/property-marketing/put-account/account-manage/components/account-table/style.scss @@ -49,6 +49,9 @@ font-style: normal; font-weight: 400; line-height: 20px; /* 166.667% */ + &.num { + font-family: $font-family-manrope-regular; + } } .tag-box { display: flex;