支付、签约、激活判断是否需要签合同

composables/order/useOrderSkip.ts

@@ -210,15 +210,30 @@ export default function useOrderSkip() {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
 			jump("14", params)
 		} else {
-			let params = {
-				id: orderInfo.id,
-				orderId: orderInfo.orderId ? orderInfo.orderId : orderInfo.orderNo,
-				cardStatus: orderInfo.cardStatus,
-				obuStatus: orderInfo.obuStatus,
-				transfer: 1,
-			}
-			let url = `/subpackage/after-sale/activation/operation-tips?${objectToQueryString(params)}`;
-			navTo(url);
+			const options = {
+				type: 2,
+				data: {
+					orderNo: orderInfo.orderId ? orderInfo.orderId : orderInfo.orderNo, //订单编号
+				},
+				method: "POST",
+				showLoading: true,
+			};
+			requestNew(contractQuery, options).then(res => {
+				let params = {
+					id: orderInfo.id,
+					orderId: orderInfo.orderId ? orderInfo.orderId : orderInfo.orderNo,
+					cardStatus: orderInfo.cardStatus,
+					obuStatus: orderInfo.obuStatus,
+					transfer: 1,
+				}
+				let url = `/subpackage/after-sale/activation/operation-tips?${objectToQueryString(params)}`;
+				
+				if (res.flag) {
+					navTo(`/subpackage/orders/product-detail?orderId=${orderInfo.orderId ? orderInfo.orderId : orderInfo.orderNo}&redirectUrl=${encodeURIComponent(url)}`)
+				} else {
+					navTo(url)
+				}
+			})
 		}
 	}
 
@@ -272,13 +287,29 @@ export default function useOrderSkip() {
 			const params = encodeURIComponent(JSON.stringify(orderInfo))
 			jump("12", params)
 		} else {
-			//跳转到车辆信息变更界面
-			// #ifdef MP-ALIPAY
-			navTo(`/subpackage/orders/release-products?orderId=${orderInfo.orderId ? orderInfo.orderId : orderInfo.orderNo}`);
-			// #endif
-			// #ifdef MP-WEIXIN
-			navTo(`/subpackage/orders/release-products?orderId=${orderInfo.orderId ? orderInfo.orderId : orderInfo.orderNo}&&id=${orderInfo.id}&&clientFee=${orderInfo.amount}`);
-			// #endif
+			const options = {
+				type: 2,
+				data: {
+					orderNo: orderInfo.orderId ? orderInfo.orderId : orderInfo.orderNo, //订单编号
+				},
+				method: "POST",
+				showLoading: true,
+			};
+			requestNew(contractQuery, options).then(res => {
+				let url = ''
+				//跳转到车辆信息变更界面
+				// #ifdef MP-ALIPAY
+				url = `/subpackage/orders/release-products?orderId=${orderInfo.orderId ? orderInfo.orderId : orderInfo.orderNo}`
+				// #endif
+				// #ifdef MP-WEIXIN
+				url = `/subpackage/orders/release-products?orderId=${orderInfo.orderId ? orderInfo.orderId : orderInfo.orderNo}&&id=${orderInfo.id}&&clientFee=${orderInfo.amount}`
+				// #endif
+				if (res.flag) {
+					navTo(`/subpackage/orders/product-detail?orderId=${orderInfo.orderId ? orderInfo.orderId : orderInfo.orderNo}&redirectUrl=${encodeURIComponent(url)}`)
+				} else {
+					navTo(url)
+				}
+			})
 		}
 	}
 	//再次使用订单

subpackage/orders/product-detail.vue

@@ -197,6 +197,7 @@
 	onLoad((option : any) => {
 		state.orderId = option.orderId;
 		state.isValueCard = option.isValueCard;
+		state.redirectUrl = option.redirectUrl // 重定向页面
 		console.log("传递过来的参数", option)
 		console.log("查协议", envs[process.env.NODE_ENV].baseUrl)
 		state.id = option.id;
@@ -241,7 +242,8 @@
 		vehicleId: "",
 		agreements: [],
 		isSign: false,
-		isWatchContract: false
+		isWatchContract: false,
+		redirectUrl: ''
 	});
 	// 查协议
 	const queryAgreement = () => {
@@ -260,24 +262,28 @@
 
 			if (state.checked) {
 				requestNew(agreementInSertOrder, options).then((res) => {
-					// agreementConfirm().then((value) => {
-					// console.log("协议确认", value)
-					navTo(
-						`/subpackage/orders/order_payment?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&&isValueCard=${state.isValueCard}&vehicleId=${state.vehicleId}`,
-					);
-					// })
-
+					goNextPage()
 				});
 			} else {
 				msg("请勾选协议");
 			}
+		} else {
+			goNextPage()
+		}
+
+	}
+	
+	const goNextPage = () => {
+		if (state.redirectUrl) {
+			navTo(decodeURIComponent(state.redirectUrl))
 		} else {
 			navTo(
 				`/subpackage/orders/order_payment?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&&isValueCard=${state.isValueCard}&vehicleId=${state.vehicleId}`,
 			);
+			
 		}
-
 	}
+	
 	const checkboxChange = () => {
 		if (state.isWatchContract) {
 			state.checked = !state.checked;