Merge branch 'master' of http://192.168.0.115:3000/renyicun/NanjingMuseumWuJinZang

src/App.vue

@@ -10,6 +10,7 @@
     src="./configMultiMedia/music/music1.mp3"
     style="opacity: 0;"
   />
+
   <!-- <audio
     id="bg-music2"
     src="./configMultiMedia/music/music2.mp3"
@@ -129,7 +130,7 @@ textarea {
 
 @font-face {
   font-family: 'KaiTi';
-  src: url('@/assets/style/SIMKAI.TTF');
+  src: url('@/assets/style/SIMKAI.woff2');
 }
 
 // 滚动条，只设置某一项可能导致不生效。
@@ -236,7 +237,7 @@ textarea {
   align-items: center;
   font-size: calc(24 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
   line-height: calc(30 / v-bind('windowSizeWhenDesignForRef') * v-bind('windowSizeInCssForRef'));
-  font-family: KaiTi, KaiTi;
+  font-family: KaiTi;
   color: white;
   transition: all 0.5s;
   >img{