修改订单查询储值卡跳转

pages.json

@@ -2095,7 +2095,7 @@
 			"root": "subpackage/carPark",
 			"plugins": {
 				"issuer-plugin": {
-					// "version": "dev-5d954bb916bb210d6c17397439d90f07",
+					// "version": "dev-0b1c3500e972ec0f531654523c44a085",
 					"version": "1.0.2",
 					"provider": "wxa2d9acdd1054e69b"
 				}

pages/bluetooth/bluetooth.vue

@@ -98,7 +98,7 @@
 		vehPosImgUrl: "",
 		vehNegImgUrl: "",
 		isAfter: '',
-		backIndex:"",//1返回首页 ""返回订单列表
+		backIndex:"",//1返回首页(卡签信息查询) ""返回订单列表 其他
 		cardNo:""
 	});
 	const deviceList = ref([]);

subpackage/orders/order_payment.vue

@@ -48,9 +48,10 @@
 	} from "@/datas/enum";
 	import useOrderSkip from "@/composables/order/useOrderSkip";
 	import {
-		setItem
+		setItem,getItem
 	} from "@/utils/storage";
 	const tools = require("../../static/etcUtil/tools.js");
+	const { gotoActiveOrder } = useOrderSkip();
 	let imageUrl = ""
 
 	let logo
@@ -300,6 +301,7 @@
 		});
 	}
 	onShow(()=>{
+		// 支付完跳转到广告页，回来再次查询跳转
 		if(state.payOK){
 			refreshFirst()
 		}
@@ -314,6 +316,7 @@
 		state.qdSignAppId = option.qdSignAppId;
 		state.qtSign = option.qtSign;
 		state.xianxia = option.xianxia;
+		state.cardType = option.cardType;
 		
 		// #ifdef MP-WEIXIN
 		uni.login({
@@ -373,34 +376,40 @@
 				// isValueCard  1 储值卡   2 记账卡
 				if (state.orderQuery == '1') {
 					console.log("state.qtSign",state.qtSign,state.qtSign=='0')
-					if(state.qtSign=='0'){
-						if(state.qdSignAppId){
-							uni.navigateToMiniProgram({
-								appId: state.qdSignAppId,
-								path: state.qdSignUrl,
-								extraData: {},
-								envVersion:'trial',
-								success(res) {
-									console.log(res);
-								},
-								complete(res) {
-									console.log(res);
-								},
-								fail(res) {
-									console.log(res);
-									// 未成功跳转到车主小程序
-								},
-							});
+					// 记账卡
+					if(state.cardType=='1'){
+						if(state.qtSign=='0'){
+							if(state.qdSignAppId){
+								uni.navigateToMiniProgram({
+									appId: state.qdSignAppId,
+									path: state.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.qdSignUrl))
+								tools.toUrl(`/subpackage/personal-center/webview?url=` + params)
+							}
 						}else{
-							const params = encodeURIComponent(JSON.stringify(state.qdSignUrl))
-							tools.toUrl(`/subpackage/personal-center/webview?url=` + params)
+							// 签约
+							uni.redirectTo({
+								url: `/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`
+							});
 						}
 					}else{
-						// 签约
-						navTo(
-							`/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`,
-						);
+						gotoActiveOrder(getItem('orderQueryActivate'))
 					}
+					
 				}else{
 					if (state.isValueCard == 1) {
 						// 不签约
@@ -409,9 +418,9 @@
 						})
 					} else {
 						// 签约
-						navTo(
-							`/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`,
-						);
+						uni.redirectTo({
+							url: `/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`
+						});
 					}
 				}
 			}
@@ -483,33 +492,37 @@
 	// isValueCard  1 储值卡   2 记账卡
 	const gotoEditUserOrUnitInfo = () => {
 		if (state.orderQuery == '1') {
-			if(state.qtSign=='0'){
-				if(state.qdSignAppId){
-					uni.navigateToMiniProgram({
-						appId: state.qdSignAppId,
-						path: state.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.qdSignUrl))
-					tools.toUrl(`/subpackage/personal-center/webview?url=` + params)
-				}
+			if(state.cardType=='1'){
+				if(state.qtSign=='0'){
+					if(state.qdSignAppId){
+						uni.navigateToMiniProgram({
+							appId: state.qdSignAppId,
+							path: state.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.qdSignUrl))
+						tools.toUrl(`/subpackage/personal-center/webview?url=` + params)
+					}
+			}else{
+				gotoActiveOrder(getItem('orderQueryActivate'))
+			}
 			}else{
 				// 签约
-				navTo(
-					`/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`,
-				);
+				uni.redirectTo({
+					url:`/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`
+				});
 			}
 		}else{
 			if (state.isValueCard == 1) {
@@ -518,10 +531,9 @@
 					url: "/pages/order/order"
 				})
 			} else {
-				// 签约
-				navTo(
-					`/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`,
-				);
+				uni.redirectTo({
+					url: `/subpackage/orders/release-products?orderId=${state.orderId}&orderQuery=${state.orderQuery}`
+				});
 			}
 		}
 	}
@@ -559,7 +571,8 @@
 		qdSignAppId:"",
 		qtSign:"",
 		xianxia:"",//线下订单 1
-        payOK:false
+        payOK:false,
+		cardType:""
 	});
 </script>
 

subpackage/orders/transfer-page-sign.vue

@@ -208,7 +208,8 @@
 							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']}&xianxia=1`);
+							// cardType2:储值卡 1:记账卡 3:预存卡
+							navTo(`/subpackage/orders/order_payment?orderId=${state.orderId}&&qtSign=${state.details['qtSign']}&vehicleId=${vehicleId}&orderQuery=1&qdSignUrl=${state.details['qdSignUrl']}&qdSignAppId=${state.details['qdSignAppId']}&xianxia=1&cardType=${state.details['cardType']}`);
 						})
 					} else if (state.details['orderStep'] == OrderStatus['已支付/待签约']) {
 						// 去签约

utils/util/sm4.js

@@ -399,7 +399,7 @@ function SM4Util() {
 			} else {
 				let decrypted = sm4.sm4_crypt_cbc(ctx, ivBytes, base64js.toByteArray(cipherText.data.bizContent))
 				let bizContent = utf8ByteToUnicodeStr(decrypted)
-				// console.log("没处理之前的数据", bizContent)
+				console.log("没处理之前的数据", bizContent)
 				if (bizContent.substr(0, 1) == '[') {
 					// 返回数据是数组情况
 					let begin = bizContent.indexOf('[');