修改bug

composables/order/useOrderSkip.ts

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

subpackage/after-sale/account-recharge/consumption-record.vue

@@ -82,11 +82,18 @@
 		padding: 0 30rpx;
 		overflow: hidden;
 		font-size: 32rpx;
+		padding-top: 100rpx;
 	}
 
 	.search_wrap {
 		display: flex;
-		margin: 20rpx 0;
+		position: fixed;
+		left: 0;
+		top: 0;
+		background-color: #EEF7F7;
+		width: 100%;
+		padding: 20rpx;
+		box-sizing: border-box;
 	}
 
 	.search_wrap>input {

subpackage/after-sale/account-recharge/recharge-record.vue

@@ -69,11 +69,18 @@
 		padding: 0 30rpx;
 		overflow: hidden;
 		font-size: 32rpx;
+		padding-top: 100rpx;
 	}
 
 	.search_wrap {
 		display: flex;
-		margin: 20rpx 0;
+		position: fixed;
+		left: 0;
+		top: 0;
+		background-color: #EEF7F7;
+		width: 100%;
+		padding: 20rpx;
+		box-sizing: border-box;
 	}
 
 	.search_wrap>input {

subpackage/after-sale/additional-equipment/additional-equipment-confirm.vue

@@ -60,7 +60,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="">
+		<view v-if="state.data.obuId">
 			<view class="title">
 				OBU设备信息
 			</view>

subpackage/after-sale/corporate-account-query/corporate-account-query.vue

@@ -109,8 +109,8 @@
 		};
 		request(accountApi, options).then((res) => {
 			const data = stringToJson(res.bizContent);
-			var getData = [...stringToJson(res.bizContent).qtkCorporateAccounts, ...state.listData]
-			console.log("getData", getData)
+			console.log("getData", data.data)
+			var getData = [...stringToJson(res.bizContent).data, ...state.listData]
 			for (var i = 0; i < getData.length; i++) {
 				for (var m = 0; m < state.businessRange.length; m++) {
 					if (getData[i]['status'] == state.businessRange[m]['value']) {
@@ -120,7 +120,7 @@
 				}
 			}
 			state.listData = getData
-			state.total = data.qtkCorporateAccounts.length
+			state.total = data.data.length
 			console.log("业务完成日志", state.listData, state.pageNo,)
 		});
 	}

subpackage/orders/car-release.vue

@@ -238,7 +238,8 @@
 		envs,
 		queryGuoHuJianCe,
 		queryGuoHuCaoZuo,
-		ocrAllQuery
+		ocrAllQuery,
+		carMessageApi
 	} from "@/utils/network/api.js";
 	import { request } from "@/utils/network/request.js";
 
@@ -525,6 +526,9 @@
 		state.form.orderId = option.orderId;
 		state.form.type = option.type;
 		state.vehiclePlateColor = option.vehiclePlateColor;
+		if (option.vehicleId) {
+			state.form.vehicleId = option.vehicleId;
+		}
 		console.log("option", option)
 		getGlobalParam();
 		if (option.type == 1) {
@@ -617,6 +621,83 @@
 		} else {
 			state.isEnableChangeOCRCarInfo = true;
 		}
