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

pages/bluetooth/bluetooth.vue

@@ -426,6 +426,7 @@
 						);
 						break;
 					case "JT":
+						console.info("连接的是=====123" + prefixName, device);
 						jtApi.connectDevice(
 							device,
 							function (res) {
@@ -523,7 +524,7 @@
 	};
 
 	function oks() {
-		//routeType 1.激活（订单来）  2.圈存 （/pages/recharge/recharge来）3.信息重写 4.信息读取  5从哪里来回哪里去监听bluetoothLink
+		//routeType 1.激活（订单来）  2.圈存 （/pages/recharge/recharge来）3.ping码解锁 4.信息读取  5从哪里来回哪里去监听bluetoothLink
 		if (routeType.value == "1") {
 			uni.navigateTo({
 				url: "/subpackage/after-sale/activation/activate",
@@ -538,12 +539,14 @@
 				url: `/pages/recharge/recharge-weixin?connectSuccess=${state.connectSuccess}`,
 			});
 		} else if (routeType.value == "3") {
-
+			uni.navigateTo({
+				url: "/subpackage/after-sale/pin-code-deblocking/pin-code-confirm?state=true&id=" + state.id,
+			});
 		} else if (routeType.value == "4") {
 			uni.navigateTo({
 				url: "/subpackage/after-sale/deviceInfo/deviceInfo",
 			});
-		} else if (routeType.value == "5") {
+		} else if (routeType.value == "5") { 
 			// uni.$emit('bluetoothLink', { status: true })
 			// uni.navigateBack({
 			// 	delta: 1

pages/recharge/recharge.vue

@@ -64,6 +64,7 @@
 		wechatPayConfigId,
 		wechatSecret,
 		aliPayConfigId,
+		aliPayConfigIdTwo,
 		obtainUserId,
 		getOpenidApi
 	} from "@/utils/network/api.js";
@@ -793,7 +794,7 @@
 				const optionsUser = {
 					type: 2,
 					data: {
-						payConfigId: aliPayConfigId,
+						payConfigId: aliPayConfigIdTwo,
 						code: res.authCode
 					},
 					method: "POST",
@@ -808,7 +809,7 @@
 							wxOpenId: data.openId,
 							cardId: state.cardId,
 							orderNum: state.orderNum,
-							payConfigId: "6a9a54123456578934edfre132b1234",
+							payConfigId: aliPayConfigIdTwo,
 							body: "储值卡充值",
 						},
 						method: "POST",
@@ -824,7 +825,7 @@
 								checkOrder();
 							},
 							fail: res => {
-								confirm(res, () => { }, "支付失败", false);
+								confirm(res, () => {}, "支付失败", false);
 							},
 						});
 

subpackage/after-sale/pin-code-deblocking/pin-code-confirm.vue

@@ -131,22 +131,19 @@
 		cardEnableTime: "",
 		obuEnableTime: "",
 	});
+	let ordId = '';
 
 	onLoad((option) => {
 		//请求订单详情
 		queryOrderDetail(option.id);
+		ordId = option.id;
+		if (option.state) {
+			tools.showLoadingAlert("正在执行指令");
+			state.disabled = true;
+			getPinCodeUnlock()
+		}
 	});
 
-	onShow((option) => {
-		uni.$on('bluetoothLink', res => {
-			console.log(res);
-			if (res.status) {
-				tools.showLoadingAlert("正在执行指令");
-				state.disabled = true;
-				getPinCodeUnlock()
-			}
-		})
-	})
 	onUnload(() => {
 		//移除监听
 		uni.$off('bluetoothLink')
@@ -269,7 +266,7 @@
 	//去连接蓝牙
 	const toPage = () => {
 		// getPinCodeUnlock()
-		navTo("/pages/bluetooth/bluetooth?routeType=5"); //去连接蓝牙
+		navTo("/pages/bluetooth/bluetooth?routeType=3&id=" + ordId); //去连接蓝牙
 	};
 
 	//返回列表