替换接口

App.vue

@@ -3,8 +3,6 @@
 		request,requestNew
 	} from "@/utils/network/request.js";
 	import {
-		etcQYAction,
-		queryKey,
 		getGlobalParam,
 		wechatAppID,
 		wechatSecret,

composables/order/useOrderListItem.ts

@@ -2,12 +2,11 @@
  * 订单列表业务逻辑
  */
 import { reactive, ref, watch, nextTick, onMounted } from "vue";
-import { request, requestNew } from "@/utils/network/request.js";
-import { stringToJson } from "@/utils/network/encryption";
+import {requestNew } from "@/utils/network/request.js";
 import {onReachBottom, onPullDownRefresh, onShow } from "@dcloudio/uni-app";
 import { getItem, StorageKeys, setItem } from "@/utils/storage";
 import { hasLogin, msg, timesDiff } from "@/utils/utils";
-import { orderList,queryPage} from "@/utils/network/api";
+import { queryPage} from "@/utils/network/api";
 import { PageData } from "@/datas/enum";
 const tools = require("../../static/etcUtil/tools.js");
 const searchKeyWords = ref('');

login/login.vue

@@ -74,7 +74,7 @@
 	import { reactive } from "vue";
 	import { checkStr, msg, navTo, subscribeMessages } from "@/utils/utils";
 	import { onLoad, onUnload } from "@dcloudio/uni-app";
-	import { login, loginCode, loginTime, wechatAppID } from "@/utils/network/api.js";
+	import { login, loginCode, loginTime} from "@/utils/network/api.js";
 	import { request } from "@/utils/network/request.js";
 	import { stringToJson } from "@/utils/network/encryption";
 	import { useUserStore } from "@/stores/user";

pages.json

@@ -8,6 +8,7 @@
 				"navigationBarTitleText": "首页",
 				"navigationBarBackgroundColor": "#073157",
 				"navigationStyle": "custom",
+				 "navigationBarTextStyle":"white",
 				"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
 					"transparentTitle": "always",
 					"titlePenetrate": "YES",
@@ -29,6 +30,7 @@
 				"navigationBarBackgroundColor": "#01243A",
 				"backgroundColor": "#f6f9fc",
 				"navigationStyle": "custom",
+				"navigationBarTextStyle":"white",
 				"mp-alipay": { //在支付宝小程序中如果不生效 就加上这两行代码 就会生效啦
 					"transparentTitle": "always",
 					"titlePenetrate": "YES",

pages/index/index.vue

@@ -394,9 +394,9 @@
 	});
 	// 页面初次渲染完成时触发
 	onReady(() => {
-		setTimeout(() => {
+		// setTimeout(() => {
 			quanKeyAction()
-		}, 5000)
+		// }, 5000)
 	})
 
 	onMounted(() => {

subpackage/after-sale/ETC-log-off/etc-log-off.vue

@@ -55,12 +55,10 @@
 		onLoad
 	} from "@dcloudio/uni-app";
 
+	import {requestNew} from "@/utils/network/request.js";
 	import {
-		request
-	} from "@/utils/network/request.js";
-	import {
-		sendCode,
-		checkCode
+		sendMessage,
+		messageValid
 	} from "@/utils/network/api.js";
 	import {
 		msg
@@ -153,7 +151,7 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(sendCode, options)
+		requestNew(sendMessage, options)
 			.then((res) => {
 				codeInterval();
 
@@ -185,7 +183,7 @@
 					method: "POST",
 					showLoading: true,
 				};
-				request(checkCode, options)
+				requestNew(messageValid, options)
 					.then(() => {
 						let obj = {
 							obuId: params.obuId,

subpackage/after-sale/ETC-log-off/log-off-confirm.vue

@@ -98,18 +98,12 @@
 		onLoad,
 		onUnload
 	} from "@dcloudio/uni-app";
-	import {
-		request, requestNew
-	} from "@/utils/network/request.js";
+	import {requestNew} from "@/utils/network/request.js";
 	import {
 		commGetDetail,
-		cckChangejzCardJY
+		cancelValid
 	} from "@/utils/network/api.js";
 
-	import {
-		stringToJson
-	} from "@/utils/network/encryption";
-
 	const state = reactive({
 		data: {
 			cardStatus: undefined,
@@ -152,17 +146,17 @@
 
 	const queryCckChangejzCardJY = () => {
 		return new Promise(async (resolve, reject) => {
-			const res = await request(cckChangejzCardJY, {
+			const res = await requestNew(cancelValid, {
 				type: 2,
 				data: {
-					// cardId: state.data.cardId,
-					// obuId: state.data.obuId,
-					orderId: state.data.orderId
+					cardId: state.data.cardId,
+					obuId: state.data.obuId,
+					// orderId: state.data.orderId
 				},
 				method: "POST",
 				showLoading: true,
 			});
-			const data = stringToJson(res.bizContent);
+			const data = res;
 			resolve(data);
 		}).catch((error) => {
 			reject(error);

subpackage/after-sale/ETC-log-off/upload-card.vue

@@ -90,7 +90,7 @@
 	} from "@dcloudio/uni-app";
 	import {
 		navTo,
-		msg, strReplace, uploadFile, compressImage,
+		msg, strReplace, uploadFile,
 		chooseImageCompress
 	} from "@/utils/utils";
 	import {
@@ -98,7 +98,7 @@
 	} from "@/utils/network/request.js";
 	import {
 		writeCardBack,
-		CardSignCancellation, etcCarOcrCard
+		CardSignCancellation, vehicleLicenseOcr
 	} from "@/utils/network/api.js";
 	import {
 		stringToJson
@@ -398,7 +398,7 @@
 		state.changeColor = true;
 		state.phoneType = 0
 		state.isTakePhotoModeShow = false
-		uploadFile(val.tempImagePath, imageType, etcCarOcrCard).then((data) => {
+		uploadFile(val.tempImagePath, imageType, vehicleLicenseOcr).then((data) => {
 			// uploadFile(val.tempImagePath, state.choiceIndex, ocrAllQuery).then((data) => {
 			console.log('输出内容=====================', state.choiceIndex,data)
 			if (state.choiceIndex === "3") {

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

@@ -172,11 +172,11 @@ import { deviceType } from "@/utils/network/difference";
 					} else if (state.type == "2") {
 						navTo(`/subpackage/after-sale/ETC-log-off/log-off-confirm?vehicleId=${item.vehicleId}`)
 					} else if (state.type == "3") {
-						navTo(`/subpackage/after-sale/replace-equipment/replace-equipment-confirm?id=${item.id}`)
+						navTo(`/subpackage/after-sale/replace-equipment/replace-equipment-confirm?vehicleId=${item.vehicleId}`)
 					} else if (state.type == "4") {
 						navTo(`/subpackage/after-sale/card-Renewal/renewal-confirm?id=${item.id}&orderId=${item.orderId}`)
 					} else if (state.type == "5") {
-						navTo(`/subpackage/after-sale/card-loss-reporting/cardloss-confirm?id=${item.id}`)
+						navTo(`/subpackage/after-sale/card-loss-reporting/cardloss-confirm?vehicleId=${item.vehicleId}`)
 					}else if (state.type == "6") {
 						navTo(`/subpackage/after-sale/additional-equipment/additional-equipment-confirm?id=${item.id}`)
 					}else if (state.type == "30") {

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

@@ -117,7 +117,7 @@
 	} from "@/utils/utils";
 
 	const state = reactive({
-		id: "",
+		vehicleId: "",
 		data: {
 			cardStatus: undefined,
 			obuStatus: undefined,
@@ -129,7 +129,7 @@
 	const type = ref('')
 	/*视图进入后操作*/
 	onShow(() => {
-		queryOrderDetail(state.id).then((val : any) => {
+		queryOrderDetail(state.vehicleId).then((val : any) => {
 			console.log("val",val)
 			state.data = val
 			state.cardType=val.cardId.substring(8,10)
@@ -137,7 +137,7 @@
 		})
 	})
 	onLoad((option) => {
-		state.id = option.id
+		state.vehicleId = option.vehicleId
 		/*监听手机号验证后的回调*/
 		uni.$on('queryCardlossStatus', function (type) {
 			console.log("1111", type)
@@ -237,12 +237,12 @@
 		}
 	}
 
-	const queryOrderDetail = (id) => {
+	const queryOrderDetail = (vehicleId) => {
 		return new Promise(async (resolve, reject) => {
 			const res = await requestNew(orderDetailQuery, {
 				type: 2,
 				data: {
-					id: id
+					vehicleId
 				},
 				method: "POST",
 				showLoading: true,

subpackage/after-sale/equipment-upgrade/select-car.vue

@@ -35,20 +35,15 @@
 		onLoad
 	} from "@dcloudio/uni-app";
 	import {
-		orderList,
+		deviceUpgradePage,
 		deviceUpgradeOrderCheck,
-		searchVehicleInfo
+		vehicleInfoQuery
 	} from "@/utils/network/api.js";
-	import {
-		request, requestNew
-	} from "@/utils/network/request.js";
+	import { requestNew} from "@/utils/network/request.js";
 	import {
 		getItem,
 		StorageKeys,
 	} from "@/utils/storage";
-	import {
-		stringToJson
-	} from "@/utils/network/encryption";
 	import {
 		getCodeName
 	} from "@/datas/queryKey.js";
@@ -81,8 +76,8 @@
 			showLoading: true,
 		};
 		return new Promise(async (resolve, reject) => {
-			const res = await request(searchVehicleInfo, options);
-			const data = stringToJson(res.bizContent);
+			const res = await requestNew(vehicleInfoQuery, options);
+			const data = res;
 			resolve(data);
 		}).catch((error) => {
 			reject(error);
@@ -112,8 +107,8 @@
 			showLoading: true,
 		};
 		return new Promise(async (resolve, reject) => {
-			const res = await request(orderList, options);
-			const data = stringToJson(res.bizContent);
+			const res = await requestNew(deviceUpgradePage, options);
+			const data = res.result;
 			resolve(data);
 		}).catch((error) => {
 			reject(error);
@@ -157,7 +152,7 @@
 		};
 		return new Promise(async (resolve, reject) => {
 			const res = await requestNew(deviceUpgradeOrderCheck, options);
-			const data = stringToJson(res.bizContent);
+			const data = res;
 			resolve(data);
 		}).catch((error) => {
 			reject(error);

subpackage/after-sale/replace-equipment/form.vue

@@ -149,14 +149,13 @@
 		navTo
 	} from "@/utils/utils";
 	import {
-		request
+		request, requestNew
 	} from "@/utils/network/request.js";
 	import {
 		getLogistics,
 		addressQuery,
-		changeCardInfo,
-		changeCardQueryCancle,
-		// getMailingAddressApi
+		changeCardObuFill,
+		changeCardObuCancel
 	} from "@/utils/network/api.js";
 	import {
 		stringToJson
@@ -315,7 +314,7 @@
 			showLoading: true,
 		};
 		return new Promise(async (resolve, reject) => {
-			const res = await request(changeCardQueryCancle, options);
+			const res = await requestNew(changeCardObuCancel, options);
 			console.log("取消申请成功", data)
 			msg('取消申请成功');
 			setTimeout(() => {
@@ -449,7 +448,7 @@
 		};
 		console.log("data", data)
 		return new Promise(async (resolve, reject) => {
-			const res = await request(changeCardInfo, options);
+			const res = await requestNew(changeCardObuFill, options);
 			console.log("res", res.errorMsg)
 			const data = res.errorMsg;
 			resolve(data);

subpackage/after-sale/replace-equipment/replace-equipment-confirm.vue

@@ -95,10 +95,10 @@
 		onUnload
 	} from "@dcloudio/uni-app";
 	import {
-		request
+		request,requestNew
 	} from "@/utils/network/request.js";
 	import {
-		orderDetail,
+		commGetDetail,
 		changeCardQuery
 	} from "@/utils/network/api.js";
 	import {
@@ -134,7 +134,7 @@
 	/*视图进入后操作*/
 	onLoad((option) => {
 		console.log("id", option)
-		queryOrderDetail(option.id).then((val : any) => {
+		queryOrderDetail(option.vehicleId).then((val : any) => {
 			console.log("val", val)
 			state.data = val
 			state.cardType=val.cardId.substring(8,10)
@@ -167,9 +167,7 @@
 					)
 				}
 			}
-
 		})
-
 	}
 	//查询申请单
 	const changeCardQueryAction = () => {
@@ -191,17 +189,17 @@
 			reject(error);
 		});
 	}
-	const queryOrderDetail = (id) => {
+	const queryOrderDetail = (vehicleId) => {
 		return new Promise(async (resolve, reject) => {
-			const res = await request(orderDetail, {
+			const res = await requestNew(commGetDetail, {
 				type: 2,
 				data: {
-					id: id
+					vehicleId
 				},
 				method: "POST",
 				showLoading: true,
 			});
-			const data = stringToJson(res.bizContent);
+			const data = res;
 			resolve(data);
 		}).catch((error) => {
 			reject(error);

subpackage/after-sale/replace-equipment/verification.vue

@@ -69,11 +69,11 @@
 		onShow,
 	} from "@dcloudio/uni-app";
 	import {
-		request
+		request,requestNew
 	} from "@/utils/network/request.js";
 	import {
-		sendCode,
-		changeCardApply,
+		sendMessage,
+		changeCardObuApply,
 		changeCardQuery,
 	} from "@/utils/network/api.js";
 	import {
@@ -226,7 +226,7 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(sendCode, options)
+		requestNew(sendMessage, options)
 			.then((res) => {
 				codeInterval();
 
@@ -279,10 +279,10 @@
 			showLoading: true,
 		};
 		return new Promise(async (resolve, reject) => {
-			const res = await request(changeCardApply, options);
-			var resultData = res.bizContent
-			console.log("data88888", JSON.parse(resultData))
-			resolve(JSON.parse(resultData));
+			const res = await requestNew(changeCardObuApply, options);
+			var resultData = res
+			console.log("data88888", resultData)
+			resolve(res);
 		}).catch((error) => {
 			reject(error);
 		});

subpackage/orders/order-details-new.vue

@@ -525,8 +525,7 @@
 	import { reactive } from "vue";
 	import { onLoad, onUnload, onShow } from "@dcloudio/uni-app";
 	import { request, requestNew } from "@/utils/network/request";
-	import { editOrderAddr,orderDetailQuery } from "@/utils/network/api";
-	import { stringToJson } from "@/utils/network/encryption";
+	import { updateShippingAddress,orderDetailQuery } from "@/utils/network/api";
 	import useOrderSkip from "@/composables/order/useOrderSkip";
 	import { getETCStatusName, getOBUStatusName, msg, getOrderTypeName, getCarTypeName, getOrderTime, isBlank, timesDiff } from "@/utils/utils";
 	import { OrderStatus } from "@/datas/enum";
@@ -608,7 +607,7 @@
 			showLoading: true,
 		}
 
-		request(editOrderAddr, options).then((res) => {
+		requestNew(updateShippingAddress, options).then((res) => {
 			state.orderInfo.orderInfoExt.id = addr.id,
 				state.orderInfo.orderInfoExt.consignee = addr.consignee;
 			state.orderInfo.orderInfoExt.consigneeTel = addr.consigneeTel;

utils/network/api.js

@@ -9,10 +9,12 @@ export const envs = {
 	//开发环境配置
 	development: {
 		baseUrl: "https://qtzl.etcjz.cn",
+		// baseUrl: "http://100.64.2.104:8087",
 	},
 	//生产环境配置
 	production: {
 		baseUrl: "https://qtzl.etcjz.cn",
+		// baseUrl: "http://100.64.2.104:8087",
 	},
 }
 
@@ -339,6 +341,8 @@ 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 updateShippingAddress= "/iaw/issue/order/updateShippingAddress"  //订单修改收货地址
+export const vehicleInfoQuery= "/iaw/app/issue/vehicleInfo/query"  //获取车辆信息
 // 通行流水记录查询
 export const cardinformationquery= "/iaw/app/issue/cardAnnounce/cardinformationquery"  //卡信息查询
 export const detaildownload= "/iaw/app/issue/cardAnnounce/detaildownload"  //明细下载
@@ -367,8 +371,9 @@ export const cardRenewalFromWechat = "/iaw/api/afterSale/renewal/cardRenewal/fro
 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" //写卡指令结果返回
-
+// 售后车辆列表查询，替代原先的36、500接口
 export const afterSaleCommQuery = "/iaw/api/afterSale/comm/query" //车辆列表查询，替代原先的36、500接口
+export const commGetDetail = "/iaw/api/afterSale/comm/getDetail" //售后详情展示页
 //权益
 export const equitypage = "/iaw/app/issue/quanyi/equitypage" //全部权益列表
 export const equitypurchase = "/iaw/app/issue/quanyi/equitypurchase" //全部权益列表购买
@@ -378,7 +383,6 @@ export const equitypurchasepage = "/iaw/app/issue/quanyi/equitypurchasepage" //
 //二次激活
 export const queryActiveInfo = "/iaw/api/secondActive/queryActiveInfo" //查询激活信息
 
-export const commGetDetail = "/iaw/api/afterSale/comm/getDetail" //售后详情展示页
 //ETC产品状态名单查询
 export const selectproductlist = "/iaw/app/issue/state/selectproductlist" //ETC产品状态名单查询
 export const stateDetail = "/iaw/app/issue/state/detail" //查询推广发行产品管理详情
@@ -389,6 +393,7 @@ export const deviceUpgradeApply = "/iaw/aftersale/deviceUpgrade/apply" //指令
 export const deviceUpgradeOrderConfirm = "/iaw/aftersale/deviceUpgrade/orderConfirm" //设备升级指令回传
 export const deviceUpgradeConfirm = "/iaw/aftersale/deviceUpgrade/confirm" //设备升级指令回传
 export const deviceUpgradeOrderCheck = "/iaw/aftersale/deviceUpgrade/orderCheck" //设备升级订单检查
+export const deviceUpgradePage = "/iaw/aftersale/deviceUpgrade/page" //设备升级订单分页查询
 //用户信息变更
 export const customerInfoChange = "/iaw/aftersale/customerInfoChange/query" //用户信息查询
 export const etcMobileChangeSmsCode = "/iaw/aftersale/customerInfoChange/etcMobileChangeSmsCode" //验证码发送(ETC预留手机号)
@@ -403,3 +408,11 @@ export const secondActiveInstallApply = "/iaw/api/secondActive/installApply" //
 export const writeActiveInfo = "/iaw/api/secondActive/writeActiveInfo" // VFJ-写激活信息(普通车)接口
 export const issueConfirm = "/iaw/api/secondActive/issueConfirm" // OBU发行确认接口
 export const reactivateQuery = "/api/obu/reactivate/query" // 重新激活记录
+// 设备更换（售后）
+export const changeCardObuApply = "/iaw/api/afterSale/changeCardObu/apply" // 卡签更换申请
+export const changeCardObuCancel = "/iaw/api/afterSale/changeCardObu/cancel" // 卡签更换申请取消
+export const changeCardObuFill = "/iaw/api/afterSale/changeCardObu/fill" // 卡签更换申请补充信息
+export const changeCardObuExchangeFill = "/iaw/api/afterSale/changeCardObu/exchangeFill" // 卡签更换换货申请补充信息
+// 卡签注销
+export const cancelValid = "/iaw/aftersale/cancel/valid" // 注销验证
+