接口替换

composables/order/useOrderSkip.ts

@@ -92,7 +92,7 @@ export default function useOrderSkip() {
 
 		}
 		console.log("url", url)
-		navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&vanType=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}&vehicleId=${orderInfo.vehicleId}`);
+		navTo(`${url}?orderId=${orderInfo.orderId?orderInfo.orderId:orderInfo.orderNo}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&vanType=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}&vehicleId=${orderInfo.vehicleId}`);
 	}
 
 	//确认收货

static/etcUtil/index.js

@@ -306,7 +306,7 @@ function transCmd(cmdArr, type, func, callBack = null) {
 		case "TD":
 			console.log('TD执行内容====', cmdArr, type)
 			tdApi.transCmd(cmdArr, type, function(res) {
-				console.log('TD执行内容====123', cmdArr, type)
+				console.log('TD执行内容====123', cmdArr, type,res)
 				if (res.code == 0) {
 					func(res.data);
 				} else {

subpackage/after-sale/activation/activate.vue

@@ -204,7 +204,7 @@ function versionVerification(transOrderId, cmd, cmdResult, stepNo){
 		.then((res) => {
 			console.log(stringToJson(res.bizContent));
 			const datas = stringToJson(res.bizContent).data;
-			console.log("在线激活 请求", datas,datas.stepNo,datas.stepNo == 100);
+			console.log("在线激活 请求", datas,datas.stepNo == 100);
 			if (datas.stepNo == 100) {
 				console.log("陈工")
 				cmdResult1()
@@ -271,8 +271,8 @@ function versionVerification(transOrderId, cmd, cmdResult, stepNo){
 		//BDS-二发指令回传 
 		requestNew(issueCallback, options)
 			.then((res) => {
-				console.log(res);
-				const datas = res.data;
+				console.log("BDS-二发指令回传 ",res);
+				const datas = res;
 				console.log("在线激活 请求", datas);
 				if (datas.stepNo == 100) {
 					state.disabled = true

subpackage/after-sale/deviceInfo/deviceInfo.vue

@@ -259,6 +259,8 @@
 						let str2 = res[1].substring(res[1].length - 4, res[1].length);
 						if (str2 == "9000") {
 							if (res[1].length > 108) {
+								console.log("res====",res)
+								console.log("进来了",res[1].substring(4, 44),HexToStrig(res[1].substring(4, 44)))
 								card.userName = HexToStrig(res[1].substring(4, 44)); //姓名
 								card.userName = card.userName[0] + '*'.repeat(card.userName.length - 1)
 								card.idNum = HexToStrig(res[1].substring(44, 108)).replace(/^\d{14}/,
@@ -397,12 +399,13 @@
 			type: 2,
 			data: {
 				obuSerailNo: num,
-				fileData: data
+				fileData: data,
 			},
 			method: "POST",
 			showLoading: true,
 		};
 		requestNew(obuFileDataDecrypt, options).then((res) => {
+			console.log("obuFileDataDecrypt",res)
 			const data =res
 			const FileData = data.data.FileData
 			func(FileData)

subpackage/orders/changeInformation.vue

@@ -240,7 +240,7 @@
 		fileUpload,
 		register,
 		envs,
-		getUserMsg
+		getUserMsg,idCardOcr
 	} from "@/utils/network/api.js";
 
 	import {
@@ -576,7 +576,7 @@
 		state.isTakePhotoModeShow = false
 		var imageType = state.choiceIndex;
 		console.log("图片地址val", val.tempImagePath)
-		uploadFile(val.tempImagePath, imageType, etcOcrCard).then((data) => {
+		uploadFile(val.tempImagePath, imageType, idCardOcr).then((data) => {
 			console.log("身份证上传", data)
 			if (state.isMy == "my") {
 				if (state.choiceIndex == "1") {

subpackage/orders/opening-account-unit.vue

@@ -78,6 +78,10 @@
 					<u-input inputAlign="right" class="clearBg" placeholder='请输入社会信用代码' v-model="state.form.userIdNum"
 						maxlength="50" />
 				</u-form-item>
+				<u-form-item label="营业执照地址">
+					<u-input inputAlign="right" class="clearBg" placeholder='请输入营业执照地址' v-model="state.form.userAddress"
+						maxlength="50" />
+				</u-form-item>
 				<u-form-item label="经办人姓名">
 					<u-input inputAlign="right" class="clearBg" placeholder='请输入经办人姓名' v-model="state.form.agentName"
 						maxlength="20" />
@@ -87,11 +91,11 @@
 						maxlength="18" />
 				</u-form-item>
 				<u-form-item label="经办人地址">
-					<u-input inputAlign="right" class="clearBg" placeholder='请输入经办人地址' v-model="state.form.address"
+					<u-input inputAlign="right" class="clearBg" placeholder='请输入经办人地址' v-model="state.form.agentAddress"
 						maxlength="40" />
 				</u-form-item>
 				<u-form-item label="经办人联系方式">
-					<u-input inputAlign="right" class="clearBg" placeholder='请输入经办人联系方式' v-model="state.form.tel"
+					<u-input inputAlign="right" class="clearBg" placeholder='请输入经办人联系方式' v-model="state.form.agentTel"
 						maxlength="11" />
 				</u-form-item>
 			</u-form>
@@ -126,12 +130,10 @@
 	import viewfinder from "../../components/viewfinder.vue"
 	import {
 		ocrAllQuery,
-		etcCompanyCardInfoSubmit,
-		idCardOcr,registerFull
+		idCardOcr,registerFull,userUpload
 	} from "@/utils/network/api.js";
 
-	import {
-		request, requestNew
+	import { requestNew
 	} from "@/utils/network/request.js";
 
 	import {
@@ -171,7 +173,7 @@
 
 			posImgUrl: "", //营业执照证明
 			department: '本部', //不超过50个字符，若单位仅开一个账户，填写“本部”
-			address: "", //单位地址
+			userAddress: "", //单位地址
 			//经办人信息
 			agentName: "",
 			agentIdType: "101",
@@ -179,7 +181,7 @@
 			agentAddress: "",
 			agentPhone: "",
 			agentIdVld: '',
-			tel: '',
+			agentTel: '',
 			agentGender: '',
 			agentPosImgUrl: "",
 			agentNegImgUrl: "",
@@ -189,11 +191,15 @@
 			channelId: "", //渠道id
 			opId: '',
 			orderSource: 'WECHAT',
+			isAgent:true,  //经办人办理
+			userNegImgUrl:"",
+			userPosImgUrl:"",
+			tel:""
 		},
 		orderId: "",
 		vehiclePlateColor: '',
 		isSign: '',
-		type: 1,
+		vanType: 1,
 		vehicleId: "",
 		jsCode:""
 	});
@@ -232,6 +238,10 @@
 			msg('请输入社会信用代码');
 			return;
 		}
+		if (!state.form.userAddress) {
+			msg('请输入营业执照地址');
+			return;
+		}
 		if (!state.form.agentName) {
 			msg('请输入经办人姓名');
 			return;
@@ -240,10 +250,11 @@
 			msg('请输入正确的经办人身份证号');
 			return;
 		}
-		if (!checkStr(state.form.tel, 'mobile')) {
+		if (!checkStr(state.form.agentTel, 'mobile')) {
 			msg('请输入正确的经办人联系方式');
 			return;
 		}
+		state.form.tel=state.form.agentTel
 		registerRequest().then((result : any) => {
 			console.log("result", result)
 			if (!getItem('openId')) {
@@ -258,10 +269,10 @@
 				method: "POST",
 				showLoading: true,
 			};
-			request(etcCompanyCardInfoSubmit, options).then((res) => {
-				const data = stringToJson(res.bizContent);
+			requestNew(userUpload, options).then((res) => {
+				const data = res;
 				uni.redirectTo({
-					url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&vehicleId=${state.vehicleId}`,
+					url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&vanType=${state.vanType}&vehicleId=${state.vehicleId}`,
 				});
 			});
 		})
@@ -274,7 +285,7 @@
 		state.vehiclePlateColor = option.vehiclePlateColor;
 		state.form.opId = getItem('openId') ? getItem('openId') : '';
 		state.isSign = option.isSign;
-		state.type = option.type;
+		state.vanType = option.vanType;
 		state.vehicleId = option.vehicleId;
 		console.log("state.type", option)
 		uni.login({
@@ -309,6 +320,8 @@
 							'统一社会信用代码'];
 						uploadFile(res.tempFilePaths[0], "", "").then((data) => {
 							state.form.posImgUrl = data;
+							state.form.userNegImgUrl = data;
+							state.form.userPosImgUrl = data;
 						})
 					}
 				})
@@ -386,7 +399,7 @@
 				state.form.agentName = data.name;
 				state.form.agentIdNum = data.idno;
 				state.form.agentPosImgUrl = data.imageUrl;
-				state.form.address = data.address;
+				state.form.agentAddress = data.address;
 				state.form.agentGender = data.gender;
 			} else {
 				state.form.agentIdVld = data.enddate;
@@ -431,11 +444,11 @@
 			userType: "ENTERPRISE",
 			idNum: state.form.userIdNum,
 			idType: state.form.userIdType,
-			mobile: state.form.tel,
+			mobile: state.form.agentTel,
 			userName: state.form.userName,
 			gender: 'UNKOWN',
 			certifyChannel: "BAIDUOCR",
-			address: state.form.address,
+			address: state.form.userAddress,
 			agentIdNum: state.form.agentIdNum,
 			agentIdType: state.form.agentIdType,
 			agentName: state.form.agentName,