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

main.js

@@ -118,9 +118,9 @@ Vue.prototype.loadFontFace = function(fontFamily) {
 		// 开发者工具没有该字体
 		wx.getSystemInfo({
 		  success(res) {
-		    if (res.platform === 'devtools') {
+		    // if (res.platform === 'devtools') {
 					loadCloudFontFace(fontUrls[fontFamily], fontFamily + '.ttf', fontFamily)
-		    }
+		    // }
 		  }
 		})
 	} else {