Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-sp

subpackage/after-sale/activation-once-again/vehicle-details.vue

@@ -32,10 +32,10 @@
         <text class="label">车辆所有人电话</text>
         <text class="value">{{ vehicleInfo.ownerTel }}</text>
       </view>
-      <view class="info-item">
+      <!-- <view class="info-item">
         <text class="label">车辆号码</text>
         <text class="value">{{ vehicleInfo.vehicleId }}</text>
-      </view>
+      </view> -->
       <view class="info-item">
         <text class="label">行驶证车辆类型</text>
         <text class="value">{{ vehicleInfo.vehicleType }}</text>
@@ -391,13 +391,13 @@ const changeVehicleInfo = () => {
     .label {
       font-size: 28rpx;
       color: #666;
-      flex: 1;
+      // flex: 0;
     }
 
     .value {
       font-size: 28rpx;
       color: #333;
-      flex: 2;
+      // flex: 1;
       text-align: right;
     }
   }

subpackage/after-sale/activation/activate.vue

@@ -111,6 +111,9 @@
 	import {
 		channelId
 	} from "@/utils/network/difference";
+	import {
+		getCodeName, getDicWithType
+	} from "@/datas/queryKey.js";
 	const state = reactive({
 		orderId: "",
 		id: "",
@@ -126,9 +129,24 @@
 		ObuVersion: "",
 		ChipSn: ""
 	})
+	
+	const getCurrentActivateData = () => {
+		let activateData = getItem('currentActivateData');
+		if(activateData) {
+			fileDataStrings.vehiclePlate = activateData.vehiclePlate;
+			fileDataStrings.vehicleId = activateData.vehicleId;
+			fileDataStrings.vehiclePlateColorStr = activateData.vehiclePlateColorStr;
+			fileDataStrings.customerTel = activateData.customerTel;
+			fileDataStrings.vehicleClass = activateData.vehicleType;
+			fileDataStrings.vehicleClassStr = getCodeName('VEHICLE_TYPE', activateData.vehicleType);
+			fileDataStrings.obuId = activateData.obuId;
+			fileDataStrings.cardId = activateData.cardId;
+		}
+	}
 
 	onLoad((option) => {
 		//读取传入 存储的数据orderInfo
+		getCurrentActivateData()
 		let orderData = getItem("orderInfo");
 		state.id = orderData.id;
 		console.log(state);
@@ -140,6 +158,7 @@
 			getObuId();
 		}
 		
+		
 		console.log("state.transfer", state.transfer, state.transfer == 0, state.transfer == 1, getItem(
 			"orderInfo"))
 	})
@@ -222,7 +241,10 @@
 		customerTel: "",
 		customerId: "",
 		orderId: "",
-		vehicleClassStr: ""
+		vehicleType: '',
+		vehicleClass: '',
+		vehicleClassStr: "",
+		vehicleId: '',
 	});
 
 	function cmdResult1() {
@@ -363,13 +385,28 @@
 	}
 	
 	const cmdResult2 = () => {
+		let cmdArr = [cmd.HOME_DIRECTORY, cmd.RANDOM_NUMBER];
+		bluetoothUtil.transCmd(cmdArr, '20', function (res) {
+			var str = res[1].substring(res[1].length - 4, res[1].length);
+			if (str == "9000") {
+				let cmdRandNum = res[1].substring(0, res[1].length - 4);
+				getObuActivation(cmdRandNum);
+			} else {
+				tools.alertF("RANDOM_NUMBER指令长度不符" + res[1]);
+			}
+		})
+		
+	}
+	
+	const getObuActivation = (cmdRandNumSecond) => {
 		const options = {
 			type: 2,
 			data: {
 				"cardId": card.cardId,
 				"obuId": obu.obuId,
-				"random": cmdRandNum,
-				"vehicleId": getItem('vehicleId')
+				"random": cmdRandNumSecond,
+				"vehicleId": fileDataStrings.vehicleId,
+				"vehicleType": fileDataStrings.vehicleClass
 			},
 			method: "POST",
 			showLoading: false,
@@ -388,7 +425,12 @@
 					console.log(res);
 					if (res[0] == "9000") {
 						msg('激活成功');
-						navTo(`/pages/order/order?index=${0}`);
+						// navTo(`/pages/order/order?index=${0}`);
+						uni.switchTab({
+							url: '/pages/index/index'
+						}).then(res => {
+							navTo(`/pages/order/order?index=${0}`)
+						})
 					} else {
 						msg(`激活失败，提示码：${res[0]}`);
 					}
@@ -426,7 +468,8 @@
 				fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo
 					.vehiclePlateColor);
 				fileDataStrings.vehiclePlate = orderInfo.vehiclePlate; //车牌
-				fileDataStrings.vehicleClassStr = orderInfo.vehicleClassStr;
+				fileDataStrings.vehicleClass = orderInfo.vehicleClass;
+				fileDataStrings.vehicleClassStr = getCodeName('VEHICLE_TYPE', activateData.vehicleClass);
 			}
 		});
 		getObuId();
