修改bug

subpackage/after-sale/activation/activate.vue

@@ -82,7 +82,8 @@
 		cardObuQueryinLog,
 		obuFileDataDecrypt,
 		vfjObuActive,
-		saveRecord
+		saveRecord,
+		secondActiveSaveRecord
 	} from "@/utils/network/api";
 	import {
 		agentId
@@ -427,13 +428,16 @@
 					tools.hideLoadingAlert();
 					console.log(res);
 					if (res[0] == "9000") {
-						msg('激活成功');
-						navTo(`/pages/index/index`);
-						// uni.switchTab({
-						// 	url: '/pages/index/index'
-						// }).then(res => {
-						// 	navTo(`/pages/order/order?index=${0}`)
-						// })
+						let vehicleData = getItem("currentActivateData");
+						requestNew(secondActiveSaveRecord, {
+								type:2,
+								method:'POST',
+								showLoading:true,
+								data:vehicleData
+						}).then((res) => {
+							msg('激活成功');
+							navTo(`/pages/index/index`);
+						});
 					} else {
 						msg(`激活失败，提示码：${res[0]}`);
 					}

subpackage/personal-center/etc-activation.vue

@@ -567,29 +567,44 @@ const nextStep = () => {
 	// 提交数据
 	console.log('表单数据:', formData)
 	
-	let requests = [];
-	if(activationType.value === 'other') {
-		const options = {
-			type: 2,
-			method: "POST",
-			data: {
-				mobile: formData.phoneNumber,
-				code: formData.smsCode
-			},
-			showLoading: true,
+		
+	requestNew('/iaw/active/checkCanActive',{
+				type: 2,
+				method: "POST",
+				data: {
+					vehiclePlate: activationType.value == 'self' ? formData.vehiclePlate : formData.carNumber,
+					vehiclePlateColor: formData.colorCode,
+					cardId: formData.cardId,
+					obuId: formData.obuId
+				},
+				showLoading: true,
+		}).then(()=>{
+		let requests = [];
+		if(activationType.value === 'other') {
+			const options = {
+				type: 2,
+				method: "POST",
+				data: {
+					mobile: formData.phoneNumber,
+					code: formData.smsCode
+				},
+				showLoading: true,
+			}
+			requests.push(requestNew('/iaw/active/checkSendCode', options));
 		}
-		requests.push(requestNew('/iaw/active/checkSendCode', options));
-	}
-	// if(formData.activeType == '2') {
-	// 	requests.push(getCharacter());
-	// }
-	if(requests.length == 0) {
-		next();
-		return;
-	} 
-	Promise.all(requests).then(res => {
-		next();
-	})
+		// if(formData.activeType == '2') {
+		// 	requests.push(getCharacter());
+		// }
+		if(requests.length == 0) {
+			next();
+			return;
+		} 
+		Promise.all(requests).then(res => {
+			next();
+		})
+	}).catch((error)=>{
+		console.log(error)
+	});
 }
 
 
@@ -604,13 +619,17 @@ const next = () => {
 		vehNegImgUrl: formData.vehNegImgUrlName,
 		vehBodyUrl: formData.vehBodyUrlName,
 		deviceImageUrl: formData.deviceImageName,
+		installImgUrl: formData.deviceImageName,
 		vehicleId: `${carNumber}_${formData.colorCode}`,
 		vehiclePlate: activationType.value === 'other' ? formData.carNumber : formData.vehiclePlate,
+		vehiclePlateColor: formData.colorCode,
 		vehiclePlateColorStr: formData.colorName,
 		customerTel: formData.phoneNumber,
 		vehicleType: formData.vehicleType,
 		cardId: formData.cardId,
-		obuId: formData.obuId
+		obuId: formData.obuId,
+		type: activationType.value == 'self' ? 1 : 2,
+		activeType: formData.activeType
 		// obuId: 'dsjfslkfjlsa'
 	})
 	navTo(`/subpackage/after-sale/activation/operation-tips?id=${formData.orderId}&orderId=${formData.orderNo}&cardStatus=${undefined}&obuStatus=${undefined}&transfer=${formData.activeType}`);

utils/network/api.js

@@ -402,6 +402,7 @@ export const vfjCfmActive = "/iaw/vfj/cfmActive" // VFJ-OBU激活确认
 export const issueConfirm = "/iaw/api/secondActive/issueConfirm" // OBU发行确认接口
 export const reactivateConfirm = "/iaw/api/obu/reactivate/confirm" // 重新激活新增记录
 export const reactivateQuery = "/iaw/api/obu/reactivate/query" // 重新激活记录
+export const secondActiveSaveRecord = "/iaw/active/saveRecords" // 二级激活记录
 // 设备更换（售后）
 export const changeCardObuApply = "/iaw/api/afterSale/changeCardObu/apply" // 卡签更换申请
 export const changeCardObuCancel = "/iaw/api/afterSale/changeCardObu/cancel" // 卡签更换申请取消

utils/network/request.js

@@ -319,8 +319,8 @@ export function requestNew(code, options = {}, start = false, clie = () => {}) {
   };
   console.log("Common", Common, getItem("customerObj"));
   // options.url = envs[process.env.NODE_ENV].baseUrl+'/prod' + code
-  options.url = envs[process.env.NODE_ENV].baseUrl + "/newProd/prod" + code;
-  // options.url = envs[process.env.NODE_ENV].baseUrl + "/newDev/ndev" + code;
+  // options.url = envs[process.env.NODE_ENV].baseUrl + "/newProd/prod" + code;
+  options.url = envs[process.env.NODE_ENV].baseUrl + "/newDev/ndev" + code;
   //默认json数据格式提交`
   let contentType = "application/json";