Merge branch 'master' of http://gitlab.oytour.com/luochao/muse

src/assets/global/font.css

+
 @font-face{
     font-family: 'pingfang';
     src:url('../fonts/pingfang.woff2')  format('woff');
@@ -40,6 +41,13 @@
     font-style: normal;
     font-weight: normal;
 }
+@font-face {
+    font-family:'percomp';
+    src:url('../fonts/pingfang.woff2')  format('truetype');
+    font-style: normal;
+    font-weight: normal;
+}
+
 @font-face{
     font-family:'DIN';
     src:url('../fonts/DIN.TTF')  format('truetype');