储值卡圈存

subpackage/after-sale/activation/activate.vue

@@ -466,7 +466,7 @@ function versionVerification(transOrderId, cmd, cmdResult, stepNo){
 		color: white;
 		font-size: 32rpx;
 		text-align: center;
-		background: linear-gradient(to left, #43a1e0 0%, #13e7c1 100%);
+		background: linear-gradient(to right,#01243A,#004576);
 		border-radius: 40rpx;
 		outline: none;
 		border: #4cd95f;

subpackage/after-sale/rescind-carId/base-change-people.vue

@@ -74,19 +74,10 @@
 	import {
 		etcOcrCard
 	} from "@/utils/network/api.js";
-	import {
-		stringToJson
-	} from "@/utils/network/encryption";
-	import {
-		request
-	} from "@/utils/network/request.js";
 	import viewfinder from "@/components/viewfinder.vue"
 	const savaHandle = () => {
 		console.log("执行点击事件");
 		navTo("/subpackage/after-sale/rescind-carId/car-change");
-		// uni.navigateTo({
-		// 	url: '/pages/applyCard/car-release'
-		// })
 	};
 	const tabChange = (val) => {
 		if (val) {

subpackage/after-sale/to-bookkeeping-card/base-change-people.vue

@@ -68,22 +68,10 @@
 	import { reactive } from "vue";
 	import { navTo, uploadFile } from "@/utils/utils";
 	import { etcOcrCard } from "@/utils/network/api.js";
-	import { stringToJson } from "@/utils/network/encryption";
-	import { request } from "@/utils/network/request.js";
 	import viewfinder from "@/components/viewfinder.vue"
 	const savaHandle = () => {
 		console.log("执行点击事件");
 		navTo("/subpackage/after-sale/to-bookkeeping-card/car-change");
-		// uni.navigateTo({
-		// 	url: '/pages/applyCard/car-release'
-		// })
-	};
-	const tabChange = (val) => {
-		if (val) {
-			state.isMyPeopple = true;
-		} else {
-			state.isMyPeopple = false;
-		}
 	};
 
 	const state = reactive({

subpackage/after-sale/transfer-page.vue

@@ -10,10 +10,9 @@
 		navTo
 	} from "@/utils/utils"
 	import {
-		orderList,
+		afterSaleCommQuery,
 		silentLoginApi,
 		selectCarInfo,
-		oneOreTwo
 	} from "@/utils/network/api.js";
 	import {
 		getItem,
@@ -21,7 +20,7 @@
 		setItem
 	} from "@/utils/storage";
 	import {
-		request
+		request, requestNew
 	} from "@/utils/network/request.js";
 	import {
 		stringToJson
@@ -140,8 +139,8 @@
 			showLoading: true,
 		};
 		return new Promise(async (resolve, reject) => {
-			const res = await request(silentLoginApi, options);
-			const data = stringToJson(res.bizContent);
+			const res = await requestNew(silentLoginApi, options);
+			const data = res;
 			setItem("openId", data.openId);
 			setItem("token", data.accessToken);
 			resolve(data);
@@ -175,8 +174,8 @@
 			showLoading: true,
 		};
 		return new Promise(async (resolve, reject) => {
-			const res = await request(orderList, options);
-			const data = stringToJson(res.bizContent);
+			const res = await requestNew(afterSaleCommQuery, options);
+			const data = res;
 			resolve(data);
 		}).catch((error) => {
 			reject(error);
@@ -218,17 +217,7 @@
 		} else if (state.type == "27") {
 			navTo(`/subpackage/after-sale/pin-code-deblocking/pin-code-confirm?id=${state.id}`)
 		} else if (state.type == "28") {
-			// queryOneOreTwo().then((data) => {
-			// 	// newStatus  0:未激活(首次激活) 1:激活（obu重新激活）
-			// 	console.log("data000", data)
-			// 	if (data.pass == "on") {
-			// 		if (data.newStatus == "0") {
-						navTo(`/subpackage/personal-center/install-activation-order`)
-				// 	} else {
-				// 		navTo(`/subpackage/after-sale/activation-once-again/select-car?type=1`)
-				// 	}
-				// }
-			// })
+			navTo(`/subpackage/personal-center/install-activation-order`)
 		} else if (state.type == "29") {
 			navTo(`/subpackage/personal-center/search/select-card?vehicleId=${state.vehicleId}`)
 		} else if (state.type == "30") {
@@ -279,27 +268,6 @@
 		});
 
 	}
-	// 查询首次激活还是OBU重新激活
-	// const queryOneOreTwo = () => {
-	// 	const options = {
-	// 		type: 2,
-	// 		data: {
-	// 			"source": 'MINI_PROGRAM',
-	// 			"vehicleId": state.vehicleId
-	// 		},
-	// 		method: "POST",
-	// 		showLoading: true,
-	// 	};
-	// 	return new Promise(async (resolve, reject) => {
-	// 		const res = await request(oneOreTwo, options);
-	// 		const data = stringToJson(res.bizContent);
-	// 		console.log("data==", data)
-	// 		resolve(data);
-	// 	}).catch((error) => {
-	// 		reject(error);
-	// 	});
-
-	// }
 </script>
 
 <style scoped>

subpackage/carPark/recharge/recharge-weixin.vue

@@ -538,8 +538,8 @@
 			showLoading: true,
 		};
 		return new Promise(async (resolve, reject) => {
-			const res = await request(quanCheck, options);
-			const data = stringToJson(res.bizContent);
+			const res = await requestNew(quanCheck, options);
+			const data = res;
 			resolve(data);
 		}).catch((error) => {
 			reject(error);
@@ -560,8 +560,8 @@
 			showLoading: true,
 		};
 		return new Promise(async (resolve, reject) => {
-			const res = await request(quanXf, options);
-			const data = stringToJson(res.bizContent);
+			const res = await requestNew(quanXf, options);
+			const data = res;
 			resolve(data);
 		}).catch((error) => {
 			reject(error);
@@ -589,8 +589,8 @@
 		};
 
 		return new Promise(async (resolve, reject) => {
-			const res = await request(quanApply, options);
-			const data = stringToJson(res.bizContent);
+			const res = await requestNew(quanApply, options);
+			const data = res;
 			resolve(data);
 		}).catch((error) => {
 			reject(error);
@@ -625,8 +625,8 @@
 					showLoading: true,
 				};
 				return new Promise(async () => {
-					const res = await request(quanConfirm, options);
-					const data = stringToJson(res.bizContent);
+					const res = await requestNew(quanConfirm, options);
+					const data = res;
 					console.log("data充值成功", data);
 					getCardId(1)
 					setTimeout(() => {
@@ -655,8 +655,8 @@
 			showLoading: true,
 		};
 		return new Promise(async (resolve, reject) => {
-			const res = await request(quanConfirm, options);
-			const data = stringToJson(res.bizContent);
+			const res = await requestNew(quanConfirm, options);
+			const data = res;
 			resolve(data);
 			console.log("uanConfirmSucessAction", data)
 		}).catch((error) => {
@@ -735,7 +735,7 @@
 		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
@@ -809,7 +809,7 @@
 						showLoading: true,
 					};
 					request(cardCzPay, optionsali).then((res) => {
-						const data = stringToJson(res.bizContent);
+						const data = res;
 						my.tradePay({
 							// 调用统一收单交易创建接口（alipay.trade.create），获得返回字段支付宝交易号 trade_no
 							tradeNO: data.tranPackage,

subpackage/orders/opening-account-people.vue

@@ -407,6 +407,7 @@
 			if (!getItem('openId')) {
 				setItem('token', result.accessToken)
 				setItem('openId', result.openId)
+				setItem('mobile', state.form.tel)
 				state.form.opId = getItem('openId') ? getItem('openId') : '';
 			}
 			console.log("正常走  ")

subpackage/orders/opening-account-unit.vue

@@ -284,6 +284,7 @@
 			if (!getItem('openId')) {
 				setItem('token', result.accessToken)
 				setItem('openId', result.openId)
+				setItem('mobile', state.form.tel)
 				state.form.opId = getItem('openId') ? getItem('openId') : '';
 			}
 			var data = state.form;

utils/network/api.js

@@ -144,18 +144,6 @@ export const passBillCount = "db62a6c55461498ab2f412868eea6d24" //BDS-账单合
 export const downloadBills = "558c8a96265445c78b59b4473ad01d42" //BDS-明细下载接口
 export const cardList = "152" //BDS-卡信息查询接口
 
-
-//圈存
-export const quanCheck = "69"; //圈存检测
-export const quanApply = "70"; //圈存申请
-export const cardCzApply = "810"; //储值卡充值一申请
-export const cardCzPay = "811"; //储值卡充值一获取支付 (充值申请)
-export const cardCzPayResult = "812"; //储值卡充值-查询支付结果
-export const cardCzPayResultCheck = "814"; //储值卡充值-获取已支付未圈存的充值单(充值检测)
-export const cardCzXFCheck = "815"; //储值卡充值-圈存(消费)
-export const quanXf = "71"; //圈存修复V (写指令)
-export const quanConfirm = "72"; //圈存确认
-
 //卡签操作
 export const cardRenewal = "891" //ASS-卡续期
 export const obuRenewal = "899" //ASS-签续期
@@ -245,7 +233,6 @@ export const ETCProductInvoiceApi = "32bab1eee9c34694baa37c9ed222d431" // ETC产
 export const invoiceQueryApi = "bd1340041fab4303899d41d23109e46a" // 发票查询
 export const flowServiceFee = "1a78cda7cace443f9cff63902fb3d35c" // 通行流水服务费批量开票
 
-export const silentLoginApi = "abaf0013caa24dafad12b0f571e8ee40" // 无感登录
 export const carMessageApi = "854899f6244049d69b6ff883f28dcb28" // 车辆信息上传带出车辆信息
 
 
@@ -445,4 +432,16 @@ export const PAYMENTORDERAPPLY = "/iaw/issue/order/payApply" //支付申请
 export const orderEvaluate = '/iaw/issue/evaluate/appraise'; //评价订单
 export const orderEvaluateTag = '/iaw/issue/evaluate/label'; //获取服务评价标签
 export const addEvaluation = "/iaw/issue/evaluate/add" //满意度评价-新增
-export const satisfactionEvaluation = "/iaw/issue/evaluate/page" //满意度评价-分页查询
+export const satisfactionEvaluation = "/iaw/issue/evaluate/page" //满意度评价-分页查询
+
+export const silentLoginApi = "/iaw/issue/userBasic/loginByNoPassword" // 无感登录
+//圈存
+export const quanCheck = "/iaw/cardCharge/cardChargeCheckWithCosByVfj"; //圈存检测
+export const quanApply = "/iaw/cardCharge/cardChargeWithCosByVfj"; //圈存申请
+export const cardCzApply = "810"; //储值卡充值一申请
+export const cardCzPay = "811"; //储值卡充值一获取支付 (充值申请)
+export const cardCzPayResult = "812"; //储值卡充值-查询支付结果
+export const cardCzPayResultCheck = "814"; //储值卡充值-获取已支付未圈存的充值单(充值检测)
+export const cardCzXFCheck = "815"; //储值卡充值-圈存(消费)
+export const quanXf = "/iaw/cardCharge/cardChargeFixWithCosByVfj"; //圈存修复V (写指令)
+export const quanConfirm = "/iaw/cardCharge/cardChargeConfirmWithCosByVfj"; //圈存确认