替换接口

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/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, "通行");
 		});

utils/network/api.js

@@ -355,4 +355,16 @@ 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 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" //写卡指令结果返回
+