双算法密钥升级

pages/service/components/rightList.vue

@@ -49,13 +49,13 @@
 
 	})
 	function toNext(url,name) {
-		if(name=='更换设备' || name=='卡签续期'||name=='设备升级' || name=='卡签注销'|| name=='挂失解挂' || name=='欠费补缴' || name=='发票服务'|| name=='月结单查询' || name=='业务审核查询'|| name=='ETC通行流水记录' || name=='黑名单查询'){
-			jumpOldMini()
-		}else{
+		// if(name=='更换设备' || name=='卡签续期'||name=='设备升级' || name=='卡签注销'|| name=='挂失解挂' || name=='欠费补缴' || name=='发票服务'|| name=='月结单查询' || name=='业务审核查询'|| name=='ETC通行流水记录' || name=='黑名单查询'){
+		// 	jumpOldMini()
+		// }else{
 			uni.navigateTo({
 				url: url,
 			});
-		}
+		// }
 	}
 </script>
 

static/etcUtil/index.js

@@ -374,7 +374,47 @@ function transCmd(cmdArr, type, func, callBack = null) {
 			break;
 	}
 }
+/**
+ * 透传
+ * type 10 写卡 20 写OBU
+ */
+function transCmdArrAfter(cmdArr, type) {
+	return new Promise(async (resole, reject) => {
+		try {
+			console.log('指令执行内容', cmdArr, type)
+			// 判断是否为数组
+			if (typeof cmdArr === 'string') {
+				// 如果是字符串，转换为字符数组
+				cmdArr = cmdArr.split(',');
+			}
+			const datas = {}
+			for (let i = 0; i < cmdArr.length; i++) {
+				const cmdStr = cmdArr[i]
+				console.log(i, cmdStr, 'cmdStr');
+				const itemDatas = await transCmd([cmdStr], type)
+				datas[cmdStr] = itemDatas
+			}
+			console.log(datas, '----------执行结果---------', cmdArr, type);
+			for (let i in datas) {
+        console.log(" datas[i]", datas[i])
+				let itemCode = datas[i][0].substring(datas[i][0].length - 4);
+				if (itemCode !== '9000') {
+					reject(datas);
+					uni.hideLoading()
+					return
+				}
+				datas[i][0] = datas[i][0].toUpperCase();
+			}
+			resole(datas)
+		} catch (e) {
+			//TODO handle the exception
+			console.log('错误错误', e);
+			reject(e);
+		}
 
+
+	})
+}
 /**
  * 提示加关蓝牙
  */
@@ -389,4 +429,5 @@ function alertF(msg) {
 module.exports = {
 	disconnectDevice,
 	transCmd,
+	transCmdArrAfter
 };