Merge branch 'master' of http://192.168.40.220/etc_codes/etc_zhywzcpt_codes/jz_applet

ui修改

composables/order/useOrderSkip.ts

@@ -92,7 +92,7 @@ export default function useOrderSkip() {
 
 		}
 		console.log("url", url)
-		navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}&vehicleId=${orderInfo.vehicleId}`);
+		navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&vanType=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}&vehicleId=${orderInfo.vehicleId}`);
 	}
 
 	//确认收货

pages.json

@@ -125,14 +125,14 @@
 				}, {
 					"path": "progress-query/progress-query-business-details",
 					"style": {
-						"navigationBarTitleText": "业务审核记录详情",
+						"navigationBarTitleText": "进度查询详情",
 						"enablePullDownRefresh": false
 					}
 				},
 				{
 					"path": "progress-query/progress-query-business",
 					"style": {
-						"navigationBarTitleText": "业务审核记录",
+						"navigationBarTitleText": "进度查询",
 						"enablePullDownRefresh": false
 					}
 				},

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

@@ -153,7 +153,7 @@ import { deviceType } from "@/utils/network/difference";
 			if (state.type == "34") {
 				navTo(`/subpackage/after-sale/month-statement/month-statement-query-list?vehicleId=${item.vehicleId}`)
 			}else if (state.type == "35") {
-				navTo(`/subpackage/personal-center/search/select-card?vehicleId=${item.vehicleId}`)
+				navTo(`/subpackage/personal-center/search/etcFlowingWater?vehicleId=${item.vehicleId}`)
 			}else if (state.type == "36") {
 				uni.navigateTo({
 					url: `/subpackage/after-sale/blacklist-query/list?vehiclePlate=${item.vehiclePlate}&vehiclePlateColor=${item.vehiclePlateColor}&cardId=${item.cardId}`

subpackage/after-sale/activation/activate.vue

@@ -62,7 +62,7 @@
 		getItem
 	} from "@/utils/storage";
 	import {
-		request
+		request, requestNew
 	} from "@/utils/network/request.js";
 	import {
 		IntegerToHexString,
@@ -72,6 +72,9 @@
 		stringToJson
 	} from "@/utils/network/encryption.js";
 	import * as IFCODE from "@/utils/network/api.js";
+	import {
+		issueApply,issueCallback
+	} from "@/utils/network/api";
 	import {
 		agentId
 	} from "@/utils/network/difference";
@@ -88,6 +91,9 @@
 	import {
 		channelId
 	} from "@/utils/network/difference";
+	import {
+		orderDetailQuery
+	} from "@/utils/network/api.js";
 	const state = reactive({
 		orderId: "",
 		id: "",
@@ -193,7 +199,7 @@ function versionVerification(transOrderId, cmd, cmdResult, stepNo){
 		method: "POST", //提交方式(默认POST)
 	};
 	console.log("options2222", options)
-	//BDS-二发指令回传 
+	//卡签版本校验接口
 	request(IFCODE.versionVerificationApi, options)
 		.then((res) => {
 			console.log(stringToJson(res.bizContent));
@@ -222,7 +228,7 @@ function versionVerification(transOrderId, cmd, cmdResult, stepNo){
 			type: 2, //type: 2,JSON格式提交数据(默认表单形式提交)
 			showLoading: false,
 			data: {
-				orderId: orderInfo.orderId,
+				orderId: orderInfo.orderNo,
 				issueType: state.transfer ? 2 : 1 //1正常激活   2 过户激活
 			}, //请求参数
 			method: "POST", //提交方式(默认POST)
@@ -230,11 +236,11 @@ function versionVerification(transOrderId, cmd, cmdResult, stepNo){
 		console.log("options==", options)
 		
 		//BDS-二发指令申请  
-		request('4b001421f5354c248a7759971881b52f', options)
+		requestNew(issueApply, options)
 			.then((res) => {
 				console.log("在线激活 请求");
-				console.log(stringToJson(res.bizContent));
-				const datas = stringToJson(res.bizContent).data;
+				console.log(res);
+				const datas =res;
 				bluetoothUtil.transCmd(datas.cmd.split(','), datas.cmdType == 'CARD' ? '10' : '20', function(res) {
 					implementCmd(datas.transOrderId, datas.cmd, res.toString(), datas.stepNo)
 				}, () => {
@@ -263,10 +269,10 @@ function versionVerification(transOrderId, cmd, cmdResult, stepNo){
 		};
 		console.log("options2222", options)
 		//BDS-二发指令回传 
-		request('88d98f2db7df4f06b22d58b507db7854', options)
+		requestNew(issueCallback, options)
 			.then((res) => {
-				console.log(stringToJson(res.bizContent));
-				const datas = stringToJson(res.bizContent).data;
+				console.log(res);
+				const datas = res.data;
 				console.log("在线激活 请求", datas);
 				if (datas.stepNo == 100) {
 					state.disabled = true
@@ -286,7 +292,6 @@ function versionVerification(transOrderId, cmd, cmdResult, stepNo){
 						implementCmd(transOrderId, datas.cmd, res.toString(), datas.stepNo)
 					}, () => {
 						showModals('在线激活异常')
-						// tools.hideLoadingAlert();
 					});
 				}
 			})
@@ -315,9 +320,9 @@ function versionVerification(transOrderId, cmd, cmdResult, stepNo){
 			showLoading: false,
 		};
 		state.disabled = false
-		request(IFCODE.orderDetail, options).then((res) => {
-			orderInfo = JSON.parse(res.bizContent);
-			console.log("orderInfo", orderInfo);
+		requestNew(orderDetailQuery, options).then((res) => {
+			console.log("orderInfo", res);
+			orderInfo = res.data;
 			console.log("orderInfores", res);
 			if (orderInfo) {
 				fileDataStrings.userType = orderInfo.userType; //用户类型
@@ -326,32 +331,15 @@ function versionVerification(transOrderId, cmd, cmdResult, stepNo){
 				fileDataStrings.obuId = orderInfo.obuId;
 				fileDataStrings.customerTel = orderInfo.customerTel;
 				fileDataStrings.customerId = orderInfo.customerId;
-				fileDataStrings.orderId = orderInfo.orderId;
+				fileDataStrings.orderId = orderInfo.orderNo;
 				fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo
 					.vehiclePlateColor);
 				fileDataStrings.vehiclePlate = orderInfo.vehiclePlate; //车牌
 				fileDataStrings.vehicleClassStr = orderInfo.vehicleClassStr;
-				cancelOrderRequest(orderInfo.orderId)
 			}
 		});
 		getObuId();
 	};
-	//更换设备  去注销前订单的  卡签 
-	const cancelOrderRequest = (orderId) => {
-		console.log('======更换设备  去注销前订单的  卡签 ======')
-		const options = {
-			type: 2,
-			data: {
-				orderId: orderId,
-			},
-			method: "POST",
-			showLoading: false
-			// showLoading: true,
-		};
-		request(IFCODE.cancelOrderApi, options).then((res) => {
-
-		})
-	}
 
 	/**
 	 * 获取OBU号 读OBU

subpackage/after-sale/activation/operation-upload.vue

@@ -67,14 +67,14 @@
 	} from "@/utils/storage";
 	const imgURL = `${fileURL}image/`;
 	import {
-		request
+		requestNew
 	} from "@/utils/network/request.js";
 
 	import {
 		stringToJson
 	} from "@/utils/network/encryption.js";
 	import {
-		upLoadImg
+		activeImgUpload
 	} from "@/utils/network/api.js";
 	import {
 		onLoad
@@ -154,9 +154,9 @@
 						showLoading: true,
 					};
 
-					request(upLoadImg, options).then((res) => {
-						const data = stringToJson(res.bizContent);
-						console.log(data);
+					requestNew(activeImgUpload, options).then((res) => {
+						// const data = stringToJson(res.bizContent);
+						// console.log(data);
 						navTo(`/pages/bluetooth/bluetooth?routeType=1&transfer=${state.transfer}`)
 					});
 

subpackage/after-sale/deviceInfo/deviceInfo.vue

@@ -146,13 +146,9 @@
 		onUnload
 	} from "@dcloudio/uni-app";
 	import {
-		request
+		request,requestNew
 	} from "@/utils/network/request";
-	import {
-		obuDecrypt,
-		cardList,
-		searchObuInfo
-	} from "@/utils/network/api";
+	import {cardObuQuery,obuFileDataDecrypt} from "@/utils/network/api";
 	import {
 		stringToJson
 	} from "@/utils/network/encryption";
@@ -256,7 +252,7 @@
 					console.log("card.color===========", card.vehiclePlate, parseInt(res[2].substring(82, 84),
 						16))
 					// 读卡信息
-					getCardList()
+					// getCardList()
 					//执行0016文件
 					let arr = [cmd.HOME_DIRECTORY, cmd.PERSONAL_INFORMATION]
 					bluetoothUtil.transCmd(arr, '10', function(res) {
@@ -406,8 +402,8 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(obuDecrypt, options).then((res) => {
-			const data = stringToJson(res.bizContent)
+		requestNew(obuFileDataDecrypt, options).then((res) => {
+			const data =res
 			const FileData = data.data.FileData
 			func(FileData)
 		});
@@ -430,9 +426,10 @@
 		//提示对话框
 		tools.showModalAlert(msg);
 	}
-	const getCardList = () => {
+	const getObuList = () => {
 		var data = {
-			vehicleId: state.vehicleId
+			obuId: obu.num,
+			cardId:card.cardNo,
 		};
 		const options = {
 			type: 2,
@@ -440,34 +437,19 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(cardList, options).then((res) => {
-			let result = stringToJson(res.bizContent);
-			state.cardStatus = result.data[0].cardStatus
-			if (result.data[0].cardType == 1 && result.data[0].debitType == 1) {
+		requestNew(cardObuQuery, options).then((res) => {
+			tools.hideLoadingAlert();
+			let result = res;
+			console.log("153", result)
+			state.obuStatus = result.obuStatus?result.obuStatus:""
+			state.cardStatus = result.cardStatus
+			if (result.cardType == 1 && result.debitType == 1) {
 				state.cardTypeName = "预存卡"
-			} else if (result.data[0].cardType == 2) {
+			} else if (result.cardType == 2) {
 				state.cardTypeName = "储值卡"
 			} else {
 				state.cardTypeName = "记账卡"
 			}
-			console.log("152", result)
-		})
-	}
-	const getObuList = () => {
-		var data = {
-			obuId: obu.num
-		};
-		const options = {
-			type: 2,
-			data: data,
-			method: "POST",
-			showLoading: true,
-		};
-		request(searchObuInfo, options).then((res) => {
-			tools.hideLoadingAlert();
-			let result = stringToJson(res.bizContent);
-			console.log("153", result)
-			state.obuStatus = result.data[0]?result.data[0].obuStatus:""
 		})
 	}
 </script>

subpackage/after-sale/month-statement/month-statement-query-list.vue

@@ -36,10 +36,10 @@
 <script setup lang="ts">
 	import { reactive } from "vue";
 	import { onLoad, onReachBottom } from "@dcloudio/uni-app";
-	import { monthStatementApi, getUserMsg,monthlyStatementQuery } from "@/utils/network/api.js";
+	import {getUserMsg,monthlyStatementQuery } from "@/utils/network/api.js";
 	import { stringToJson } from "@/utils/network/encryption";
 	import { request, requestNew } from "@/utils/network/request.js";
-	import { getItem, StorageKeys } from "@/utils/storage";
+	import { getItem } from "@/utils/storage";
 	import { getVehiclePlateColor } from "@/datas/vehiclePlateColor";
 	import { msg, navTo } from "@/utils/utils";
 	const state = reactive({
@@ -96,8 +96,7 @@
 		};
 
 		requestNew(monthlyStatementQuery, options).then((res) => {
-			const data = stringToJson(res.bizContent);
-			state.listData = stringToJson(res.bizContent).data
+			state.listData = res.result
 			console.log("业务完成日志", state.listData,)
 		});
 	}

subpackage/orders/interestsList.vue

@@ -12,16 +12,14 @@
 <script setup lang="ts">
 	import { onLoad} from "@dcloudio/uni-app";
 	import { reactive, ref } from "vue";
-	import { equityProductsInfo } from "@/utils/network/api.js";
 	import { stringToJson } from "@/utils/network/encryption";
-	import { request } from "@/utils/network/request";
+	import {requestNew } from "@/utils/network/request";
 	import {  navTo } from "@/utils/utils";
 	import { jump } from "@/datas/9901Jump.js";
 	import {
-		getOpenidApi
+		singleEquityDetail,getOpenId
 	} from "@/utils/network/api";
 	import {
-		getItem,
 		setItem
 	} from "@/utils/storage";
 import { deviceType } from "@/utils/network/difference";
@@ -104,8 +102,8 @@ import { deviceType } from "@/utils/network/difference";
 			method: 'POST',
 			showLoading: true,
 		}
-		request(equityProductsInfo, options).then((res) => {
-			const data = stringToJson(res.bizContent);
+		requestNew(singleEquityDetail, options).then((res) => {
+			const data = res;
 			console.log("333333", data.productIntro)
 			richText.value = data.productIntro
 		})
@@ -132,7 +130,7 @@ import { deviceType } from "@/utils/network/difference";
 			showLoading: true,
 		};
 		// #ifdef MP-WEIXIN
-		request(getOpenidApi, options).then((res) => {
+		requestNew(getOpenId, options).then((res) => {
 			const result = stringToJson(res.bizContent);
 			console.log("获取微信小程序openid", result);
 			const openidData = stringToJson(result.data);

subpackage/orders/opening-account-people.vue

@@ -658,7 +658,7 @@
 		};
 		return new Promise(async (resolve, reject) => {
 			const res = await requestNew(registerFull, options);
-			const data = stringToJson(res.bizContent);
+			const data = res;
 			resolve(data);
 		}).catch((error) => {
 			reject(error);

subpackage/orders/opening-account-unit.vue

@@ -452,7 +452,7 @@
 		};
 		return new Promise(async (resolve, reject) => {
 			const res = await requestNew(registerFull, options);
-			const data = stringToJson(res.bizContent);
+			const data = res;
 			resolve(data);
 		}).catch((error) => {
 			reject(error);

subpackage/orders/order-details-new.vue

@@ -38,12 +38,12 @@
 					<view class="base-info">
 						<view class="d-row">
 							<text class="d-label">新办单号：</text>
-							<text class="d-value">{{state.orderInfo.orderId}}</text>
+							<text class="d-value">{{state.orderInfo.orderNo}}</text>
 						</view>
-						<view class="d-row">
+						<!-- <view class="d-row">
 							<text class="d-label">业务类型：</text>
 							<text class="d-value">{{getOrderTypeName(state.orderInfo.orderType)}}</text>
-						</view>
+						</view> -->
 						<view class="d-row">
 							<text class="d-label">订单车牌：</text>
 							<text class="d-value">{{state.orderInfo.vehiclePlate}}</text>
@@ -55,9 +55,9 @@
 						</view>
 						<view class="d-row">
 							<text class="d-label">车辆类型：</text>
-							<text class="d-value">{{getCarTypeName(state.orderInfo.type)}}</text>
+							<text class="d-value">{{getCarTypeName(state.orderInfo.vanType)}}</text>
 						</view>
-						<view class="d-row" v-if="getCarTypeName(state.orderInfo.type)=='货车'">
+						<view class="d-row" v-if="getCarTypeName(state.orderInfo.vanType)=='货车'">
 							<text class="d-label">牵引车：</text>
 							<text class="d-value">{{state.orderInfo.tractorSign=='1'?'是':'否'}}</text>
 						</view>

subpackage/orders/sign-up.vue

@@ -173,7 +173,7 @@
 				showLoading: true,
 			};
 			requestNew(userSign, options).then((res) => {
-				const data = stringToJson(res.bizContent);
+				const data = res;
 				console.log("data", data)
 				if (data.userState === "UNAUTHORIZED") {
 					if (state.channelSing == "0") {

subpackage/personal-center/search/etcFlowingWater.vue

@@ -3,6 +3,16 @@
 		<!-- 背景颜色充满屏 -->
 		<view class="bg-color"></view>
 		<!-- 补卡额订单列表-->
+		<view class="item last">
+			<text>选择卡号：</text>
+			<picker bindchange="changeCardId" :value="state.index" :range="state.cardIdRange">
+			    <view class="picker">
+			     {{state.cardIdRange[state.index]}}
+			    </view>
+			  </picker>
+			<!-- <uni-data-select style="whith:360rpx;font-size: 26rpx;" v-model="state.cardId" :localdata="state.cardIdRange"
+				@change="changeCardId" :clear="false"></uni-data-select> -->
+		</view>
 		<view class="search-time">
 			<view class="search-time-box">
 				<view class="show-info">
@@ -92,17 +102,16 @@
 		ref
 	} from "vue";
 	import {
-		request
+		request, requestNew
 	} from "@/utils/network/request.js";
 
 	import {
 		stringToJson
 	} from "@/utils/network/encryption.js";
 	import {
-		orderDetail,
-		passBills,
 		passBillCount,
 		downloadBills,
+		passbill,cardList
 	} from "@/utils/network/api.js";
 	import {
 		onLoad,
@@ -122,6 +131,7 @@
 	const state = reactive({
 		list: [],
 		cardId: null,
+		cardIdRange:[],
 		passTotal: 0,
 		parkTotal: 0,
 		aggregateAmount: 0,
@@ -129,14 +139,15 @@
 		pageNo: 1, // 当前页
 		flags: false,
 		handleDate: "", //月结单选择时间
-		vehicleId: ""
+		vehicleId: "",
+		index:0
 	})
 	onLoad((option) => {
 		state.cardId = option.cardId;
 		state.handleDate = option.handleDate;
 		state.vehicleId = option.vehicleId;
 		console.log("月结单111", state.handleDate)
-		if (state.handleDate != "undefined") {
+		if (state.handleDate) {
 			// "2024-04-25"
 			let deadLine = getDaysInMonth(state.handleDate.substring(0, 4), state.handleDate.substring(4, 6))
 			dataTime.startDate = state.handleDate.substring(0, 4) + "-" + state.handleDate.substring(4, 6) + "-" +
@@ -147,8 +158,31 @@
 			console.log("月结单", dataTime.startDate, state.handleDate != "")
 			search(1)
 		}
+		getCardList(option.vehicleId)
 	})
-
+const changeCardId = (e) => {
+		state.cardId = e
+		console.log(e)
+	}
+    const getCardList = (vehicleId) => {
+		var data = {
+			vehicleId: vehicleId
+		};
+		const options = {
+			type: 2,
+			data: data,
+			method: "POST",
+			showLoading: true,
+		};
+		request(cardList, options).then((res) => {
+			console.log("152", stringToJson(res.bizContent))
+			let result = stringToJson(res.bizContent);
+			for (var k = 0; k < result.data.length; k++) {
+				state.cardIdRange.push(result.data[k]['cardId'])
+			}
+			console.log(result.data);
+		})
+	}
 	function getDaysInMonth(year, month) {
 		var date = new Date();
 		date.setFullYear(year);
@@ -164,14 +198,14 @@
 		search(2)
 	})
 	const search = (val) => {
-		// if (dataTime.startDate == "开始时间") {
-		// 	msg('请选择开始时间');
-		// 	return;
-		// }
-		// if (dataTime.endDate == "结束时间") {
-		// 	msg('请选择结束时间');
-		// 	return;
-		// }
+		if (dataTime.startDate == "开始时间") {
+			msg('请选择开始时间');
+			return;
+		}
+		if (dataTime.endDate == "结束时间") {
+			msg('请选择结束时间');
+			return;
+		}
 		if (val == 1) {
 			state.pageNo = 1
 		}
@@ -190,12 +224,9 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(passBills, options).then((res) => {
+		requestNew(passbill, options).then((res) => {
 			console.log(res);
-			let result = stringToJson(res.bizContent)
-			console.log(result);
-			state.list = [...state.list, ...stringToJson(res.bizContent).data]
-			console.log(result.data);
+			state.list = [...state.list, ...res.result]
 			getPpassBillCount()
 		})
 
@@ -620,4 +651,17 @@
 		text-align: center;
 		margin: 30rpx 0;
 	}
+	.item {
+		display: flex;
+		font-size: 30rpx;
+		margin: 20rpx 0 0 20rpx;
+		align-items: center;
+		background-color: white;
+		width:95%;
+		padding: 20rpx;
+		box-sizing: border-box;
+	}
+	::deep .last .uni-stat__select {
+		width: 360rpx !important;
+	}
 </style>

utils/network/api.js

@@ -332,4 +332,11 @@ export const vehicleLicenseOcr= "/iaw/ocr/vehicleLicenseOcr"  //车辆行驶证O
 export const monthlyStatementQuery= "/iaw/app/issue/monthlyStatement/query"  //月结单查询
 export const cardBlackQuery= "/iaw/app/issue/cardBlack/query"  //黑名单查询
 export const generalAuditQuery= "/iaw/app/issue/generalAudit/query"  //业务审核查询
-export const registerFull= "/iaw/issue/userBasic/registerFull"  //无感注册登录接口
+export const registerFull= "/iaw/issue/userBasic/registerFull"  //无感注册登录接口
+export const issueApply= "/iaw/issue/order/issueApply"  //发行指令申请
+export const issueCallback= "/iaw/issue/order/issueCallback"  //发行指令回传
+export const activeImgUpload= "/iaw/issue/order/activeImgUpload"  //激活图片上传
+export const cardObuQuery= "/iaw/ass/query/cardObuQuery"  //卡签信息查询
+export const singleEquityDetail= "/iaw/ass/equity/singleEquityDetail"  //单项权益详情查询
+export const passbill= "/iaw/app/issue/cardAnnounce/passbill"  //ETC通行流水记录查询
+export const obuFileDataDecrypt= "/iaw/ass/issueBase/obuFileDataDecrypt"  //OBU系统信息在线解密

utils/utils.ts

@@ -477,12 +477,22 @@ export const uploadFile = (tempImagePath, imageType, code) => {
 					method: "POST",
 					showLoading: true,
 				};
-				requestNew(code, options).then((res) => {
-					const data = stringToJson(res.bizContent);
-					console.log('输出内容=====123', data)
-					resolve(data)
-
-				});
+				if(code=="" || code=="91"){
+					request(code, options).then((res) => {
+						const data = stringToJson(res.bizContent);
+						console.log('输出内容=====123', data)
+						resolve(data)
+					
+					});
+				}else{
+					requestNew(code, options).then((res) => {
+						const data = stringToJson(res.bizContent);
+						console.log('输出内容=====123', data)
+						resolve(data)
+					
+					});
+				}
+				
 			}
 		});
 	})