Przeglądaj źródła

字体文件请求地址更换

Xiao_123 1 miesiąc temu
rodzic
commit
8a66d7c4c9
2 zmienionych plików z 7 dodań i 25 usunięć
  1. 4 10
      utils/config.js
  2. 3 15
      utils/font.js

+ 4 - 10
utils/config.js

@@ -3,23 +3,17 @@ const config = {
   // 生产环境
   produce: {
     baseUrl: 'https://www.menduner.com',
-    previewUrl: 'https://kkfileview.menduner.com/', // 预览路径
-    fontBaseUrl: 'https://minio.menduner.com/minio/dev/font/'
+    previewUrl: 'https://kkfileview.menduner.com/' // 预览路径
   },
   httpsTest: {
-    baseUrl: 'https://menduner.citupro.com:2443',
-    fontBaseUrl: 'https://menduner.citupro.com:3443/dev/menduner/font/'
+    baseUrl: 'https://menduner.citupro.com:2443'
   },
   httpTest: { 
-    baseUrl: 'http://menduner.citupro.com:7878',
-    fontBaseUrl: 'https://menduner.citupro.com:3443/dev/menduner/font/'
+    baseUrl: 'http://menduner.citupro.com:7878'
   }
 }
 
-export const envObj = config['httpsTest']
-
-// 字体下载地址
-export const fontBaseUrl = config['httpsTest'].fontBaseUrl
+export const envObj = config['produce']
 
 export const baseUrl = envObj.baseUrl
 

+ 3 - 15
utils/font.js

@@ -1,18 +1,10 @@
-import { fontBaseUrl } from './config'
-
 // 第三方字体库调用
 export const loadFont = () => {
 	// 所有的.tff文件
 	const fontsArr = [
-		// 'MiSans-Heavy',
-		// 'MiSans-ExtraLight',
-		// 'MiSans-Light',
-		// 'MiSans-Demibold',
 		'MiSans-Semibold',
 		'MiSans-Normal',
-		// 'MiSans-Thin',
 		'MiSans-Bold',
-		// 'MiSans-Regular',
 		'MiSans-Medium'
 	]
 
@@ -20,17 +12,13 @@ export const loadFont = () => {
 		wx.loadFontFace({
 			family: `${itm}`,
 			global: true, //是否全局生效
-			source: `url("${fontBaseUrl}${itm}.ttf")`, //字体资源的地址
+			source: `https://minio.menduner.com/dev/font/${itm}-simp.ttf`, //字体资源的地址
 			success: function(e) {
-				// console.log(itm, '===>字体调用成功', e);
+				console.log(itm, '===>字体调用成功', e);
 			},
 			fail: function(e) {
 				console.log(itm, '===>字体调用失败', e);
 			}
 		})
 	})
-}
-
-// module.exports = {
-// 	loadFont: loadFont
-// }
+}