激活测试

subpackage/after-sale/activation/activate.vue

@@ -180,7 +180,7 @@
 				type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
 				data: {
 					orderId: orderInfo.orderId,
-					issueType: state.transfer?2:1
+					issueType: state.transfer?2:1   //1正常激活   2 过户激活
 				}, //请求参数
 				method: "POST", //提交方式(默认POST)
 				showLoading: true, //是否显示加载中(默认显示)
@@ -192,10 +192,12 @@
 					tools.hideLoadingAlert();
 					console.log("在线激活 请求");
 					console.log(stringToJson(res.bizContent));
-					const datas = stringToJson(res.bizContent);
+					const datas = stringToJson(res.bizContent).data;
 					tools.showLoadingAlert("执行指令");
 					console.log("datas===",datas)
-					bluetoothUtil.transCmd(datas.cmd, datas.cmdType, function(res) {
+					let cmdArray = datas.cmd.split(',');
+					console.log("cmdArray",cmdArray)
+					bluetoothUtil.transCmd(cmdArray, datas.cmdType=='CARD'?'10':'20', function(res) {
 						console.log("res申请",res)
 						implementCmd(datas.transOrderId,datas.cmd,res,datas.stepNo)
 					}, () => {
@@ -219,13 +221,14 @@
 				method: "POST", //提交方式(默认POST)
 				showLoading: true, //是否显示加载中(默认显示)
 			};
+			console.log("options2222",options)
 			//BDS-二发指令回传 
 			request('88d98f2db7df4f06b22d58b507db7854', options)
 				.then((res) => {
 					tools.hideLoadingAlert();
-					console.log("在线激活 请求");
 					console.log(stringToJson(res.bizContent));
-					const datas = stringToJson(res.bizContent);
+					const datas = stringToJson(res.bizContent).data;
+					console.log("在线激活 请求",datas);
 					tools.showLoadingAlert("执行指令");
 					if (datas.stepNo == 100) {
 						msg("激活成功")
@@ -235,7 +238,8 @@
 							});
 						}, 2000)
 					} else {
-						bluetoothUtil.transCmd(datas.cmd, datas.cmdType, function(res) {
+						let cmdArray1 = datas.cmd.split(',');
+						bluetoothUtil.transCmd(cmdArray1, datas.cmdType=='CARD'?'10':'20', function(res) {
 							implementCmd(transOrderId,datas.cmd,res,stepNo)
 						}, () => {
 							showModals('在线激活异常')