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

App.vue

@@ -38,9 +38,11 @@
 					if (res.uniPlatform === 'mp-weixin') {
 						console.log('当前为微信小程序', res, 1111);
 						setItem("loginSource", "69af303ba2eb4608a099163f0d2a5dbd");
+						setItem("environment","WX")
 					} else if (res.uniPlatform === 'mp-alipay') {
 						console.log('当前为支付宝小程序');
 						setItem("loginSource", "601052a249c04155831710b577cb796d");
+						setItem("environment","ZFB")
 					}
 				}
 			});

static/etcUtil/index.js

@@ -26,11 +26,14 @@ const tools = require('./tools.js');
 const jlApi = require("../../static/etc/JLAPI/JLObuSDK.js"); //聚力SDK
 const wjApi = require("../etc/WJAPI/wjBleAPI");
 let tdApi = require("../etc/TDAPI/TDRObuSDK.js");
-
-//支付宝小程序时打开 微信小程序时注释掉
-tdApi = require("../etc/TDRAPI/TDRObuSDK.js");
+import {
+	getItem
+} from "../../utils/storage";
 
 
+if (getItem('environment') == 'ZFB') {
+	tdApi = require("../etc/TDRAPI/TDRObuSDK.js");
+}
 
 /**
  * 断开蓝牙