diff --git a/src/assets/font/HarmonyOS_Sans_SC_Bold.ttf b/src/assets/font/HarmonyOS_Sans_SC_Bold.ttf new file mode 100644 index 0000000..5c925d1 Binary files /dev/null and b/src/assets/font/HarmonyOS_Sans_SC_Bold.ttf differ diff --git a/src/assets/font/HarmonyOS_Sans_SC_Medium.ttf b/src/assets/font/HarmonyOS_Sans_SC_Medium.ttf new file mode 100644 index 0000000..350f6a0 Binary files /dev/null and b/src/assets/font/HarmonyOS_Sans_SC_Medium.ttf differ diff --git a/src/assets/font/Montserrat-Bold.ttf b/src/assets/font/Montserrat-Bold.ttf new file mode 100644 index 0000000..9a425b9 Binary files /dev/null and b/src/assets/font/Montserrat-Bold.ttf differ diff --git a/src/assets/scss/font.scss b/src/assets/scss/font.scss index 72d29a7..fc059b9 100644 --- a/src/assets/scss/font.scss +++ b/src/assets/scss/font.scss @@ -1,9 +1,28 @@ @font-face { font-family: 'HarmonyOS_Sans_SC'; src: url('@/assets/font/HarmonyOS_Sans_SC_Regular.ttf'); + font-weight: 400; +} + +@font-face { + font-family: 'HarmonyOS_Sans_SC'; + src: url('@/assets/font/HarmonyOS_Sans_SC_Medium.ttf'); + font-weight: 500; +} + +@font-face { + font-family: 'HarmonyOS_Sans_SC'; + src: url('@/assets/font/HarmonyOS_Sans_SC_Bold.ttf'); + font-weight: bold; } @font-face { font-family: 'Montserrat'; src: url('@/assets/font/Montserrat-Regular.ttf'); + font-weight: normal; +} +@font-face { + font-family: 'Montserrat'; + src: url('@/assets/font/Montserrat-Bold.ttf'); + font-weight: bold; } diff --git a/src/base/ShopItem/ShopItem.vue b/src/base/ShopItem/ShopItem.vue index 22f2362..3f2a5dc 100644 --- a/src/base/ShopItem/ShopItem.vue +++ b/src/base/ShopItem/ShopItem.vue @@ -78,6 +78,7 @@ const deactivate = () => store.SET_SHOP(null) height: 160px; padding: 20px 55px; background-color: #fff; + border-radius: var(--global-radius, 12px); } .shop-logo { width: 100%; diff --git a/src/views/Billboard/Billboard.vue b/src/views/Billboard/Billboard.vue index 85bbe91..721eeec 100644 --- a/src/views/Billboard/Billboard.vue +++ b/src/views/Billboard/Billboard.vue @@ -288,7 +288,7 @@ watch(scrollLefts, _scrollLefts => { } .right { display: inline-flex; - flex: 0 0 100 px; + flex: 0 0 100px; font-weight: 500; font-size: 16px; line-height: 19px;