+		// 中办时是否允许带出车辆信息
+		console.log("11", getCodeName('IS_ENABLE', data.applyCarInfo))
+		if (getCodeName('IS_ENABLE', data.applyCarInfo) == '启用') {
+			// 获取车辆信息
+			getCarMessage()
+			console.log("11")
+		}
+	}
+	const getCarMessage = () => {
+		const options = {
+			type: 2,
+			data: {
+				vehicleId: state.form.vehicleId,
+				// vehicleId: "贵ZAAA44_0",
+			},
+			method: "POST",
+			showLoading: true,
+		};
+
+		request(carMessageApi, options).then((res) => {
+			const data = stringToJson(res.bizContent);
+			console.log("通过vehicleId查询车辆信息", data)
+			if (data.data) {
+				writeMsg(data.data)
+			}
+			// state.form.userPosImgUrl = data.customerPosImgUrl;
+			// state.form.userNegImgUrl = data.customerNegImgUrl;
+			// state.form.userName = data.customerName;
+			// state.form.userIdNum = data.customerIdNum;
+			// state.form.address = data.customerAddress;
+			// state.form.tel = data.customerTel;
+		})
+	}
+	const writeMsg = (allData) => {
+		console.log("车辆信息", allData);
+		state.form.ownPosImgUrl = allData['ownerPosImgUrl']
+		state.form.ownNegImgUrl = allData['ownerNegImgUrl']
+		state.form.userName = allData['contacts']
+		state.form.userIdNum = allData['ownerIdNum']
+		state.form.ownerIdNum = allData['ownerIdNum']
+		state.form.address = allData['ownerAddress']
+		state.form.tel = allData['ownerTel']
+		state.form.vehPosImgUrl = allData['vehPosImgUrl']
+		state.form.vehNegImgUrl = allData['vehNegImgUrl']
+		state.form.vehBodyUrl = allData['vehBodyUrl']
+		state.form.vehicleIdNum = allData['vehiclePlate']
+		state.form.ownerName = allData['ownerName']
+		state.form.vehicleType = allData['vehicleType']
+		// state.form.character = allData['vehicleType']  //使用性质
+		state.form.vin = allData['vin']
+		state.form.engineNum = allData['engineNum']
+		state.form.register = allData['registerDate']
+		state.form.issueDate = allData['issueDate']
+		state.form.approvedCountShow = allData['approvedCount']
+		state.form.maintenaceMassShow = allData['maintenaceMass']
+		state.form.approvedCount = allData['approvedCount']
+		state.form.maintenaceMass = allData['maintenaceMass']
+		allData['vehicleDimensions']
+		let arr = allData['vehicleDimensions'].split("X");
+		state.outlineL = parseInt(arr[0]); //外廓 长
+		state.outlineW = parseInt(arr[1]); //外廓 宽
+		state.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
+		state.form.totalMassShow = allData['totalMass']
+		state.form.totalMass = allData['totalMass']
+		state.form.axleCount = allData['axleCount'] ? allData['axleCount'] : 2
+		if (allData['useUserType'] == 0) {
+			state.form.useUserTypeName = "普通车"
+		} else if (allData['useUserType'] == 24) {
+			state.form.useUserTypeName = "道路运输证经营范围仅有“货物专用运输(集装箱) ”的牵引车办理J类型集装箱"
+		} else if (allData['useUserType'] == 27) {
+			state.form.useUserTypeName = "道路运输证经营范围不含“货物专用运输(集装箱)”的牵引车"
+		} else if (allData['useUserType'] == 28) {
+			state.form.useUserTypeName = "道路运输证经营范围除'货物专用运输 (集装 箱)'外，还有“普通货运”等其他项目的牵引车办理J2类型集装箱"
+		}
+
+		state.vehiclePlateColor = allData['vehiclePlateColor']
+		state.form.customerId = allData['customerId']
 	}
 	const bindDateChange1 = (e) => {
 		state.form.register = e.detail.value

subpackage/orders/components/layout-numberplate-color.vue

@@ -50,7 +50,7 @@
 			{ src: 'bg-yellow_green', checkSrc: 'icon-select-yellow_green', id: 5, color: '#ffffff', title: '黄绿双拼色' },
 			{ src: 'bg-black', checkSrc: 'icon-select-black', id: 2, color: '#ffffff', title: '黑色' },
 			{ src: 'bg-white', checkSrc: 'icon-select-white', id: 3, color: '#000000', title: '白色' },
-			{ src: 'bg-white_blue', checkSrc: 'icon-select-blue', id: 6, color: '#ffffff', title: '蓝白渐变' },
+			{ src: 'bg-white_blue', checkSrc: 'icon-select-blue', id: 6, color: '#ffffff', title: '蓝白渐变色' },
 			{ src: 'green', checkSrc: 'icon-green', id: 11, color: '#ffffff', title: '绿色' },
 			{ src: 'rad', checkSrc: 'icon-select-red', id: 12, color: '#ffffff', title: '红色' },
 		]
