提交

composables/order/useOrderSkip.ts

@@ -11,10 +11,10 @@ import { deviceType } from "@/utils/network/difference";
 export default function useOrderSkip() {
 	const gotoOrderDetailsPay = (orderInfo) => {
 		// #ifdef MP-WEIXIN
-		navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}`);
+		navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}&vehicleId=${orderInfo.vehicleId}`);
 		// #endif
 		// #ifdef MP-ALIPAY
-		navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}`);
+		navTo(`/subpackage/orders/order_payment?orderId=${orderInfo.orderId}&isValueCard=${orderInfo.isValueCard}&vehicleId=${orderInfo.vehicleId}`);
 		// #endif
 	}
 	//根据订单类型 跳转到不同的订单详情页面

subpackage/after-sale/activation-once-again/activation-once-again-ali.vue

@@ -288,16 +288,6 @@
 			orderInfos.cardStatus = orderInfo.cardStatus;
 			orderInfos.obuId = orderInfo.obuId;
 			orderInfos.obuStatus = orderInfo.obuStatus;
-			if(orderInfo.vehicleDimensions){
-				let arr = orderInfo.vehicleDimensions.split("X");
-				orderInfos.outlineL = parseInt(arr[0]); //外廓 长
-				orderInfos.outlineW = parseInt(arr[1]); //外廓 宽
-				if(arr[2].includes('mm')){
-					orderInfos.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
-				}else{
-					orderInfos.outlineH = parseInt(arr[2]); //外廓 高
-				}
-			}
 
 			orderInfos.type = orderInfo.type;
 			orderInfos.axleCount = orderInfo.vehicleAxleCount;

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

@@ -238,8 +238,6 @@
 			return;
 		}
 		console.log("state.form.vehicleIdNum", state.form.vehicleIdNum, state.form.vehicleIdNumB, orderInfos.vehiclePlate)
-		// if (state.form.vehicleIdNum == orderInfos.vehiclePlate) {
-		// 	if (state.form.vehicleIdNumB == orderInfos.vehiclePlate) {
 				activationRecordQuery().then((val) => {
 					console.log("激活次数", val)
 					if (val.limit) {
@@ -248,12 +246,6 @@
 						msg("一年内到达激活次数上限5次")
 					}
 				});
-		// 	} else {
-		// 		msg("请上传正确行驶证副页")
-		// 	}
-		// } else {
-		// 	msg("请上传正确行驶证")
-		// }
 	};
 
 	//获取订单详情

subpackage/orders/car-release.vue

@@ -378,7 +378,7 @@
 								state.show = true;
 							} else {
 								uni.redirectTo({
-									url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}`,
+									url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
 								});
 							}
 						}, 1000)
@@ -390,7 +390,7 @@
 							});
 						} else {
 							uni.redirectTo({
-								url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}`,
+								url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
 							});
 
 						}
@@ -420,7 +420,7 @@
 		};
 		request(etcCarCardInfoSubmit, options).then((res) => {
 			uni.redirectTo({
-				url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}`,
+				url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
 			});
 		})
 	}
