首次激活不判断obuId和cardId

subpackage/after-sale/activation/activate.vue

@@ -395,7 +395,6 @@
 				tools.alertF("RANDOM_NUMBER指令长度不符" + res[1]);
 			}
 		})
-		
 	}
 	
 	const getObuActivation = (cmdRandNumSecond) => {
@@ -488,7 +487,7 @@
 			if (status == "9000") {
 				state.disabled = true
 				obu.obuId = res[1].substring(20, 36);
-				if(fileDataStrings.obuId && fileDataStrings.obuId != obu.obuId ) {
+				if(state.transfer == '2' && fileDataStrings.obuId && fileDataStrings.obuId != obu.obuId ) {
 					showModals('车牌obuId与设备obuId不符，请重新选择')
 					return;
 				}
@@ -542,7 +541,7 @@
 			if (str == "9000" || str3 == "9000") {
 				if (res[2].length > 86 || res[3] >= 12) {
 					card.cardId = res[2].substring(20, 40);
-					if(fileDataStrings.cardId && fileDataStrings.cardId != card.cardId ) {
+					if(state.transfer == '2' && fileDataStrings.cardId && fileDataStrings.cardId != card.cardId ) {
 						showModals('车牌cardId与设备cardId不符，请重新选择')
 						return;
 					}