@@ -68,7 +68,7 @@
 		if (props.type == "1") {
 			for (var i = 0; i < data.carPlateColorType.length; i++) {
 				for (var j = 0; j < state.allColorList.length; j++) {
-					console.log("23", getCodeName('VEHICLE_COLOR_TYPE', data.trucksPlateColorType[i]))
+					console.log("23", getCodeName('VEHICLE_COLOR_TYPE', data.carPlateColorType[i]))
 					if (state.allColorList[j].title == getCodeName('VEHICLE_COLOR_TYPE', data.carPlateColorType[i])) {
 						state.numberplateColorList.push(state.allColorList[j])
 					}

subpackage/orders/essential-information-two.vue

@@ -188,13 +188,15 @@
 					console.log("产品信息", result);
 					// 加购权益产品
 					addProductRequest().then((res) => {
+						var vehicleId = state.data.vehiclePlate + "_" + state.data.vehiclePlateColor
+						console.log("state.data.vehiclePlate", state.data.vehiclePlate, state.data.vehiclePlateColor, vehicleId)
 						if (state.data.userType == 1) {
 							uni.navigateTo({
-								url: `/subpackage/orders/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isValueCard}&type=${state.data.type}`,
+								url: `/subpackage/orders/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isValueCard}&type=${state.data.type}&vehicleId=${vehicleId}`,
 							});
 						} else {
 							uni.navigateTo({
-								url: `/subpackage/orders/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isValueCard}&type=${state.data.type}`,
+								url: `/subpackage/orders/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}&isSign=${state.isValueCard}&type=${state.data.type}&vehicleId=${vehicleId}`,
 							});
 						}
 					})
@@ -228,28 +230,28 @@
 		if (val.orderStep === 1) {
 			if (state.data.userType === 1 || val.orderStep === 27) {
 				uni.redirectTo({
-					url: `/subpackage/orders/opening-account-people?orderId=${val.orderId}&&vehiclePlateColor=${val.vehiclePlateColor}`,
+					url: `/ subpackage / orders / opening - account - people ? orderId = ${val.orderId}&& vehiclePlateColor=${val.vehiclePlateColor} `,
 				});
 			} else {
 				uni.redirectTo({
-					url: `/subpackage/orders/opening-account-unit?orderId=${val.orderId}&&vehiclePlateColor=${val.vehiclePlateColor}`,
+					url: `/ subpackage / orders / opening - account - unit ? orderId = ${val.orderId}&& vehiclePlateColor=${val.vehiclePlateColor} `,
 				});
 			}
 		} else if (val.orderStep === 2) {
 			uni.redirectTo({
-				url: `/subpackage/orders/car-release?orderId=${val.orderId}&&vehiclePlateColor=${val.vehiclePlateColor}`,
+				url: `/ subpackage / orders / car - release ? orderId = ${val.orderId}&& vehiclePlateColor=${val.vehiclePlateColor} `,
 			});
 		} else if (val.orderStep === 3) {
 			uni.redirectTo({
-				url: `/subpackage/orders/choice-product?orderId=${val.orderId}`,
+				url: `/ subpackage / orders / choice - product ? orderId = ${val.orderId} `,
 			});
 		} else if (val.orderStep === 4) {
 			uni.redirectTo({
-				url: `/subpackage/orders/product-detail?orderId=${val.orderId}&&clientFee=${val.product.clientFee}&&id=${val.productId}`,
+				url: `/ subpackage / orders / product - detail ? orderId = ${val.orderId}&& clientFee=${val.product.clientFee}&& id=${val.productId} `,
 			});
 		} else if (val.orderStep === 26) {
 			uni.redirectTo({
-				url: `/subpackage/orders/product-detail?orderId=${val.orderId}&&clientFee=${val.product.clientFee}&&id=${val.productId}`,
+				url: `/ subpackage / orders / product - detail ? orderId = ${val.orderId}&& clientFee=${val.product.clientFee}&& id=${val.productId} `,
 			});
 		}
 	};

subpackage/orders/flowingWater.vue

@@ -232,6 +232,7 @@
 		});
 	};
 	const checkQuanCengEvent = (val : any) => {
+		console.log("圈存====", val)
 		if (val.chargeStatus === 1) {
 			let cmdArr = val.command.split(",");
 			uni.showLoading({
@@ -241,7 +242,7 @@
 				let response = res.toString();
 				var dic = {
 					command: val.command,
-					cosResponse: response,
+					cosResponse: response
 				};
 				uni.hideLoading();
 				quanApplyAction(dic).then((value) => {
@@ -251,7 +252,23 @@
 					if (value.commandType === 2) {
 						uanConfirmAction(value)
 					} else {
-						msg("圈存初始化指令验证失败, 重新初始化");
+						// 一直写，写到成功为止
+						let cmdArrTwo = value.command.split(",")
+						bluetoothUtil.transCmd(cmdArrTwo, "10", function (res) {
+							console.log(value);
+							var valueResponse = res.toString();
+							console.log(response);
+							var applyDic = {
+								command: value.command,
+								cosResponse: valueResponse,
+								rechargeId: value.rechargeId,
+							};
+							quanApplyAction(applyDic).then((applyValue) => {
+								uanConfirmAction(applyValue)
+							});
+						})
+
+						// msg("圈存初始化指令验证失败, 重新初始化");
 					}
 				});
 

subpackage/orders/invoiceApply/invoice-content.vue

@@ -46,6 +46,7 @@
 					<view class="content">
 						<view class="title">订单号：{{item.orderNo}}</view>
 						<view class="title">订单时间：{{item.orderTime}}</view>
+						<view class="title" v-if="item.productType">订单类型：{{item.productType}}</view>
 						<view class="title">车牌号：{{item.vehiclePlate}}</view>
 						<view class="title">订单金额：￥{{item.invoiceAmount}}</view>
 						<view class="title">开票状态：{{item.status==1?'已开票':"可开票"}}</view>

subpackage/orders/opening-account-people.vue

@@ -317,6 +317,7 @@
 		isEnableBook: true,  //他人办理时是否上传委托书
 		isEnableInfo: true,  //小程序信息带出
 		isEnableOCRData: true,  //允许修改OCR识别出来的数据
+		vehicleId: ""
 	});
 	const userGenderAction = () => {
 		state.genderShow = true;
@@ -375,7 +376,7 @@
 				request(etcUserCardInfoSubmit, options).then((res) => {
 					console.log(res);
 					uni.redirectTo({
-						url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&isSign=${state.isSign}`,
+						url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&isSign=${state.isSign}&vehicleId=${state.vehicleId}`,
 					});
 				});
 			}
@@ -437,6 +438,7 @@
 		state.form.opId = getItem('openId') ? getItem('openId') : '';
 		state.isSign = option.isSign;
 		state.type = option.type;
+		state.vehicleId = option.vehicleId;
 		getGlobalParam(); //全局配置数据
 		console.log("option", option)
 	});

