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

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&vanType=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}&vehicleId=${orderInfo.vehicleId}`);
+		navTo(`${url}?orderId=${orderInfo.orderId?orderInfo.orderId:orderInfo.orderNo}&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

@@ -1470,12 +1470,12 @@
 						"navigationBarTitleText": "ETC通行流水记录"
 					}
 				},
-				{
-					"path": "search/select-card",
-					"style": {
-						"navigationBarTitleText": "选择卡号"
-					}
-				},
+				// {
+				// 	"path": "search/select-card",
+				// 	"style": {
+				// 		"navigationBarTitleText": "选择卡号"
+				// 	}
+				// },
 				{
 					"path": "help/help",
 					"style": {

static/etcUtil/index.js

@@ -306,7 +306,7 @@ function transCmd(cmdArr, type, func, callBack = null) {
 		case "TD":
 			console.log('TD执行内容====', cmdArr, type)
 			tdApi.transCmd(cmdArr, type, function(res) {
-				console.log('TD执行内容====123', cmdArr, type)
+				console.log('TD执行内容====123', cmdArr, type,res)
 				if (res.code == 0) {
 					func(res.data);
 				} else {

subpackage/after-sale/activation/activate.vue

@@ -204,7 +204,7 @@ function versionVerification(transOrderId, cmd, cmdResult, stepNo){
 		.then((res) => {
 			console.log(stringToJson(res.bizContent));
 			const datas = stringToJson(res.bizContent).data;
-			console.log("在线激活 请求", datas,datas.stepNo,datas.stepNo == 100);
+			console.log("在线激活 请求", datas,datas.stepNo == 100);
 			if (datas.stepNo == 100) {
 				console.log("陈工")
 				cmdResult1()
@@ -271,8 +271,8 @@ function versionVerification(transOrderId, cmd, cmdResult, stepNo){
 		//BDS-二发指令回传 
 		requestNew(issueCallback, options)
 			.then((res) => {
-				console.log(res);
-				const datas = res.data;
+				console.log("BDS-二发指令回传 ",res);
+				const datas = res;
 				console.log("在线激活 请求", datas);
 				if (datas.stepNo == 100) {
 					state.disabled = true

subpackage/after-sale/arrears/arrears.vue

@@ -83,16 +83,15 @@
 		getItem
 	} from "@/utils/storage.ts"
 	import {
-		CardBillQuery,
-		CardBillPlaceOrder,
-		CardBillPayStatus,
 		wechatPayConfigId,
 		aliPayConfigId,
-		obtainUserId,
-		getOpenidApi
+		trafficsupplObtainuserid,
+		trafficsuppleQueryList,
+		trafficsuppleApply,
+		trafficsupplePayQuery,getOpenId
 	} from "@/utils/network/api.js";
 	import {
-		request
+		request,requestNew
 	} from "@/utils/network/request.js";
 
 	import {
@@ -100,7 +99,6 @@
 	} from "@/utils/network/encryption";
 	import {
 		onLoad,
-		onShow,
 		onPullDownRefresh
 	} from "@dcloudio/uni-app";
 	import {
@@ -138,8 +136,8 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(CardBillQuery, options).then((res) => {
-			const data = stringToJson(res.bizContent);
+		requestNew(trafficsuppleQueryList, options).then((res) => {
+			const data = res;
 			console.log(data);
 			data.data = data.data.map(val => {
 				val.checked = false
@@ -215,10 +213,10 @@
 			showLoading: true,
 		};
 		// #ifdef MP-WEIXIN
-		request(getOpenidApi, options).then((res) => {
-			const result = stringToJson(res.bizContent);
+		requestNew(getOpenId, options).then((res) => {
+			const result = res;
 			console.log("获取微信小程序openid", result);
-			const openidData = stringToJson(result.data);
+			const openidData = result.data;
 			state.openid = openidData.openid
 		});
 		// #endif
@@ -239,8 +237,8 @@
 				method: "POST",
 				showLoading: true,
 			};
-			request(CardBillPlaceOrder, options).then((res) => {
-				const data = stringToJson(res.bizContent);
+			requestNew(trafficsuppleApply, options).then((res) => {
+				const data =res;
 				state.orderId = data.orderId
 				uni.requestPayment({
 					provider: "wxpay",
@@ -275,7 +273,7 @@
 						showLoading: true,
 					};
 					console.log('支付宝用户编号请求：', optionsUser)
-					request(obtainUserId, optionsUser).then((res) => {
+					requestNew(trafficsupplObtainuserid, optionsUser).then((res) => {
 						console.log('支付宝用户编号返回：', res)
 						const data = stringToJson(res.bizContent);
 						const optionsali = {
@@ -290,9 +288,9 @@
 							showLoading: true,
 						};
 						console.log('支付下单请求：', optionsali)
-						request(CardBillPlaceOrder, optionsali).then((res) => {
+						requestNew(trafficsuppleApply, optionsali).then((res) => {
 							console.log('支付下单返回：', res)
-							const data = stringToJson(res.bizContent);
+							const data = res;
 							my.tradePay({
 								// 调用统一收单交易创建接口（alipay.trade.create），获得返回字段支付宝交易号 trade_no
 								tradeNO: data.tranPackage,
@@ -309,8 +307,8 @@
 										method: "POST",
 										showLoading: true,
 									};
-									request(CardBillQuery, options).then((res) => {
-										const data = stringToJson(res.bizContent);
+									requestNew(trafficsuppleQueryList, options).then((res) => {
+										const data = res;
 										console.log(data);
 										data.data = data.data.map(val => {
 											val.checked = false
@@ -356,7 +354,7 @@
 			showLoading: true,
 		};
 
-		request(CardBillPayStatus, options).then((res) => {
+		requestNew(trafficsupplePayQuery, options).then((res) => {
 			msg("支付成功!");
 			getlist()
 		});
@@ -365,7 +363,7 @@
 	onLoad(() => {
 		getlist()
 		getOpenID()
-		console.log(state);
+		console.log("state");
 	})
 
 	onPullDownRefresh(() => {

subpackage/after-sale/blacklist-query/list.vue

@@ -14,10 +14,9 @@
 <script setup lang="ts">
 	import { reactive } from "vue";
 	import { onLoad } from "@dcloudio/uni-app";
-	import { blackApi,cardBlackQuery } from "@/utils/network/api.js";
-	import { request, requestNew } from "@/utils/network/request.js";
-	import { stringToJson } from "@/utils/network/encryption.js";
-	import { getItem } from "@/utils/storage";
+	import {cardBlackQuery } from "@/utils/network/api.js";
+	import {requestNew } from "@/utils/network/request.js";
+	import {getItem } from "@/utils/storage";
 	const state = reactive({
 		vehiclePlate: "",
 		vehiclePlateColor: "",

subpackage/after-sale/card-Renewal/renewal-confirm.vue

@@ -104,14 +104,14 @@
 		onShow
 	} from "@dcloudio/uni-app";
 	import {
-		request
+		request,requestNew
 	} from "@/utils/network/request.js";
 	import {
-		orderDetail,
-		cardRenewal,
-		writeCardBack,
-		cardModifyConfirm,
-		obuRenewal,
+		orderDetailQuery,
+		cardRenewalFromWechat,
+		cardCosConfirm,
+		cardRenewalConfirm,
+		obuRenewalFromWechat,
 		modifyObuVehicleInfo,
 		obuActivation,
 		renewalTimeApi
@@ -256,8 +256,8 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(orderDetail, options).then((res) => {
-			let orderInfo = JSON.parse(res.bizContent);
+		requestNew(orderDetailQuery, options).then((res) => {
+			let orderInfo = res;
 			console.log("orderInfo", orderInfo);
 			orderInfos.orderId = orderInfo.orderId;
 			orderInfos.customerName = orderInfo.customerName;
@@ -289,8 +289,8 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(cardRenewal, options).then((res) => {
-			let result = stringToJson(res.bizContent);
+		requestNew(cardRenewalFromWechat, options).then((res) => {
+			let result = res;
 			let cmdArray = result.command.split(",");
 			console.log(cmdArray);
 			console.log(result.cosRecordId);
@@ -329,10 +329,10 @@
 		};
 
 		//调用方式
-		request(writeCardBack, options)
+		requestNew(cardCosConfirm, options)
 			.then((res) => {
 				tools.hideLoadingAlert();
-				let result = JSON.parse(res.bizContent);
+				let result = res;
 				if (result.orderStatus == 1 || result.orderStatus == "1") {
 					tools.showLoadingAlert("执行指令中");
 					bluetoothUtil.transCmd(result.command.split(","), "10", function(res) {
@@ -358,7 +358,7 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(cardModifyConfirm, options).then((res) => {
+		requestNew(cardRenewalConfirm, options).then((res) => {
 			// 只写卡
 			if (flag.length == 1) {
 				sure(1)
@@ -419,8 +419,8 @@
 					method: "POST",
 					showLoading: true,
 				};
-				request(obuRenewal, options).then((res) => {
-					let datas = stringToJson(res.bizContent);
+				requestNew(obuRenewalFromWechat, options).then((res) => {
+					let datas = res;
 					console.log("899", datas, datas.data.APDU);
 					if (datas.data.APDU) {
 						tools.showLoadingAlert("正在执行指令");
@@ -556,8 +556,8 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(orderDetail, options).then((res) => {
-			orderInfo = JSON.parse(res.bizContent);
+		requestNew(orderDetailQuery, options).then((res) => {
+			orderInfo = res;
 			console.log("orderInfo", orderInfo);
 			console.log("orderInfores", res);
 			if (orderInfo) {

subpackage/after-sale/card-loss-reporting/cardloss-confirm.vue

@@ -107,22 +107,15 @@
 		onUnload,
 		onShow
 	} from "@dcloudio/uni-app";
-	import {
-		request
+	import {requestNew
 	} from "@/utils/network/request.js";
-	import {
-		orderDetail,
-		CardlossStatus
+	import {orderDetailQuery,cardObuLoss
 	} from "@/utils/network/api.js";
 
 	import {
 		msg
 	} from "@/utils/utils";
 
-	import {
-		stringToJson
-	} from "@/utils/network/encryption";
-
 	const state = reactive({
 		id: "",
 		data: {
@@ -137,6 +130,7 @@
 	/*视图进入后操作*/
 	onShow(() => {
 		queryOrderDetail(state.id).then((val : any) => {
+			console.log("val",val)
 			state.data = val
 			state.cardType=val.cardId.substring(8,10)
 			console.log(state.cardType)
@@ -245,7 +239,7 @@
 
 	const queryOrderDetail = (id) => {
 		return new Promise(async (resolve, reject) => {
-			const res = await request(orderDetail, {
+			const res = await requestNew(orderDetailQuery, {
 				type: 2,
 				data: {
 					id: id
@@ -253,7 +247,7 @@
 				method: "POST",
 				showLoading: true,
 			});
-			const data = stringToJson(res.bizContent);
+			const data = res;
 			resolve(data);
 		}).catch((error) => {
 
@@ -274,8 +268,8 @@
 			showLoading: true,
 		};
 		return new Promise(async (resolve, reject) => {
-			const res = await request(CardlossStatus, options);
-			const data = stringToJson(res.bizContent);
+			const res = await requestNew(cardObuLoss, options);
+			const data = res
 			resolve(data);
 		}).catch((error) => {
 			reject(error);

subpackage/after-sale/card-loss-reporting/cardloss.vue

@@ -35,12 +35,10 @@
 	import {
 		onLoad
 	} from "@dcloudio/uni-app";
+	import { requestNew} from "@/utils/network/request.js";
 	import {
-		request
-	} from "@/utils/network/request.js";
-	import {
-		sendCode,
-		checkCode,
+		messageValid,
+		sendMessage
 	} from "@/utils/network/api.js";
 
 	import {
@@ -94,7 +92,7 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(sendCode, options)
+		requestNew(sendMessage, options)
 			.then((res) => {
 				codeInterval();
 
@@ -121,7 +119,7 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(checkCode, options)
+		requestNew(messageValid, options)
 			.then((res) => {
 
 				uni.$emit('queryCardlossStatus', {

subpackage/after-sale/deviceInfo/deviceInfo.vue

@@ -146,9 +146,13 @@
 		onUnload
 	} from "@dcloudio/uni-app";
 	import {
-		request,requestNew
+		request
 	} from "@/utils/network/request";
-	import {cardObuQuery,obuFileDataDecrypt} from "@/utils/network/api";
+	import {
+		obuDecrypt,
+		cardList,
+		searchObuInfo
+	} from "@/utils/network/api";
 	import {
 		stringToJson
 	} from "@/utils/network/encryption";
@@ -252,7 +256,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) {
@@ -402,8 +406,8 @@
 			method: "POST",
 			showLoading: true,
 		};
-		requestNew(obuFileDataDecrypt, options).then((res) => {
-			const data =res
+		request(obuDecrypt, options).then((res) => {
+			const data = stringToJson(res.bizContent)
 			const FileData = data.data.FileData
 			func(FileData)
 		});
@@ -426,10 +430,9 @@
 		//提示对话框
 		tools.showModalAlert(msg);
 	}
-	const getObuList = () => {
+	const getCardList = () => {
 		var data = {
-			obuId: obu.num,
-			cardId:card.cardNo,
+			vehicleId: state.vehicleId
 		};
 		const options = {
 			type: 2,
@@ -437,19 +440,34 @@
 			method: "POST",
 			showLoading: true,
 		};
-		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) {
+		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) {
 				state.cardTypeName = "预存卡"
-			} else if (result.cardType == 2) {
+			} else if (result.data[0].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/orders/changeInformation.vue

@@ -240,7 +240,7 @@
 		fileUpload,
 		register,
 		envs,
-		getUserMsg
+		getUserMsg,idCardOcr
 	} from "@/utils/network/api.js";
 
 	import {
@@ -576,7 +576,7 @@
 		state.isTakePhotoModeShow = false
 		var imageType = state.choiceIndex;
 		console.log("图片地址val", val.tempImagePath)
-		uploadFile(val.tempImagePath, imageType, etcOcrCard).then((data) => {
+		uploadFile(val.tempImagePath, imageType, idCardOcr).then((data) => {
 			console.log("身份证上传", data)
 			if (state.isMy == "my") {
 				if (state.choiceIndex == "1") {

subpackage/orders/invoiceApply/invoice-content.vue

@@ -73,7 +73,7 @@
 		navTo, msg
 	} from "@/utils/utils";
 	import { reactive, ref } from "vue";
-	import { onLoad, onReachBottom, onShow } from "@dcloudio/uni-app";
+	import { onLoad, onReachBottom} from "@dcloudio/uni-app";
 	import { queryEtcOrderApi, getUserMsg, trafficFlowApi } from "@/utils/network/api.js";
 	import { stringToJson } from "@/utils/network/encryption";
 	import { request } from "@/utils/network/request.js";
@@ -116,11 +116,6 @@
 		state.type = option.type
 		getUserinfo()
 	})
-	// onShow(() => {
-	// 	if (state.type == 1) {
-	// 		etcOrder(1)
-	// 	}
-	// })
 	const value = ref('')
 	const getUserinfo = () => {
 		const options = {

subpackage/orders/invoiceApply/invoice-header-add.vue

@@ -81,10 +81,9 @@
 		ref,
 		reactive
 	} from "vue";
-	import { addInvoiceApi, queryEtcOrderApi } from "@/utils/network/api.js";
-	import { request } from "@/utils/network/request.js";
-	import { stringToJson } from "@/utils/network/encryption";
-	import { msg, checkStr } from "@/utils/utils";
+	import { billRaiseInsert } from "@/utils/network/api.js";
+	import {requestNew } from "@/utils/network/request.js";
+	import { msg } from "@/utils/utils";
 	import { onLoad } from "@dcloudio/uni-app";
 	const form = reactive({
 		titleType: 1, //抬头类型 1-单位抬头 2个人抬头
@@ -171,8 +170,8 @@
 			showLoading: true,
 		};
 
-		request(addInvoiceApi, options).then((res) => {
-			const data = stringToJson(res.bizContent);
+		requestNew(billRaiseInsert, options).then((res) => {
+			const data =res;
 			console.log("data", data)
 			uni.navigateBack({
 				delta: 1

subpackage/orders/invoiceApply/invoice-header-edit.vue

@@ -84,10 +84,10 @@
 		ref,
 		reactive
 	} from "vue";
-	import { editInvoiceHeaderApi, delInvoiceHeaderApi } from "@/utils/network/api.js";
-	import { request } from "@/utils/network/request.js";
+	import { billRaiseUpdate, billRaiseDelete } from "@/utils/network/api.js";
+	import { requestNew } from "@/utils/network/request.js";
 	import { stringToJson } from "@/utils/network/encryption";
-	import { msg, checkStr } from "@/utils/utils";
+	import { msg} from "@/utils/utils";
 	import { onLoad } from "@dcloudio/uni-app";
 	const form = reactive({
 		titleType: 1, //抬头类型 1-单位抬头 2个人抬头
@@ -199,8 +199,8 @@
 			showLoading: true,
 		};
 
-		request(editInvoiceHeaderApi, options).then((res) => {
-			const data = stringToJson(res.bizContent);
+		requestNew(billRaiseUpdate, options).then((res) => {
+			const data = res;
 			console.log("data", data)
 			uni.navigateBack({
 				delta: 1
@@ -219,8 +219,8 @@
 			showLoading: true,
 		};
 
-		request(delInvoiceHeaderApi, options).then((res) => {
-			const data = stringToJson(res.bizContent);
+		requestNew(billRaiseDelete, options).then((res) => {
+			const data = res;
 			console.log("data", data)
 			uni.navigateBack({
 				delta: 1

subpackage/orders/invoiceApply/invoice-header-list.vue

@@ -44,9 +44,9 @@
 	import {
 		navTo,
 	} from "@/utils/utils";
-	import { queryInvoiceHeaderApi, getUserMsg } from "@/utils/network/api.js";
+	import { billRaiseSelect, getUserMsg } from "@/utils/network/api.js";
 	import { stringToJson } from "@/utils/network/encryption";
-	import { request } from "@/utils/network/request.js";
+	import { request,requestNew } from "@/utils/network/request.js";
 	import {
 		getItem
 	} from "@/utils/storage";
@@ -105,8 +105,8 @@
 			showLoading: true,
 		};
 		console.log("options", options)
-		request(queryInvoiceHeaderApi, options).then((res) => {
-			const data = stringToJson(res.bizContent);
+		requestNew(billRaiseSelect, options).then((res) => {
+			const data = res;
 			form.data = data.titles
 			console.log("data", data.titles)
 

subpackage/orders/invoiceApply/invoiceList.vue

@@ -57,10 +57,8 @@
 		reactive
 	} from "vue";
 	import { onLoad, onReachBottom } from "@dcloudio/uni-app";
-	import { invoiceQueryApi } from "@/utils/network/api.js";
-	import { stringToJson } from "@/utils/network/encryption";
-	import { request } from "@/utils/network/request.js";
-	import { msg } from "@/utils/utils";
+	import { billQueryBill } from "@/utils/network/api.js";
+	import { requestNew } from "@/utils/network/request.js";
 	const state = reactive({
 		userMobile: "",
 		pageNumber: 1,
@@ -110,8 +108,8 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(invoiceQueryApi, options).then((res) => {
-			const data = stringToJson(res.bizContent);
+		requestNew(billQueryBill, options).then((res) => {
+			const data = res;
 			state.data = data.invoices
 			console.log(data, "通行");
 		});

subpackage/orders/opening-account-unit.vue

@@ -78,6 +78,10 @@
 					<u-input inputAlign="right" class="clearBg" placeholder='请输入社会信用代码' v-model="state.form.userIdNum"
 						maxlength="50" />
 				</u-form-item>
+				<u-form-item label="营业执照地址">
+					<u-input inputAlign="right" class="clearBg" placeholder='请输入营业执照地址' v-model="state.form.userAddress"
+						maxlength="50" />
+				</u-form-item>
 				<u-form-item label="经办人姓名">
 					<u-input inputAlign="right" class="clearBg" placeholder='请输入经办人姓名' v-model="state.form.agentName"
 						maxlength="20" />
@@ -87,11 +91,11 @@
 						maxlength="18" />
 				</u-form-item>
 				<u-form-item label="经办人地址">
-					<u-input inputAlign="right" class="clearBg" placeholder='请输入经办人地址' v-model="state.form.address"
+					<u-input inputAlign="right" class="clearBg" placeholder='请输入经办人地址' v-model="state.form.agentAddress"
 						maxlength="40" />
 				</u-form-item>
 				<u-form-item label="经办人联系方式">
-					<u-input inputAlign="right" class="clearBg" placeholder='请输入经办人联系方式' v-model="state.form.tel"
+					<u-input inputAlign="right" class="clearBg" placeholder='请输入经办人联系方式' v-model="state.form.agentTel"
 						maxlength="11" />
 				</u-form-item>
 			</u-form>
@@ -126,12 +130,10 @@
 	import viewfinder from "../../components/viewfinder.vue"
 	import {
 		ocrAllQuery,
-		etcCompanyCardInfoSubmit,
-		idCardOcr,registerFull
+		idCardOcr,registerFull,userUpload
 	} from "@/utils/network/api.js";
 
-	import {
-		request, requestNew
+	import { requestNew
 	} from "@/utils/network/request.js";
 
 	import {
@@ -171,7 +173,7 @@
 
 			posImgUrl: "", //营业执照证明
 			department: '本部', //不超过50个字符，若单位仅开一个账户，填写“本部”
-			address: "", //单位地址
+			userAddress: "", //单位地址
 			//经办人信息
 			agentName: "",
 			agentIdType: "101",
@@ -179,7 +181,7 @@
 			agentAddress: "",
 			agentPhone: "",
 			agentIdVld: '',
-			tel: '',
+			agentTel: '',
 			agentGender: '',
 			agentPosImgUrl: "",
 			agentNegImgUrl: "",
@@ -189,11 +191,15 @@
 			channelId: "", //渠道id
 			opId: '',
 			orderSource: 'WECHAT',
+			isAgent:true,  //经办人办理
+			userNegImgUrl:"",
+			userPosImgUrl:"",
+			tel:""
 		},
 		orderId: "",
 		vehiclePlateColor: '',
 		isSign: '',
-		type: 1,
+		vanType: 1,
 		vehicleId: "",
 		jsCode:""
 	});
@@ -232,6 +238,10 @@
 			msg('请输入社会信用代码');
 			return;
 		}
+		if (!state.form.userAddress) {
+			msg('请输入营业执照地址');
+			return;
+		}
 		if (!state.form.agentName) {
 			msg('请输入经办人姓名');
 			return;
@@ -240,10 +250,11 @@
 			msg('请输入正确的经办人身份证号');
 			return;
 		}
-		if (!checkStr(state.form.tel, 'mobile')) {
+		if (!checkStr(state.form.agentTel, 'mobile')) {
 			msg('请输入正确的经办人联系方式');
 			return;
 		}
+		state.form.tel=state.form.agentTel
 		registerRequest().then((result : any) => {
 			console.log("result", result)
 			if (!getItem('openId')) {
@@ -258,10 +269,10 @@
 				method: "POST",
 				showLoading: true,
 			};
-			request(etcCompanyCardInfoSubmit, options).then((res) => {
-				const data = stringToJson(res.bizContent);
+			requestNew(userUpload, options).then((res) => {
+				const data = res;
 				uni.redirectTo({
-					url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&type=${state.type}&vehicleId=${state.vehicleId}`,
+					url: `/subpackage/orders/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}&vanType=${state.vanType}&vehicleId=${state.vehicleId}`,
 				});
 			});
 		})
@@ -274,7 +285,7 @@
 		state.vehiclePlateColor = option.vehiclePlateColor;
 		state.form.opId = getItem('openId') ? getItem('openId') : '';
 		state.isSign = option.isSign;
-		state.type = option.type;
+		state.vanType = option.vanType;
 		state.vehicleId = option.vehicleId;
 		console.log("state.type", option)
 		uni.login({
@@ -309,6 +320,8 @@
 							'统一社会信用代码'];
 						uploadFile(res.tempFilePaths[0], "", "").then((data) => {
 							state.form.posImgUrl = data;
+							state.form.userNegImgUrl = data;
+							state.form.userPosImgUrl = data;
 						})
 					}
 				})
@@ -386,7 +399,7 @@
 				state.form.agentName = data.name;
 				state.form.agentIdNum = data.idno;
 				state.form.agentPosImgUrl = data.imageUrl;
-				state.form.address = data.address;
+				state.form.agentAddress = data.address;
 				state.form.agentGender = data.gender;
 			} else {
 				state.form.agentIdVld = data.enddate;
@@ -431,11 +444,11 @@
 			userType: "ENTERPRISE",
 			idNum: state.form.userIdNum,
 			idType: state.form.userIdType,
-			mobile: state.form.tel,
+			mobile: state.form.agentTel,
 			userName: state.form.userName,
 			gender: 'UNKOWN',
 			certifyChannel: "BAIDUOCR",
-			address: state.form.address,
+			address: state.form.userAddress,
 			agentIdNum: state.form.agentIdNum,
 			agentIdType: state.form.agentIdType,
 			agentName: state.form.agentName,

subpackage/personal-center/search/etcFlowingWater.vue

@@ -109,9 +109,8 @@
 		stringToJson
 	} from "@/utils/network/encryption.js";
 	import {
-		passBillCount,
-		downloadBills,
-		passbill,cardList
+		passBillCount,detaildownload,
+		passbill,cardinformationquery,totalbill
 	} from "@/utils/network/api.js";
 	import {
 		onLoad,
@@ -166,7 +165,9 @@ const changeCardId = (e) => {
 	}
     const getCardList = (vehicleId) => {
 		var data = {
-			vehicleId: vehicleId
+			vehicleId: vehicleId,
+			vehiclePlate:vehicleId.split('_')[0],
+			vehiclePlateColor:Number(vehicleId.split('_')[1]) 
 		};
 		const options = {
 			type: 2,
@@ -174,9 +175,9 @@ const changeCardId = (e) => {
 			method: "POST",
 			showLoading: true,
 		};
-		request(cardList, options).then((res) => {
-			console.log("152", stringToJson(res.bizContent))
-			let result = stringToJson(res.bizContent);
+		requestNew(cardinformationquery, options).then((res) => {
+			console.log("152", res)
+			let result =res;
 			for (var k = 0; k < result.data.length; k++) {
 				state.cardIdRange.push(result.data[k]['cardId'])
 			}
@@ -242,8 +243,8 @@ const changeCardId = (e) => {
 			method: "POST",
 			showLoading: true,
 		};
-		request(passBillCount, options).then((res) => {
-			let result = stringToJson(res.bizContent)
+		requestNew(totalbill, options).then((res) => {
+			let result =res
 			state.aggregateAmount = result.aggregateAmount ? result.aggregateAmount : 0
 			state.passTotal = result.passTotal ? result.passTotal : 0
 			state.parkTotal = result.parkTotal ? result.parkTotal : 0
@@ -296,8 +297,8 @@ const changeCardId = (e) => {
 			method: "POST",
 			showLoading: true,
 		};
-		request(downloadBills, options).then((res) => {
-			let result = stringToJson(res.bizContent)
+		requestNew(detaildownload, options).then((res) => {
+			let result =res
 			console.log("downloadFileURL", downloadFileURL + result.ossFilePath);
 			download(downloadFileURL + result.ossFilePath)
 		})
@@ -469,10 +470,6 @@ const changeCardId = (e) => {
 		display: flex;
 		justify-content: space-evenly;
 		align-items: center;
-
-		// .total-space {
-		// 	margin-left: 41rpx;
-		// }
 	}
 
 	.btn-download {

utils/network/api.js

@@ -338,5 +338,33 @@ 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 obuFileDataDecrypt= "/iaw/ass/issueBase/obuFileDataDecrypt"  //OBU系统信息在线解密
+// 通行流水记录查询
+export const cardinformationquery= "/iaw/app/issue/cardAnnounce/cardinformationquery"  //卡信息查询
+export const detaildownload= "/iaw/app/issue/cardAnnounce/detaildownload"  //明细下载
+export const totalbill= "/iaw/app/issue/cardAnnounce/totalbill"  //账单合计
 export const passbill= "/iaw/app/issue/cardAnnounce/passbill"  //ETC通行流水记录查询
-export const obuFileDataDecrypt= "/iaw/ass/issueBase/obuFileDataDecrypt"  //OBU系统信息在线解密
+
+// 验证码
+export const sendMessage= "/iaw/message/sendMessage"  //发送短信验证码
+export const messageValid= "/iaw/message/messageValid"  //短信验证码验证
+
+// 卡签挂失解挂
+export const cardObuLoss= "/iaw/api/afterSale/cardObuLoss/loss"  //卡签挂失解挂失
+// 欠费补缴
+export const trafficsuppleQueryList= "/iaw/trafficsupple/queryList"  //通行流水欠费补缴信息查询
+export const trafficsuppleApply= "/iaw/trafficsupple/apply"  //通行流水欠费补缴支付下单
+export const trafficsupplePayQuery= "/iaw/trafficsupple/payQuery"  //通行流水欠费补缴支付查询
+export const trafficsupplObtainuserid= "/iaw/trafficsupple/obtainuserid"  //统一会员平台获取第三方用户标识
+// 发票
+export const billRaiseSelect = "/iaw/invoice/bill/billRaiseSelect" // 查询发票抬头
+export const billRaiseInsert = "/iaw/invoice/bill/billRaiseInsert" // 新增发票抬头
+export const billRaiseUpdate = "/iaw/invoice/bill/billRaiseUpdate" // 修改发票抬头
+export const billRaiseDelete = "/iaw/invoice/bill/billRaiseDelete" // 删除发票抬头
+export const billQueryBill = "/iaw/invoice/bill/queryBill" // 发票查询
+// 卡签续期
+export const cardRenewalFromWechat = "/iaw/api/afterSale/renewal/cardRenewal/fromWechat" //小程序卡续期
+export const cardRenewalConfirm = "/iaw/api/afterSale/renewal/cardRenewal/confirm" //卡续期确认
+export const obuRenewalFromWechat = "/iaw/api/afterSale/renewal/obuRenewal/fromWechat" //小程序签续期
+export const cardCosConfirm = "/iaw/api/active/cardCos/confirm" //写卡指令结果返回
+

utils/util/fileData.js

@@ -1,16 +1,7 @@
-// import {
-// 	TextEncoder,
-// 	TextDecoder
-// } from "../node-model/text-decoding";
-import "./encoder.js"
-
-// #ifdef MP-WEIXIN
-console.log("global", global)
-// #endif
-
-// #ifdef MP-ALIPAY
-console.log("global", $global)
-// #endif
+import {
+	TextEncoder,
+	TextDecoder
+} from "../node-model/text-decoding";
 
 export function IntegerToHexString(num, nLen) {
 	if (num == null) {
@@ -36,15 +27,7 @@ export function HighAddZero(str, nLen) {
 }
 export function AsciToHexString(strAsci, nLen) {
 	let s = String(strAsci);
-
-	// #ifdef MP-WEIXIN
-	let encoder = new global.TextEncoder("UTF-8");
-	// #endif
-
-	// #ifdef MP-ALIPAY
-	let encoder = new $global.TextEncoder("UTF-8");
-	// #endif
-	// let encoder = new TextEncoder("UTF-8");
+	let encoder = new TextEncoder("UTF-8");
 	// let encoder = new TextEncoder("gbk");
 	// let bytes = encode(str, 'gbk');
 	let bytes = encoder.encode(s);
@@ -92,14 +75,7 @@ export function HexToStrig(data, charType = 1) {
 	}
 	const asd = hexStringToByteArray(data);
 	try {
-		// #ifdef MP-WEIXIN
-		let str = new global.TextDecoder("GBK").decode(asd)
-		// #endif
-
-		// #ifdef MP-ALIPAY
-		let str = new $global.TextDecoder("GBK").decode(asd)
-		// #endif
-		// str = new TextDecoder("GBK").decode(asd);
+		str = new TextDecoder("GBK").decode(asd);
 
 	} catch (e) {
 		console.error(e);