zhengkaixin 2 éve
szülő
commit
90cca02495

+ 1 - 1
App.vue

@@ -1,7 +1,7 @@
 <style lang="scss">
 	/* 注意要写在第一行,同时给style标签加入lang="scss"属性 */
 	@import "@/uni_modules/uview-ui/index.scss";
-	@import '@/assets/font/font.css';
+	//@import '@/assets/font/font.css';
 	
 </style>
 <script>

+ 0 - 57
assets/font/font-a.css

@@ -1,57 +0,0 @@
-@font-face {  
-
-    font-family: 'Bold';
-
-    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-Bold.otf');
-
-    font-weight: normal;  
-
-    font-style: normal;  
-
-  }
-
-  @font-face {  
-
-    font-family: 'Medium';
-
-    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-Medium.otf');
-
-    font-weight: normal;  
-
-    font-style: normal;  
-
-  }
-
-@font-face {  
-
-    font-family: 'SemiBold';
-
-    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-SemiBold.otf');
-
-    font-weight: normal;  
-
-    font-style: normal;  
-
-  }
-@font-face {  
-
-    font-family: 'Regular';
-
-    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-Regular.otf');
-
-    font-weight: normal;  
-
-    font-style: normal;  
-
-  }
-  @font-face {
-  
-      font-family: 'Light';
-  
-      src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-Light.otf');
-  
-      font-weight: normal;  
-  
-      font-style: normal;  
-  
-    }

+ 0 - 57
assets/font/font.css

@@ -1,57 +0,0 @@
-@font-face {  
-
-    font-family: 'Bold';
-
-    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-SemiBold.otf');
-
-    font-weight: normal;  
-
-    font-style: normal;  
-
-  }
-
-  @font-face {  
-
-    font-family: 'Medium';
-    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-SemiBold.otf');
-
-
-    font-weight: normal;  
-
-    font-style: normal;  
-
-  }
-
-@font-face {  
-
-    font-family: 'SemiBold';
-
-    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-SemiBold.otf');
-
-    font-weight: normal;  
-
-    font-style: normal;  
-
-  }
-@font-face {  
-
-    font-family: 'Regular';
-
-    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-SemiBold.otf');
-
-    font-weight: normal;  
-
-    font-style: normal;  
-
-  }
-  @font-face {
-  
-      font-family: 'Light';
-  
-    src: url('http://www.jsrailway.com.cn/railroad-phone-font/SourceHanSerifSC-SemiBold.otf');
-  
-      font-weight: normal;  
-  
-      font-style: normal;  
-  
-    }

BIN
assets/font/font/Alibaba-PuHuiTi-Regular.ttf


BIN
assets/font/font/PingFang Regular.ttf


BIN
assets/font/font/SourceHanSerifSC-Bold.otf


BIN
assets/font/font/SourceHanSerifSC-ExtraLight.otf


BIN
assets/font/font/SourceHanSerifSC-Heavy.otf


BIN
assets/font/font/SourceHanSerifSC-Light.otf


BIN
assets/font/font/SourceHanSerifSC-Medium.otf


BIN
assets/font/font/SourceHanSerifSC-Regular.otf


BIN
assets/font/font/SourceHanSerifSC-SemiBold.otf


+ 0 - 80
assets/font/font/font.css

@@ -1,80 +0,0 @@
- @font-face {
-	  
-	      font-family: 'Alibaba-PuHuiTi-Regular';
-	  
-	      src: url('Alibaba-PuHuiTi-Regular.ttf');
-	  
-	      font-weight: normal;
-	  
-	      font-style: normal;
-	  
-	    }
-@font-face {  
-
-    font-family: 'PingFang Regular';
-
-    src: url('PingFang Regular.ttf');
-
-    font-weight: normal;  
-
-    font-style: normal;  
-
-  }
-
-@font-face {  
-
-    font-family: 'Bold';
-
-    src: url('SourceHanSerifSC-Bold.otf');
-
-    font-weight: normal;  
-
-    font-style: normal;  
-
-  }
-
-  @font-face {  
-
-    font-family: 'Medium';
-
-    src: url('SourceHanSerifSC-Medium.otf');
-
-    font-weight: normal;  
-
-    font-style: normal;  
-
-  }
-
-@font-face {  
-
-    font-family: 'SemiBold';
-
-    src: url('SourceHanSerifSC-SemiBold.otf');
-
-    font-weight: normal;  
-
-    font-style: normal;  
-
-  }
-@font-face {  
-
-    font-family: 'Regular';
-
-    src: url('SourceHanSerifSC-Regular.otf');
-
-    font-weight: normal;  
-
-    font-style: normal;  
-
-  }
-  @font-face {
-  
-      font-family: 'Light';
-  
-      src: url('SourceHanSerifSC-Light.otf');
-  
-      font-weight: normal;  
-  
-      font-style: normal;  
-  
-    }

+ 1 - 1
main.js

@@ -2,7 +2,7 @@ import App from './App'
 import Vue from 'vue'
 import getOpenId from './apis/utils/init.js'
 import getALIOpenId from './apis/utils/initALI.js'
-import './assets/font/font/font.css'
+//import './assets/font/font/font.css'
 var IS_WEIXIN = /MicroMessenger/.test(window.navigator.userAgent)
 var IS_ALI = /AlipayClient/.test(window.navigator.userAgent)