Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

4eddd7b7 · 张超军 · c7d74e6d · c97040bf · 4eddd7b7 · 4eddd7b7
Commit 4eddd7b7 authored Jan 07, 2022 by 张超军
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

src/App.vue
+12 -2

src/views/Home.vue
+0 -0

No files found.
--- a/src/App.vue
+++ b/src/App.vue
@@ -41,12 +41,22 @@ export default {

    @font-face {
        font-family: "HarmonyOS_Sans_SC-Bold";
-        src: url("../src/assets/font/MSYHBD.ttf") format("truetype");
+        src: url("../src/assets/font/HarmonyOS_Sans_SC_Bold.ttf") format("truetype");
    }

    @font-face {
        font-family: "HarmonyOS_Sans_SC";
-        src: url("../src/assets/font/MSYH.ttf") format("truetype");
+        src: url("../src/assets/font/HarmonyOS_Sans_SC_Regular.ttf") format("truetype");
+    }
+
+    @font-face {
+        font-family: "HarmonyOS_Sans_SC_Light";
+        src: url("../src/assets/font/HarmonyOS_Sans_SC_Light.ttf") format("truetype");
+    }
+
+    @font-face {
+        font-family: "HarmonyOS_Sans_SC_Medium";
+        src: url("../src/assets/font/HarmonyOS_Sans_SC_Medium.ttf") format("truetype");
    }

    .boxShadow {

--- a/src/views/Home.vue
+++ b/src/views/Home.vue