subpackage/orders/opening-account-unit.vue

@@ -195,7 +195,8 @@
 		orderId: "",
 		vehiclePlateColor: '',
 		isSign: '',
-		type: 1
+		type: 1,
+		vehicleId: ""
 	});
 
 	const savaHandle = () => {
@@ -260,7 +261,7 @@
 				request(etcCompanyCardInfoSubmit, options).then((res) => {
 					const data = stringToJson(res.bizContent);
 					uni.redirectTo({
-						url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}`,
+						url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&vehicleId=${state.vehicleId}`,
 					});
 				});
 			}
@@ -275,6 +276,7 @@
 		state.form.opId = getItem('openId') ? getItem('openId') : '';
 		state.isSign = option.isSign;
 		state.type = option.type;
+		state.vehicleId = option.vehicleId;
 		console.log("state.type", option)
 	});
 

subpackage/orders/order_payment.vue

@@ -55,7 +55,7 @@
 		if (counter == 2) {
 			clearInterval(intervalId);
 			state.isclick = true
-			console.log("已打印次");
+			console.log("改为true");
 		}
 	}
 
@@ -172,6 +172,7 @@
 									});
 								} else {
 									state.isclick = true
+									console.log("state.isclick", state.isclick)
 								}
 
 							});

utils/network/api.js

@@ -26,7 +26,7 @@ export const envs = {
 
 export const appId = "52030131"; //应用appid 综合业务支撑平台使用
 export const loginTime = 86400; //登录有效时间（单位s） 1天
-export const wechatPayConfigId = "6a9a54bc01f6443faea7ffe132b19f6"; //支付配置编号 微信小程序支付:6a9a54bc01f6443faea7ffe132b19f6
+export const wechatPayConfigId = "6a9a54bc01f6443faea7ffe132b19f8"; //支付配置编号 微信小程序支付:6a9a54bc01f6443faea7ffe132b19f6
 export const aliPayConfigId = "6a9a54bc01f6443123452b1234"; //支付配置编号 支付宝小程序支付:6a9a54bc01f6443123452b1234
 export const aliPayConfigIdTwo = "6a9a54bc01f644312543761234";
 // export const aliPayConfigIdTwo = "6a9a54bc01f6443123452b1";
@@ -314,4 +314,5 @@ export const ETCProductInvoiceApi = "32bab1eee9c34694baa37c9ed222d431" // ETC产
 export const invoiceQueryApi = "bd1340041fab4303899d41d23109e46a" // 发票查询
 export const flowServiceFee = "1a78cda7cace443f9cff63902fb3d35c" // 通行流水服务费批量开票
 
-export const silentLoginApi = "abaf0013caa24dafad12b0f571e8ee40" // 无感登录
+export const silentLoginApi = "abaf0013caa24dafad12b0f571e8ee40" // 无感登录
+export const carMessageApi = "854899f6244049d69b6ff883f28dcb28" // 车辆信息上传带出车辆信息

utils/utils.ts

@@ -655,7 +655,7 @@ export function subscribeMessages() {
 // 通知用户消息订阅
 export const noticeUser = (callback : Function) => {
 	uni.requestSubscribeMessage({
-		tmplIds: ['Uo2y_eF53CZt7vffE-5ktKQ7WxUhX8n5GVqVlmykmDE'],
+		tmplIds: ['u7u0yO2dkYBISpox815e1S_fcUyl9B9qyxAK7aBjuho'],
 		complete(res) {
 			console.log("通知用户消息订阅", res)
 			callback()