2023年10月7日17:37:32

pages/bluetooth/bluetooth.vue

@@ -501,34 +501,8 @@
 			datas.setData("bluLinkStatus", true);
 			datas.setData("connectPrefixName", connectPrefixName.value);
 
-<<<<<<< HEAD
 			oks();
-=======
-			//routeType 1.激活（订单来）  2.圈存 （/pages/recharge/recharge来）3.信息重写 4.信息读取  5从哪里来回哪里去监听bluetoothLink
-			if (routeType.value == "1") {
-				uni.navigateTo({
-					url: "/subpackage/after-sale/activation/activate",
-				});
-			} else if (routeType.value == "2") {
-				uni.navigateTo({
-					url: `/pages/recharge/recharge?connectSuccess=1&&cardId=${state.cardId}&&fee=${state.fee}`,
-				});
-			} else if (routeType.value == "3") {
 
-			} else if (routeType.value == "4") {
-				uni.navigateTo({
-					url: "/subpackage/after-sale/deviceInfo/deviceInfo",
-				});
-			}
-			else if (routeType.value == "5") {
-				uni.$emit('bluetoothLink', { status: true })
-				// uni.navigateBack({
-				// 	delta: 1,
-				// })
-			} else {
-				return;
-			}
->>>>>>> 24fd0d73864951b1036604add3def96861fc606e
 		} else {
 			alertF(res.msg);
 		}

static/etcUtil/index.js

@@ -26,42 +26,16 @@ 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");
-const datas = require("../../static/etcUtil/datas.js");
-// #ifdef MP-ALIPAY
-// 这部分代码将仅在支付宝小程序平台下执行
-// jlApi = require("../../static/etc/JLObuSDK/JLObuSDK.js");
-// wjApi = require("../etc/WJBLE/WJBleAPI");
+
+//支付宝小程序时打开 微信小程序时注释掉
 tdApi = require("../etc/TDRAPI/TDRObuSDK.js");
-// 执行支付宝小程序的特定功能
-// #endif
+
 
 
 /**
  * 断开蓝牙
  */
 function disconnectDevice() {
-	// #ifdef MP-ALIPAY
-	my.cancelBluetoothPair({
-		deviceId: device.deviceId,
-		success: (res) => {
-			console.log('解除蓝牙配对123', res);
-			 my.disconnectBLEDevice({
-			      deviceId: device.deviceId,
-			      success: (res) => {
-			        console.log(res, "连接情况");
-			        my.alert({ content: "断开成功" });
-			      },
-			      fail: (error) => {
-			        console.log(error, "断开情况");
-			        my.alert({ content: JSON.stringify(error) });
-			      }
-			    });
-		},
-		fail: (err) => {
-			console.log('解除蓝牙配对456', err);
-		},
-	});
-	// #endif
 	var connectPrefixName = datas.getData("connectPrefixName");
 	switch (connectPrefixName) {
 		case "WJ":
@@ -124,7 +98,7 @@ function disconnectDevice() {
 			tdApi.disConnectDevice(function(res) {
 				datas.setData("bluLinkStatus", false);
 				datas.setData("connectPrefixName", "");
-				console.log(res,'=============')
+				console.log(res, '=============')
 			});
 			break;
 		case "ZZ":
@@ -148,20 +122,6 @@ function transCmd(cmdArr, type, func, callBack = null) {
 	var connectPrefixName = datas.getData("connectPrefixName");
 	switch (connectPrefixName) {
 		case "WJ":
-			// #ifdef MP-ALIPAY
-			wjApi.transCmd(cmdArr, '00', type == '10' ? 'A3' : 'AC', function(res) {
-				if (res.code == 0) {
-					func(res.data);
-				} else {
-					if (callBack != null) {
-						callBack(res.msg);
-					} else {
-						alertF(res.msg);
-					}
-				}
-			});
-			// #endif
-			// #ifdef MP-WEIXIN
 			wjApi.transCmd(cmdArr, type, function(res) {
 				if (res.code == 0) {
 					func(res.data);
@@ -173,7 +133,6 @@ function transCmd(cmdArr, type, func, callBack = null) {
 					}
 				}
 			});
-			// #endif
 			break;
 		case "JL":
 			jlApi.transCmd(cmdArr, type, function(res) {