diff --git a/src/assets/font/HarmonyOS_Sans_SC_Bold.ttf b/src/assets/font/HarmonyOS_Sans_SC_Bold.ttf deleted file mode 100644 index 5c925d1..0000000 Binary files a/src/assets/font/HarmonyOS_Sans_SC_Bold.ttf and /dev/null differ diff --git a/src/assets/font/HarmonyOS_Sans_SC_Light.ttf b/src/assets/font/HarmonyOS_Sans_SC_Light.ttf deleted file mode 100644 index 8cfbc9d..0000000 Binary files a/src/assets/font/HarmonyOS_Sans_SC_Light.ttf and /dev/null differ diff --git a/src/assets/font/HarmonyOS_Sans_SC_Medium.ttf b/src/assets/font/HarmonyOS_Sans_SC_Medium.ttf deleted file mode 100644 index 350f6a0..0000000 Binary files a/src/assets/font/HarmonyOS_Sans_SC_Medium.ttf and /dev/null differ diff --git a/src/assets/font/Montserrat-Regular.ttf b/src/assets/font/Montserrat-Regular.ttf new file mode 100644 index 0000000..2a2b2aa Binary files /dev/null and b/src/assets/font/Montserrat-Regular.ttf differ diff --git a/src/assets/scss/base.scss b/src/assets/scss/base.scss index ee381ca..8628da0 100644 --- a/src/assets/scss/base.scss +++ b/src/assets/scss/base.scss @@ -6,5 +6,5 @@ html { user-select: none; -webkit-tap-highlight-color: transparent; touch-action: none; - font-family: 'font_light'; -} \ No newline at end of file + font-family: 'HarmonyOS_Sans_SC'; +} diff --git a/src/assets/scss/font.scss b/src/assets/scss/font.scss index 7134fce..72d29a7 100644 --- a/src/assets/scss/font.scss +++ b/src/assets/scss/font.scss @@ -1,21 +1,9 @@ @font-face { - font-family: 'font_light'; - src: url('@/assets/font/HarmonyOS_Sans_SC_Light.ttf'); -} - -@font-face { - font-family: 'font_regular'; + font-family: 'HarmonyOS_Sans_SC'; src: url('@/assets/font/HarmonyOS_Sans_SC_Regular.ttf'); } @font-face { - font-family: 'font_medium'; - src: url('@/assets/font/HarmonyOS_Sans_SC_Medium.ttf'); -} - -@font-face { - font-family: 'font_bold'; - src: url('@/assets/font/HarmonyOS_Sans_SC_Bold.ttf'); + font-family: 'Montserrat'; + src: url('@/assets/font/Montserrat-Regular.ttf'); } - - diff --git a/src/base/Go/Go.vue b/src/base/Go/Go.vue index 52eb3bd..62d256e 100644 --- a/src/base/Go/Go.vue +++ b/src/base/Go/Go.vue @@ -29,7 +29,6 @@ function go() { .text { font-weight: 700; font-size: 20px; - font-family: 'font_bold'; text-align: justify; color: #ffffff; } diff --git a/src/base/QRCode/QRCode.vue b/src/base/QRCode/QRCode.vue index 6d56892..473ca48 100644 --- a/src/base/QRCode/QRCode.vue +++ b/src/base/QRCode/QRCode.vue @@ -43,7 +43,6 @@ function close() { } .text { font-weight: 700; - font-family: 'font_bold'; font-size: 20px; line-height: 23px; text-align: center; diff --git a/src/base/ShopItem/ShopItem.vue b/src/base/ShopItem/ShopItem.vue index ef0bf73..22f2362 100644 --- a/src/base/ShopItem/ShopItem.vue +++ b/src/base/ShopItem/ShopItem.vue @@ -107,7 +107,6 @@ const deactivate = () => store.SET_SHOP(null) font-weight: 700; font-size: 12px; line-height: 14px; - font-family: 'font_bold'; color: var(--brand-metaColor, rgba(0, 0, 0, 0.4)); } .dir { diff --git a/src/base/Temperature/Temperature.vue b/src/base/Temperature/Temperature.vue index 8d7149a..bf3db23 100644 --- a/src/base/Temperature/Temperature.vue +++ b/src/base/Temperature/Temperature.vue @@ -31,7 +31,6 @@ const { weather, icon } = useWeather() color: var(--weather-iconColor); font-size: 36px; font-weight: bolder; - font-family: 'font_bold'; } .temperature { font-family: 'Montserrat'; diff --git a/src/components/ActivityDetail/ActivityDetail.vue b/src/components/ActivityDetail/ActivityDetail.vue index ed785e3..5ee104e 100644 --- a/src/components/ActivityDetail/ActivityDetail.vue +++ b/src/components/ActivityDetail/ActivityDetail.vue @@ -107,14 +107,12 @@ function back() { padding: 28px 56px 32px 56px; font-weight: 700; font-size: 24px; - font-family: 'font_bold'; color: rgba(0, 0, 0, 0.8); } } .common { font-weight: 700; font-size: 14px; - font-family: 'font_bold'; color: rgba(0, 0, 0, 0.6); margin-left: 56px; &.first { diff --git a/src/components/BrandDetail/BrandDetail.vue b/src/components/BrandDetail/BrandDetail.vue index 47bd06c..c67732e 100644 --- a/src/components/BrandDetail/BrandDetail.vue +++ b/src/components/BrandDetail/BrandDetail.vue @@ -205,7 +205,6 @@ function back() { padding-left: 8px; font-weight: 700; font-size: 20px; - font-family: 'font_bold'; color: #ffffff; } } @@ -301,7 +300,6 @@ function back() { } .name { font-weight: 700; - font-family: 'font_bold'; font-size: 12px; line-height: 14px; color: rgba(0, 0, 0, 0.6); @@ -321,7 +319,6 @@ function back() { line-height: 38px; text-align: justify; color: rgba(0, 0, 0, 0.8); - font-family: 'font_bold'; padding-bottom: 40px; } .intro-scroll { @@ -372,7 +369,6 @@ function back() { .title-tip { font-weight: 700; font-size: 14px; - font-family: 'font_bold'; text-align: justify; color: rgba(0, 0, 0, 0.4); padding-bottom: 15px; @@ -397,14 +393,12 @@ function back() { font-size: 24px; line-height: 22px; color: rgba(0, 0, 0, 0.6); - font-family: 'font_bold'; padding-right: 4px; } .line-up-text { font-weight: 700; font-size: 14px; line-height: 16px; - font-family: 'font_bold'; color: rgba(0, 0, 0, 0.2); } } @@ -417,7 +411,6 @@ function back() { } .abs-money { font-weight: 700; - font-family: 'font_bold'; font-size: 24px; text-align: right; color: #f1b33e; @@ -433,7 +426,6 @@ function back() { width: 128px; height: 37px; font-weight: 700; - font-family: 'font_bold'; font-size: 14px; line-height: 37px; text-align: center; diff --git a/src/components/BrandDetail/children/Activity.vue b/src/components/BrandDetail/children/Activity.vue index 58f455d..2c203a5 100644 --- a/src/components/BrandDetail/children/Activity.vue +++ b/src/components/BrandDetail/children/Activity.vue @@ -76,7 +76,6 @@ function handleActivity(item) { } .title { font-weight: 700; - font-family: 'font_bold'; font-size: 24px; margin-bottom: 24px; color: rgba(0, 0, 0, 0.8); @@ -116,7 +115,6 @@ function handleActivity(item) { .name { font-weight: 700; font-size: 20px; - font-family: 'font_bold'; color: rgba(0, 0, 0, 0.6); } .look { @@ -155,7 +153,6 @@ function handleActivity(item) { font-weight: 700; font-size: 18px; line-height: 21px; - font-family: 'font_bold'; color: rgba(0, 0, 0, 0.6); padding-bottom: 6px; } @@ -165,7 +162,6 @@ function handleActivity(item) { } .money { font-weight: 700; - font-family: 'font_bold'; font-size: 24px; color: #f1b33e; margin-right: 27px; @@ -184,7 +180,6 @@ function handleActivity(item) { border-radius: 160px; color: #fff; font-weight: 700; - font-family: 'font_bold'; } } } @@ -206,7 +201,6 @@ function handleActivity(item) { font-size: 24px; line-height: 28px; text-align: justify; - font-family: 'font_bold'; color: rgba(0, 0, 0, 0.8); margin-bottom: 32px; } @@ -239,7 +233,6 @@ function handleActivity(item) { font-weight: 700; font-size: 14px; line-height: 16px; - font-family: 'font_bold'; color: rgba(0, 0, 0, 0.6); &.first { margin-bottom: 12px; diff --git a/src/components/BrandDetail/children/Comment.vue b/src/components/BrandDetail/children/Comment.vue index b215442..71e423d 100644 --- a/src/components/BrandDetail/children/Comment.vue +++ b/src/components/BrandDetail/children/Comment.vue @@ -64,7 +64,7 @@ function starList() {