@@ -614,7 +614,7 @@
 			const data = stringToJson(res.bizContent);
 			state.show = false;
 			uni.redirectTo({
-				url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}`,
+				url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
 			});
 		}).catch((error) => {
 			reject(error);

subpackage/orders/order_payment.vue

@@ -61,9 +61,9 @@
 
 	var intervalId = setInterval(myFunc, 2000);
 	const savaHandle = (val) => {
-		console.log("val",val)
-		// etcVehiclePlateVerRequest().then(() => {
-			if (state.isclick) {
+		console.log("val", val)
+		if (state.isclick) {
+			etcVehiclePlateVerRequest().then(() => {
 				if (val.payStatus == "SUCCESS") {
 					return;
 				}
@@ -113,7 +113,7 @@
 											console.log("支付失败", res);
 										},
 									});
-			
+
 								});
 							});
 						},
@@ -122,7 +122,7 @@
 							state.isclick = true
 						}
 					});
-			
+
 					// #endif
 					// #ifdef MP-WEIXIN
 					uni.login({
@@ -176,18 +176,18 @@
 										state.isclick = true
 										console.log("state.isclick", state.isclick)
 									}
-			
+
 								});
 							});
 						},
 					});
-			
-			
+
+
 					// #endif
 				}
-			}
-		// })
-		
+			})
+		}
+
 	};
 	const getOpenID = () => {
 		uni.login({
@@ -288,6 +288,7 @@
 		console.log("传递过来的到支付页面", option)
 		state.orderId = option.orderId;
 		state.isValueCard = option.isValueCard;
+		state.vehicleId = option.vehicleId;
 		let source = ""
 
 		// #ifdef MP-ALIPAY
@@ -428,12 +429,13 @@
 		],
 		openid: "",
 		isclick: true,//防止重复点击
+		vehicleId: ""
 	});
 	// 车牌校验
 	const etcVehiclePlateVerRequest = () => {
 		let data = {
-			vehiclePlate: vehiclePlate,
-			vehiclePlateColor:vehiclePlateColor,
+			vehiclePlate: state.vehicleId.split('_')[0],
+			vehiclePlateColor: state.vehicleId.split('_')[1],
 		}
 		const options = {
 			type: 2,

subpackage/orders/product-detail.vue

@@ -67,17 +67,6 @@
 	} from "@/datas/fileURL.js";
 	import navBgCar from "./components/nav-bg-car5";
 	import navBar from "@/components/nav-bar/nav-bar2.vue";
-
-	import {
-		getItem,
-		StorageKeys
-	} from "@/utils/storage.ts";
-	import {
-		wechatAppID,
-		wechatPayConfigId,
-		wechatSecret,
-		queryDetails
-	} from "@/utils/network/api";
 	import {
 		confirm,
 		msg
@@ -99,7 +88,7 @@
 			console.log("state.checked", state.checked)
 			if (state.checked) {
 				uni.navigateTo({
-					url: `/subpackage/orders/order_payment?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&&isValueCard=${state.isValueCard}`,
+					url: `/subpackage/orders/order_payment?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&&isValueCard=${state.isValueCard}&vehicleId=${state.vehicleId}`,
 				});
 			} else {
 				msg("请勾选协议");
@@ -187,6 +176,7 @@
 		console.log("传递过来的参数", option)
 		console.log("查协议", envs[process.env.NODE_ENV].baseUrl)
 		state.id = option.id;
+		state.vehicleId = option.vehicleId;
 		getOpenID();
 		refresh();
 		if (option.url) {
@@ -225,6 +215,7 @@
 		checked: false,
 		agreeURL: "",
 		typeScanCode: 0,//扫码进来得
+		vehicleId:""
 	});
 	const bindClick = (i) => {
 		console.log(i);
@@ -276,26 +267,6 @@
 		};
 		request(addProduct, options).then((res) => { });
 	}
-	const changeIsShow = (index) => {
-		console.log(index, state.list[index]['isShow'], !state.list[index]['isShow'])
-		state.list[index]['isShow'] = !state.list[index]['isShow']
-		console.log("state.list", state.list)
-	}
-	const queryDetailsData = () => {
-		const options = {
-			type: 2,
-			data: {
-				orderId: state.orderId, //订单编号	
-			},
-			method: "POST",
-			showLoading: true,
-		};
-		request(queryDetails, options).then((res) => {
-			state.detailsObj = stringToJson(res.bizContent);
-			console.log("state.detailsObj", state.detailsObj)
-			state.allMoney = (parseFloat(state.detailsObj.product.oncePrice * 0.01) + parseFloat(state.productMoney)).toFixed(2)
-		});
-	}
 	// 查协议
 	const queryAgreement = () => {
 		const options = {

subpackage/personal-center/get-code.vue

@@ -102,7 +102,7 @@
 			// type  1扫码支付  2扫描协议确认
 			if (state.json.type == 1) {
 				uni.navigateTo({
-					url: `/subpackage/orders/order_payment?orderId=${state.json.orderId}&isValueCard=${state.json.isValueCard}`,
+					url: `/subpackage/orders/order_payment?orderId=${state.json.orderId}&isValueCard=${state.json.isValueCard}&vehicleId=${state.json.vehicleId}`,
 				});
 			} else if (state.json.type == 2) {
 				uni.navigateTo({