@@ -445,6 +488,10 @@
 			if (status == "9000") {
 				state.disabled = true
 				obu.obuId = res[1].substring(20, 36);
+				if(fileDataStrings.obuId && fileDataStrings.obuId != obu.obuId ) {
+					showModals('车牌obuId与设备obuId不符，请重新选择')
+					return;
+				}
 				// obu.obuId = '5201250802001105';
 				obu.vin = res[1].substring(18, 20);
 				obu.version = res[1].substring(18, 20);
@@ -495,6 +542,10 @@
 			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 ) {
+						showModals('车牌cardId与设备cardId不符，请重新选择')
+						return;
+					}
 					// card.cardId = '52012511110201724155';
 					state.CardVersion = res[2].substring(18, 20),
 						tools.hideLoadingAlert();

subpackage/personal-center/etc-activation.vue

@@ -243,6 +243,7 @@ const waitTime = ref(0)
 let timer: any = null
 
 const formData = reactive({
+	vehicleType: '',
 	carNumber: '',
 	vehicleIndex: '',
 	vehiclePlate: '',
@@ -263,6 +264,8 @@ const formData = reactive({
 	activeType: '',
 	orderId: '',
 	orderNo: '',
+	cardId: '',
+	obuId: ''
 })
 
 const reset = () => {
@@ -351,6 +354,9 @@ const queryVehicleData = (vehicleId) => {
 			formData.activeType = vehicle.activeType;
 			formData.orderId = vehicle.orderId;
 			formData.orderNo = vehicle.orderNo;
+			formData.vehicleType = vehicle.vehicleType;
+			formData.cardId = vehicle.cardId;
+			formData.obuId = vehicle.obuId;
 		}
 	})
 }
@@ -389,11 +395,14 @@ const bindPickerChange = (e) => {
 	formData.vehiclePlate = vehicle.vehiclePlate;
 	formData.colorCode = vehicle.vehiclePlateColor;
 	formData.activeType = vehicle.activeType;
+	formData.vehicleType = vehicle.vehicleType;
     const colorItem = getDicWithType('VEHICLE_COLOR_TYPE').find(item => item.code == formData.colorCode);
 	formData.colorName = colorItem.name;
 	formData.phoneNumber = vehicle.mobile
 	formData.orderId = vehicle.orderId;
 	formData.orderNo = vehicle.orderNo;
+	formData.cardId = vehicle.cardId;
+	formData.obuId = vehicle.obuId;
 };
 
 const bindColorPickerChange = (e) => {
@@ -505,6 +514,7 @@ const carNumberInputResult = (val: string) => {
 
 // 下一步
 const nextStep = () => {
+	// return;
 	// 表单验证
 	if (!formData.carNumber && activationType.value === 'other') {
 		uni.showToast({
@@ -651,18 +661,24 @@ const getCharacter = () => {
 }
 
 const next = () => {
+	
 	console.log('formData', formData);
 	let carNumber = activationType.value == 'self' ? formData.vehiclePlate : formData.carNumber;
-	setItem('vehicleId', `${carNumber}_${formData.colorCode}`)
+	// setItem('vehicleId', )
 	// if(formData.activeType == '1') {
-		setItem('vehicleUrl', {
-			front: vehicleFrontData.imageName,
-			back: vehicleBackData.imageName
-		})
-		navTo(`/subpackage/after-sale/activation/operation-tips?id=${formData.orderId}&orderId=${formData.orderNo}&cardStatus=${undefined}&obuStatus=${undefined}&transfer=${formData.activeType}`);
-	// } else {
-		
-	// }
+	setItem('currentActivateData', {
+		vehicleFrontImgUrl: vehicleFrontData.imageName,
+		vehicleBackImgUrl: vehicleBackData.imageName,
+		vehicleId: `${carNumber}_${formData.colorCode}`,
+		vehiclePlate: activationType.value === 'other' ? formData.carNumber : formData.vehiclePlate,
+		vehiclePlateColorStr: formData.colorName,
+		customerTel: formData.phoneNumber,
+		vehicleType: formData.vehicleType,
+		cardId: formData.cardId,
+		obuId: formData.obuId
+		// obuId: 'dsjfslkfjlsa'
+	})
+	navTo(`/subpackage/after-sale/activation/operation-tips?id=${formData.orderId}&orderId=${formData.orderNo}&cardStatus=${undefined}&obuStatus=${undefined}&transfer=${formData.activeType}`);
 }
 </script>