订单查询

subpackage/orders/order_payment.vue

@@ -28,13 +28,13 @@
 </template>
 
 <script setup lang="ts">
-	import { onLoad, onPageScroll } from "@dcloudio/uni-app";
+	import { onLoad, onPageScroll,onShow } from "@dcloudio/uni-app";
 	import { reactive, ref } from "vue";
 	import {
 		PAYMENTORDERAPPLY,
 		aliPayConfigIdTwo,
 		obtainUserId,
-		getOpenId, payApply, payQuery
+		getOpenId, payApply, payQuery,orderQueryDetail
 	} from "@/utils/network/api.js";
 	import { request, requestNew } from "@/utils/network/request.js";
 	import { stringToJson } from "@/utils/network/encryption";
@@ -43,6 +43,14 @@
 	import navBar from "@/components/nav-bar/nav-bar2.vue";
 	const imgURL = `${fileURL}image/`;
 	import { confirm, navTo } from "@/utils/utils";
+	import {
+		OrderStatus
+	} from "@/datas/enum";
+	import useOrderSkip from "@/composables/order/useOrderSkip";
+	const { gotoActiveOrder } = useOrderSkip();
+	import {
+		setItem
+	} from "@/utils/storage";
 	const tools = require("../../static/etcUtil/tools.js");
 	let imageUrl = ""
 
@@ -258,7 +266,29 @@
 			console.log("state.dataArray", state.dataArray)
 		});
 	}
-
+	onShow(()=>{
+		if(state.continue=1){
+			orderDetail(state.orderId)
+		}
+	})
+	// 车辆详情
+	const orderDetail = (orderNo) => {
+		const options = {
+			type: 2,
+			data: {
+				orderNo
+			},
+			method: "POST",
+			showLoading: true,
+		};
+		requestNew(orderQueryDetail, options).then((res) => {
+			console.log("orderQueryDetail", res)
+			if (res['orderStep'] == OrderStatus['待激活']) {
+				// 待激活
+				gotoActiveOrder(res)
+			}
+		})
+	}
 	onLoad((option : any) => {
 		console.log("传递过来的到支付页面", option)
 		state.orderId = option.orderId;
@@ -335,6 +365,7 @@
 								extraData: {},
 								envVersion:'trial',
 								success(res) {
+									state.continue=1
 									console.log(res);
 								},
 								complete(res) {
@@ -350,7 +381,10 @@
 							tools.toUrl(`/subpackage/personal-center/webview?url=` + params)
 						}
 					}else{
-						uni.navigateBack()
+						// 签约
+						navTo(
+							`/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`,
+						);
 					}
 				}else{
 					if (state.isValueCard == 1) {
@@ -442,6 +476,7 @@
 						extraData: {},
 						envVersion:'trial',
 						success(res) {
+							state.continue=1
 							console.log(res);
 						},
 						complete(res) {
@@ -457,7 +492,10 @@
 					tools.toUrl(`/subpackage/personal-center/webview?url=` + params)
 				}
 			}else{
-				uni.navigateBack()
+				// 签约
+				navTo(
+					`/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`,
+				);
 			}
 		}else{
 			if (state.isValueCard == 1) {
@@ -505,7 +543,8 @@
 		openidData: {},
 		qdSignUrl:"",
 		qdSignAppId:"",
-		qtSign:""
+		qtSign:"",
+		continue:0,//继续执行，不需要点击
 
 	});
 </script>

subpackage/orders/transfer-page-sign.vue

@@ -82,10 +82,12 @@
 		isDetails: false,
 		orderId: "",
 		words: "",
