Merge branch 'master' of http://192.168.40.220/dmc/jz_applet into master

static/nfc/NFCManagerTool.js

@@ -234,7 +234,13 @@ export function removeObj() {
 
 
 function initNfcAdapter(callBack) {
-	nfcAdapter = uni.getNFCAdapter() //获取NFC适配器实例
+	// #ifdef MP-ALIPAY
+	nfcAdapter = my.getNFCAdapter() //获取NFC适配器实例
+	// #endif
+	// #ifdef MP-WEIXIN
+	nfcAdapter = wx.getNFCAdapter() //获取NFC适配器实例
+	// #endif
+
 	console.log("获取NFC适配器实例:", nfcAdapter);
 	if (nfcAdapter != null) {
 		callBack.call(this, {