去掉订单查询一进页面就刷新

pages/bluetooth/bluetooth.vue

@@ -664,7 +664,7 @@
 			});
 		} else if (routeType.value == "3") {
 			uni.navigateTo({
-				url: "/subpackage/after-sale/pin-code-deblocking/pin-code-confirm?state=true&id=" + state.id,
+				url: "/subpackage/after-sale/pin-code-deblocking/pin-code-confirm?state=true&vehicleId=" + state.vehicleId,
 			});
 		} else if (routeType.value == "4") {
 			uni.navigateTo({

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

@@ -2,10 +2,6 @@
 	<view class="selectCar-box">
 		<view class="details">
 			<view class="title"> 基础信息 </view>
-			<!-- <view class="details-item">
-				<view> 订单编号： </view>
-				<text>{{ orderInfos.orderId }}</text>
-			</view> -->
 			<view class="details-item">
 				<view> 用户名称： </view>
 				<text>{{ orderInfos.name }}</text>

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

@@ -247,7 +247,7 @@ import { deviceType } from "@/utils/network/difference";
 					}else if (state.type == "30") {
 						navTo(`/subpackage/after-sale/to-bookkeeping-card/confirm?id=${item.id}`)
 					}else if (state.type == "31") {
-						navTo(`/subpackage/after-sale/pin-code-deblocking/pin-code-confirm?id=${item.id}`);
+						navTo(`/subpackage/after-sale/pin-code-deblocking/pin-code-confirm?vehicleId=${item.vehicleId}`);
 					}else if (state.type == "32") {
 						navTo(`/subpackage/after-sale/transfer-ownership/transfer-confirm?id=${item.id}`)
 					}else if (state.type == "33") {

subpackage/after-sale/onlineService.vue

@@ -31,11 +31,6 @@
 			method: "POST",
 			showLoading: true,
 		};
-		console.log("11",{
-				 "uid":getItem('openId'),//用户唯一标识(微信公众号openid)
-				"phone":getItem('mobile'),
-				"chl":"9ZHOUETC"
-			})
 		request(getOnLineUrlApi, options).then((res) => {
 			const data = stringToJson(res.bizContent);
 			url.value=data.data.rd

subpackage/after-sale/pin-code-deblocking/pin-code-confirm.vue

@@ -2,10 +2,6 @@
 	<view class="selectCar-box">
 		<view class="details">
 			<view class="title"> 基础信息 </view>
-			<view class="details-item">
-				<view> 订单编号： </view>
-				<text>{{ orderInfos.orderId }}</text>
-			</view>
 			<view class="details-item">
 				<view> 用户名称： </view>
 				<text>{{ orderInfos.customerName }}</text>
@@ -24,9 +20,7 @@
 			</view>
 			<view class="details-item">
 				<view> 车牌颜色： </view>
-				<text style="color: #00b38b">{{
-		  orderInfos.vehiclePlateColorStr
-		}}</text>
+				<text style="color: #00b38b">{{ getVehiclePlateColor(orderInfos.vehiclePlateColor)}}</text>
 			</view>
 			<view class="details-item">
 				<view> 收费车型： </view>
@@ -75,38 +69,25 @@
 	} from "vue";
 	import {
 		navTo,
-		getFormatDate,
 		desensitization
 	} from "@/utils/utils";
 	import {
 		onLoad,
-		onUnload,
-		onShow
+		onUnload
 	} from "@dcloudio/uni-app";
 	import {
-		request
+		requestNew
 	} from "@/utils/network/request.js";
 	import {
-		orderDetail,
+		commGetDetail,
 		pinCodeUnlock
 	} from "@/utils/network/api.js";
-
-	import {
-		getCredentialType
-	} from "@/subpackage/after-sale/js/credentialType.js";
 	import {
-		getEtcCardStatus
-	} from "@/subpackage/after-sale/js/etcCardStatus.js";
-	import {
-		getObuStatus
-	} from "@/subpackage/after-sale/js/obuStatus.js";
+		getVehiclePlateColor
+	} from "@/datas/vehiclePlateColor";
 	import {
 		getCodeName
 	} from "@/datas/queryKey.js";
-
-	import {
-		stringToJson
-	} from "@/utils/network/encryption";
 	const tools = require("../../../static/etcUtil/tools.js");
 	const bluetoothUtil = require("../../../static/etcUtil/index.js");
 	const state = reactive({
@@ -121,23 +102,20 @@
 		ownerIdtype: "",
 		ownerIdnum: "",
 		vehiclePlate: "",
-		vehiclePlateColorStr: "",
 		vehiclePlateColor: "",
 		vehicleType: "",
 		cardId: "",
 		cardStatus: "",
 		obuId: "",
 		obuStatus: "",
-		cardEnableTime: "",
-		obuEnableTime: "",
 		cardExpireTime: ""
 	});
-	let ordId = '';
+	let vehicleId = '';
 
 	onLoad((option) => {
 		//请求订单详情
-		queryOrderDetail(option.id);
-		ordId = option.id;
+		queryOrderDetail(option.vehicleId);
+		vehicleId = option.vehicleId;
 		if (option.state) {
 			tools.showLoadingAlert("正在执行指令");
 			state.disabled = true;
@@ -150,33 +128,30 @@
 		uni.$off('bluetoothLink')
 	})
 	//获取订单详情
-	const queryOrderDetail = (id) => {
+	const queryOrderDetail = (vehicleId) => {
 		const options = {
 			type: 2,
 			data: {
-				id: id,
+				vehicleId
 			},
 			method: "POST",
 			showLoading: true,
 		};
-		request(orderDetail, options).then((res) => {
-			let orderInfo = JSON.parse(res.bizContent);
+		requestNew(commGetDetail, options).then((res) => {
+			let orderInfo = res;
 			console.log("orderInfo", orderInfo);
 			orderInfos.orderId = orderInfo.orderId;
-			orderInfos.customerName = orderInfo.customerName;
-			orderInfos.ownerIdtype = orderInfo.ownerIdtype;
-			orderInfos.ownerIdnum = desensitization(orderInfo.ownerIdnum);
+			orderInfos.customerName = orderInfo.name;
+			orderInfos.ownerIdtype = orderInfo.idType;
+			orderInfos.ownerIdnum = desensitization(orderInfo.idNum);
 			orderInfos.vehiclePlate = orderInfo.vehiclePlate;
-			orderInfos.vehiclePlateColorStr = orderInfo.vehiclePlateColorStr;
 			orderInfos.vehiclePlateColor = orderInfo.vehiclePlateColor;
 			orderInfos.vehicleType = orderInfo.vehicleType;
 			orderInfos.cardId = orderInfo.cardId;
 			orderInfos.cardStatus = orderInfo.cardStatus;
 			orderInfos.obuId = orderInfo.obuId;
 			orderInfos.obuStatus = orderInfo.obuStatus;
-			orderInfos.cardEnableTime = orderInfo.cardEnableTime.substring(0, 10);
-			orderInfos.cardExpireTime = orderInfo.cardExpireTime;
-			orderInfos.obuEnableTime = orderInfo.obuEnableTime.substring(0, 10);
+			orderInfos.cardExpireTime = orderInfo.cardExpiretime.replace('T',' ');
 		});
 	};
 	//PIN解锁 请求
@@ -190,10 +165,10 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(pinCodeUnlock, options).then((res) => {
+		requestNew(pinCodeUnlock, options).then((res) => {
 			tools.hideLoadingAlert();
 			//第一次调用
-			let result = stringToJson(res.bizContent);
+			let result = res;
 			let cmdArray = result.command ? result.command.split(",") : "";
 			if (cmdArray.length > 0) {
 				tools.showLoadingAlert("正在执行指令");
@@ -232,9 +207,9 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(pinCodeUnlock, options).then((res) => {
+		requestNew(pinCodeUnlock, options).then((res) => {
 			tools.hideLoadingAlert();
-			let result = stringToJson(res.bizContent);
+			let result = res;
 			console.log("result===", result)
 			if (result.cardUnblockStatus == "1") {
 				tools.showModalAlert("解锁成功", function successFunc() {});
@@ -267,7 +242,7 @@
 
 	//去连接蓝牙
 	const toPage = () => {
-		navTo("/pages/bluetooth/bluetooth?routeType=3&id=" + ordId); //去连接蓝牙
+		navTo("/pages/bluetooth/bluetooth?routeType=3&vehicleId=" + vehicleId); //去连接蓝牙
 	};
 
 	//返回列表

subpackage/orders/order_payment.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script setup lang="ts">
-	import { onLoad, onPageScroll,onShow } from "@dcloudio/uni-app";
+	import { onLoad, onPageScroll} from "@dcloudio/uni-app";
 	import { reactive, ref } from "vue";
 	import {
 		PAYMENTORDERAPPLY,
@@ -47,7 +47,6 @@
 		OrderStatus
 	} from "@/datas/enum";
 	import useOrderSkip from "@/composables/order/useOrderSkip";
-	const { gotoActiveOrder } = useOrderSkip();
 	import {
 		setItem
 	} from "@/utils/storage";
@@ -299,29 +298,6 @@
 			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;
@@ -399,7 +375,6 @@
 								extraData: {},
 								envVersion:'trial',
 								success(res) {
-									state.continue=1
 									console.log(res);
 								},
 								complete(res) {
@@ -510,7 +485,6 @@
 						extraData: {},
 						envVersion:'trial',
 						success(res) {
-							state.continue=1
 							console.log(res);
 						},
 						complete(res) {
@@ -578,7 +552,6 @@
 		qdSignUrl:"",
 		qdSignAppId:"",
 		qtSign:"",
-		continue:0,//继续执行，不需要点击
 		xianxia:"",//线下订单 1
 
 	});

subpackage/orders/transfer-page-sign.vue

@@ -46,7 +46,7 @@
 <script setup lang="ts">
 	import carNumberInput from "./components/car-number-input.vue";
 	import { reactive } from "vue";
-	import { onLoad, onShow } from "@dcloudio/uni-app";
+	import { onLoad} from "@dcloudio/uni-app";
 	import {
 		navTo, hasLogin
 	} from "@/utils/utils"
@@ -83,11 +83,9 @@
 		orderId: "",
 		words: "",
 		carAll:"",
-		continue:0,//继续执行，不需要点击
 	});
-	onShow(() => {
+	onLoad(() => {
 		if (state.orderId) {
-			state.continue=1
 			// 签约完回来
 			orderDetail(state.orderId)
 		}else{
@@ -195,10 +193,6 @@
 				// 待激活
 				state.words = "审核不通过"
 			}
-			console.log("continue",state.continue)
-			if(state.continue==1){
-				savaHandle()
-			}
 		}
 	}
 	const savaHandle = () => {

utils/network/api.js

@@ -148,7 +148,6 @@ export const obuRenewal = "899" //ASS-签续期
 export const cardStopOrStart = "892" //ASS-卡停/启用
 export const deviceUpgrade = "896" //BDS-设备升级接口
 export const cardModifyConfirm = "898" //ASS-卡信息变更确认
-export const pinCodeUnlock = "862" //ASS-卡PIN解锁
 
 //公务车
 export const gongWuChefindFormatVehicleInfo = "507"; //制式警车信息查询 ，只用于同步IF01001202206010854
@@ -459,4 +458,6 @@ export const orderQuery = "/iaw/app/issue/order/orderQuery"; //订单查询（
 export const orderQueryDetail = "/iaw/app/issue/order/orderQueryDetail"; //订单查询详情（其他地方跳转过来）
 export const cardObuQueryinLog = "/iaw/ass/query/cardObuQueryInLog"; //卡签信息提交日志记录
 
-export const hexToStrig = "/iaw/api/afterSale/comm/hexToStrig"; //解密信息 十六进制转汉字
+export const hexToStrig = "/iaw/api/afterSale/comm/hexToStrig"; //解密信息 十六进制转汉字
+
+export const pinCodeUnlock = "/iaw/api/afterSale/order/cardUnBlock" //ASS-卡PIN解锁