Merge remote-tracking branch 'origin/dev' into dev

main.js

@@ -114,18 +114,7 @@ Vue.prototype.loadFontFace = function(fontFamily) {
 	const fontUrls = {
 		'Poppins': 'https://oss.starify.cn/test/Poppins-Regular.ttf'
 	}
-	if (fontFamily === 'Poppins') {
-		// 开发者工具没有该字体
-		wx.getSystemInfo({
-		  success(res) {
-		    // if (res.platform === 'devtools') {
-					loadCloudFontFace(fontUrls[fontFamily], fontFamily + '.ttf', fontFamily)
-		    // }
-		  }
-		})
-	} else {
-		loadCloudFontFace(fontUrls[fontFamily], fontFamily + '.ttf', fontFamily)
-	}
+	loadCloudFontFace(fontUrls[fontFamily], fontFamily + '.ttf', fontFamily)
 }
 
 App.mpType = 'app'