-		carAll:""
+		carAll:"",
+		continue:0,//继续执行，不需要点击
 	});
 	onShow(() => {
 		if (state.orderId) {
+			state.continue=1
 			// 签约完回来
 			orderDetail(state.orderId)
 			contractRequest()
@@ -186,62 +188,70 @@
 			} else if (state.details['orderStep'] == OrderStatus['待审核']) {
 				// 待激活
 				state.words = "待审核"
+			} else if (state.details['orderStep'] == OrderStatus['审核不通过']) {
+				// 待激活
+				state.words = "审核不通过"
+			}
+			console.log("continue",state.continue)
+			if(state.continue==1){
+				savaHandle()
 			}
 		}
 	}
 	const savaHandle = () => {
-		if (state.checked) {
-			if (state.details['orderStatus'] != OrderStatus.已取消) {
-				// 去支付
-				if (state.details['orderStep'] == OrderStatus['完成车辆信息上传/待支付'] || state.details['orderStep'] == OrderStatus['待支付2']) {
-					agreementConfirm().then((value) => {
-						console.log("协议确认", value)
-						let vehicleId = state.details['vehiclePlate'] + "_" + state.details['vehiclePlateColor']
-						let isValueCard = 1
-						// qtSign 1 去签约
-						if (state.details['qtSign'] == 1) {
-							isValueCard = 2
-						}
-						// orderQuery 1 订单查询 0正常订单
-						navTo(`/subpackage/orders/order_payment?orderId=${state.orderId}&&qtSign=${state.details['qtSign']}&vehicleId=${vehicleId}&orderQuery=1&qdSignUrl=${state.details['qdSignUrl']}&qdSignAppId=${state.details['qdSignAppId']}`);
-					})
-				} else if (state.details['orderStep'] == OrderStatus['已支付/待签约']) {
-					// 去签约
-					if (state.details['qtSign'] == 0) {
-						if(state.details['qdSignAppId']){
-							uni.navigateToMiniProgram({
-								appId: state.details['qdSignAppId'],
-								path: state.details['qdSignUrl'],
-								extraData: {},
-								envVersion:'trial',
-								success(res) {
-									console.log(res);
-								},
-								complete(res) {
-									console.log(res);
-								},
-								fail(res) {
-									console.log(res);
-									// 未成功跳转到车主小程序
-								},
-							});
-						}else{
-							const params = encodeURIComponent(JSON.stringify(state.details['qdSignUrl']))
-							tools.toUrl(`/subpackage/personal-center/webview?url=` + params)
+		if(state.words == "待审核" || state.words == "审核不通过"){
+			return;
+		}else{
+			if (state.checked) {
+				if (state.details['orderStatus'] != OrderStatus.已取消) {
+					// 去支付
+					if (state.details['orderStep'] == OrderStatus['完成车辆信息上传/待支付'] || state.details['orderStep'] == OrderStatus['待支付2']) {
+						agreementConfirm().then((value) => {
+							console.log("协议确认", value)
+							let vehicleId = state.details['vehiclePlate'] + "_" + state.details['vehiclePlateColor']
+							// qtSign 1 去签约
+							// orderQuery 1 订单查询 0正常订单
+							navTo(`/subpackage/orders/order_payment?orderId=${state.orderId}&&qtSign=${state.details['qtSign']}&vehicleId=${vehicleId}&orderQuery=1&qdSignUrl=${state.details['qdSignUrl']}&qdSignAppId=${state.details['qdSignAppId']}`);
+						})
+					} else if (state.details['orderStep'] == OrderStatus['已支付/待签约']) {
+						// 去签约
+						if (state.details['qtSign'] == 0) {
+							if(state.details['qdSignAppId']){
+								uni.navigateToMiniProgram({
+									appId: state.details['qdSignAppId'],
+									path: state.details['qdSignUrl'],
+									extraData: {},
+									envVersion:'trial',
+									success(res) {
+										console.log(res);
+									},
+									complete(res) {
+										console.log(res);
+									},
+									fail(res) {
+										console.log(res);
+										// 未成功跳转到车主小程序
+									},
+								});
+							}else{
+								const params = encodeURIComponent(JSON.stringify(state.details['qdSignUrl']))
+								tools.toUrl(`/subpackage/personal-center/webview?url=` + params)
+							}
+							
+						} else {
+							navTo(`/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=1`);
 						}
-						
-					} else {
-						navTo(`/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=1`);
+					} else if (state.details['orderStep'] == OrderStatus['待激活']) {
+						// 待激活
+						gotoActiveOrder(state.details)
 					}
-				} else if (state.details['orderStep'] == OrderStatus['待激活']) {
-					// 待激活
-					gotoActiveOrder(state.details)
 				}
+			
+			} else {
+				msg("请勾选协议");
 			}
-
-		} else {
-			msg("请勾选协议");
 		}
+		
 	}
 	// 协议确认接口
 	const agreementConfirm = () => {