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

App.vue

@@ -1,6 +1,6 @@
 <script>
 	import {
-		request
+		request,requestNew
 	} from "@/utils/network/request.js";
 	import {
 		etcQYAction,
@@ -9,7 +9,7 @@
 		wechatAppID,
 		wechatSecret,
 		getOpenidApi,
-		getZfbOpenid
+		getZfbOpenid,getOpenId
 	} from "@/utils/network/api.js";
 	import {
 		msg
@@ -46,6 +46,7 @@
 			uni.login({
 				provider: "weixin",
 				success: function(e) {
+					console.log("jsCode",e.code)
 					that.getOpenid(e.code);
 
 				},
@@ -152,8 +153,8 @@
 					method: "POST",
 				};
 				// #ifdef MP-WEIXIN
-				request(getOpenidApi, options).then((res) => {
-					const result = stringToJson(res.bizContent);
+				requestNew(getOpenId, options).then((res) => {
+					const result =res;
 					console.log("getOpenidApi", result)
 					const openidData = stringToJson(result.data);
 					setItem("QYorder", openidData);

pages/index/index.vue

@@ -392,14 +392,6 @@
 		commonQuestionArr: [], //常见问题数组
 		isEnableSetGray: false
 	});
-
-
-	// 页面初次渲染完成时触发
-	onReady(() => {
-		setTimeout(() => {
-			quanKeyAction()
-		}, 5000)
-	})
 	// 页面初次渲染完成时触发
 	onReady(() => {
 		setTimeout(() => {
@@ -574,11 +566,6 @@
 				console.log(err);
 			});
 	}
-	onReady(() => {
-		setTimeout(() => {
-			quanKeyAction()
-		}, 5000)
-	})
 	//获取轮播
 	const getSwiper = () => {
 		let options = {

pages/order/components/order-list-item-new.vue

@@ -24,10 +24,10 @@
 					<text class="type">新办单号：</text>
 					<text class="value">{{item.orderId}}</text>
 				</view>
-				<view class="order-text odd">
+				<!-- <view class="order-text odd">
 					<text class="type">业务类型：</text>
 					<text class="value">{{getOrderTypeName(item.orderType)}}</text>
-				</view>
+				</view> -->
 				<view class="order-text">
 					<text class="type">订单车牌号：</text>
 					<text class="value">{{item.vehiclePlate}}</text>

subpackage/after-sale/account-change/product-detail.vue

@@ -24,17 +24,8 @@
 <script setup lang="ts">
 	import { onLoad, onShow } from "@dcloudio/uni-app";
 	import { reactive } from "vue";
-	import { getOpenidApi } from "@/utils/network/api.js";
-	import { request } from "@/utils/network/request.js";
 
-	import { stringToJson } from "@/utils/network/encryption";
 	import { fileURL } from "@/datas/fileURL.js";
-	import { getItem, StorageKeys } from "@/utils/storage.ts";
-	import {
-		checkOrderStatus,
-		wechatAppID,
-		wechatSecret,
-	} from "@/utils/network/api";
 	const imgURL = `${fileURL}image/`;
 
 	const savaHandle = () => {
@@ -45,36 +36,9 @@
 		orderId: "",
 	});
 	onLoad((option : any) => {
-		getOpenID();
 		state.orderId = option.orderId;
 	});
-	//获取微信小程序openid
-	const getOpenID = () => {
-		uni.login({
-			provider: "weixin",
-			success: function (e) {
-				getOpenid(e.code);
-			},
-		});
-	};
-	const getOpenid = (code) => {
-		const options = {
-			type: 2,
-			data: {
-				"jsCode": code
-			},
-			method: "POST",
-			showLoading: true,
-		};
-		// #ifdef MP-WEIXIN
-		request(getOpenidApi, options).then((res) => {
-			const result = stringToJson(res.bizContent);
-			console.log("获取微信小程序openid", result);
-			const openidData = stringToJson(result.data);
-			state.openid = openidData.openid
-		});
-		// #endif
-	}
+	
 </script>
 
 <style lang="scss" scoped>

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

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

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

@@ -14,15 +14,16 @@
 <script setup lang="ts">
 	import { reactive } from "vue";
 	import { onLoad } from "@dcloudio/uni-app";
-	import { blackApi } from "@/utils/network/api.js";
-	import { request } from "@/utils/network/request.js";
+	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";
 	const state = reactive({
 		vehiclePlate: "",
 		vehiclePlateColor: "",
 		tableData: [],
-		blackStatus: []
+		blackStatus: [],
+		cardId:""
 	});
 	onLoad((option : any) => {
 		console.log("option", option)
@@ -36,6 +37,7 @@
 		console.log("black", state.blackStatus)
 		state.vehiclePlate = option.vehiclePlate;
 		state.vehiclePlateColor = option.vehiclePlateColor;
+		state.cardId = option.cardId;
 		list()
 	})
 	const list = () => {
@@ -43,13 +45,14 @@
 			type: 2,
 			data: {
 				"vehiclePlate": state.vehiclePlate,
-				"vehiclePlateColor": state.vehiclePlateColor
+				"vehiclePlateColor": state.vehiclePlateColor,
+				'cardId':state.cardId
 			},
 			method: 'POST',
 			showLoading: true,
 		}
-		request(blackApi, options).then((res) => {
-			const data = stringToJson(res.bizContent);
+		requestNew(cardBlackQuery, options).then((res) => {
+			const data = res;
 			const getData = data.blackCards;
 			const newData = []
 			// 只要在黑的  和 1 2 3不展示

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

@@ -35,14 +35,10 @@
 
 <script setup lang="ts">
 	import { reactive } from "vue";
-	import {
-		businessType
-	} from "@/subpackage/after-sale/js/businessType.js"
-	import empty from "@/components/empty/empty.vue";
 	import { onLoad, onReachBottom } from "@dcloudio/uni-app";
-	import { monthStatementApi, getUserMsg } from "@/utils/network/api.js";
+	import { monthStatementApi, getUserMsg,monthlyStatementQuery } 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, StorageKeys } from "@/utils/storage";
 	import { getVehiclePlateColor } from "@/datas/vehiclePlateColor";
 	import { msg, navTo } from "@/utils/utils";
@@ -99,7 +95,7 @@
 			showLoading: true,
 		};
 
-		request(monthStatementApi, options).then((res) => {
+		requestNew(monthlyStatementQuery, options).then((res) => {
 			const data = stringToJson(res.bizContent);
 			state.listData = stringToJson(res.bizContent).data
 			console.log("业务完成日志", state.listData,)
@@ -143,32 +139,6 @@
 		margin-top: 150rpx;
 	}
 
-	/* /deep/.uni-table-th,
-	/deep/.uni-table-td {
-		padding: 0 !important;
-		font-size: 12px !important;
-	}
-
-	/deep/.uni-date__x-input,
-	/deep/.uni-select {
-		font-size: 13px;
-		height: 30px;
-		line-height: 30px;
-	}
-
-	/deep/.uni-stat__select {
-		width: 360rpx;
-	}
-
-	/deep/.uni-select__selector-empty,
-	/deep/.uni-select__selector-item {
-		font-size: 13px !important;
-	}
-
-	/deep/.uni-date {
-		width: 73% !important;
-	} */
-
 	.example-body {
 		display: flex;
 		align-items: center;

subpackage/after-sale/progress-query/progress-query-business.vue

@@ -41,9 +41,9 @@
 		businessType
 	} from "@/subpackage/after-sale/js/businessType.js"
 	import { onLoad, onReachBottom } from "@dcloudio/uni-app";
-	import { auditQueryApi } from "@/utils/network/api.js";
+	import { auditQueryApi,generalAuditQuery } 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, StorageKeys } from "@/utils/storage";
 	import { vehiclePlateColor, getVehiclePlateColorPai } from "@/datas/vehiclePlateColor";
 	const state = reactive({
@@ -136,9 +136,10 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(auditQueryApi, options).then((res) => {
-			const data = stringToJson(res.bizContent);
-			var getData = [...stringToJson(res.bizContent).data, ...state.listData]
+		requestNew(generalAuditQuery, options).then((res) => {
+			const data = res;
+			console.log("data====",data)
+			var getData = [...data.result, ...state.listData]
 			for (var i = 0; i < getData.length; i++) {
 				getData[i]['vehiclePlateColorC'] = getVehiclePlateColorPai(getData[i]['vehiclePlateColor'])
 				if (getData[i]['status'] == 'AUDIT') {
@@ -156,7 +157,7 @@
 				}
 			}
 			state.listData = getData
-			state.total = data.data.length
+			state.total = data.result.length
 			if (state.listData.length > 0) {
 				state.noData = false
 			} else {

subpackage/after-sale/replace-equipment/product-detail.vue

@@ -15,7 +15,7 @@
 		</view>
 	</view>
 	<view class="action">
-		<button type="default" class="button" @click="savaHandle()">
+		<button type="default" class="button">
 			开通服务
 		</button>
 	</view>
@@ -24,10 +24,6 @@
 <script setup lang="ts">
 	import { onLoad, onShow } from "@dcloudio/uni-app";
 	import { reactive } from "vue";
-	import { getOpenidApi } from "@/utils/network/api.js";
-	import { request } from "@/utils/network/request.js";
-
-	import { stringToJson } from "@/utils/network/encryption";
 	import { fileURL } from "@/datas/fileURL.js";
 	const imgURL = `${fileURL}image/`;
 
@@ -36,36 +32,9 @@
 		orderId: "",
 	});
 	onLoad((option : any) => {
-		getOpenID();
 		state.orderId = option.orderId;
 	});
-	//获取微信小程序openid
-	const getOpenID = () => {
-		uni.login({
-			provider: "weixin",
-			success: function (e) {
-				getOpenid(e.code)
-			},
-		});
-	};
-	const getOpenid = (code) => {
-		const options = {
-			type: 2,
-			data: {
-				"jsCode": code
-			},
-			method: "POST",
-			showLoading: true,
-		};
-		// #ifdef MP-WEIXIN
-		request(getOpenidApi, options).then((res) => {
-			const result = stringToJson(res.bizContent);
-			console.log("获取微信小程序openid", result);
-			const openidData = stringToJson(result.data);
-			state.openid = openidData.openid
-		});
-		// #endif
-	}
+	
 </script>
 
 <style lang="scss" scoped>

subpackage/after-sale/to-bookkeeping-card/product-detail.vue

@@ -24,21 +24,7 @@
 <script setup lang="ts">
 	import { onLoad, onShow } from "@dcloudio/uni-app";
 	import { reactive } from "vue";
-	import { getOpenidApi } from "@/utils/network/api.js";
-	import { request } from "@/utils/network/request.js";
-
-	import { stringToJson } from "@/utils/network/encryption";
 	import { fileURL } from "@/datas/fileURL.js";
-	import navBar from "../../components/nav-bar/nav-bar2.vue";
-	import navBgCar from "./components/nav-bg-car4";
-	import { getItem, StorageKeys } from "@/utils/storage.ts";
-	import { msg } from "@/utils/utils";
-	import {
-		checkOrderStatus,
-		wechatAppID,
-		wechatPayConfigId,
-		wechatSecret,
-	} from "@/utils/network/api";
 	const imgURL = `${fileURL}image/`;
 
 	const savaHandle = () => {
@@ -49,36 +35,8 @@
 		orderId: "",
 	});
 	onLoad((option : any) => {
-		getOpenID();
 		state.orderId = option.orderId;
 	});
-	//获取微信小程序openid
-	const getOpenID = () => {
-		uni.login({
-			provider: "weixin",
-			success: function (e) {
-				getOpenid(e.code)
-			},
-		});
-	};
-	const getOpenid = (code) => {
-		const options = {
-			type: 2,
-			data: {
-				"jsCode": code
-			},
-			method: "POST",
-			showLoading: true,
-		};
-		// #ifdef MP-WEIXIN
-		request(getOpenidApi, options).then((res) => {
-			const result = stringToJson(res.bizContent);
-			console.log("获取微信小程序openid", result);
-			const openidData = stringToJson(result.data);
-			state.openid = openidData.openid
-		});
-		// #endif
-	}
 </script>
 
 <style lang="scss" scoped>

subpackage/orders/car-release.vue

@@ -50,7 +50,7 @@
 			</view>
 		</view>
 		<view class="uni-list tractor">
-			<radio-group @change="radioChange" v-if="state.form.vanType=='2'">
+			<radio-group @change="radioChange" v-if="state.form.vanType==2">
 				<text class="title">是否是牵引车</text>
 				<label style="margin-right: 60rpx;" class="uni-list-cell uni-list-cell-pd "
 					v-for="(item, index) in state.items" :key="item.value">
@@ -59,7 +59,7 @@
 			</radio-group>
 		</view>
 		<!-- 货车 牵引车 需要传道路运输许可证-->
-		<view class="picture-wrapper" v-if="state.form.vanType=='2' && state.form.tractorSign==1"
+		<view class="picture-wrapper" v-if="state.form.vanType==2 && state.form.tractorSign==1"
 			@click="cardFileImageUpdate(2)">
 			<view class="bg">
 				<view class="">
@@ -237,12 +237,11 @@
 	import carNumberInput from "@/components/car-number-input/car-number-input.vue";
 	import {
 		etcCarCardInfoSubmit,
-		etcCarOcrCard,
 		queryGuoHuJianCe,
 		queryGuoHuCaoZuo,
 		ocrAllQuery,
 		carMessageApi,
-		vehicleUpload
+		vehicleUpload,vehicleLicenseOcr
 	} from "@/utils/network/api.js";
 	import { request, requestNew } from "@/utils/network/request.js";
 
@@ -365,42 +364,44 @@
 		};
 		requestNew(vehicleUpload, options)
 			.then((res) => {
-				const data = stringToJson(res.bizContent);
-				queryGuoHuJianCeAction().then((value) => {
-					console.log("过户检测", value)
-					if (value.transferLogs && value.transferLogs.length > 0) {
-						let arr = value.transferLogs;
-						state.data.transferLogs = []
-						for (var k = 0; k < arr.length; k++) {
-							if (arr[k]['status'] == "WAITING") {
-								state.data.transferLogs.push(arr[k])
-							}
-						}
-						console.log("state.data.transferLogs", state.data.transferLogs)
-						console.log("state.data.transferLogs", state.data.transferLogs.length)
-						setTimeout(() => {
-							if (state.data.transferLogs.length > 0) {
-								state.show = true;
-							} else {
-								uni.redirectTo({
-									url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
-								});
-							}
-						}, 1000)
-					} else {
-						if (!hasLogin()) {
-							uni.redirectTo({
-								url: `/subpackage/orders/addAddress?orderId=${state.form.orderId
-									}&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
-							});
-						} else {
-							uni.redirectTo({
-								url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
-							});
-
-						}
-					}
+				uni.redirectTo({
+					url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
 				});
+				// queryGuoHuJianCeAction().then((value) => {  //接口不调用了
+				// 	console.log("过户检测", value)
+				// 	if (value.transferLogs && value.transferLogs.length > 0) {
+				// 		let arr = value.transferLogs;
+				// 		state.data.transferLogs = []
+				// 		for (var k = 0; k < arr.length; k++) {
+				// 			if (arr[k]['status'] == "WAITING") {
+				// 				state.data.transferLogs.push(arr[k])
+				// 			}
+				// 		}
+				// 		console.log("state.data.transferLogs", state.data.transferLogs)
+				// 		console.log("state.data.transferLogs", state.data.transferLogs.length)
+				// 		setTimeout(() => {
+				// 			if (state.data.transferLogs.length > 0) {
+				// 				state.show = true;
+				// 			} else {
+				// 				uni.redirectTo({
+				// 					url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
+				// 				});
+				// 			}
+				// 		}, 1000)
+				// 	} else {
+				// 		if (!hasLogin()) {
+				// 			uni.redirectTo({
+				// 				url: `/subpackage/orders/addAddress?orderId=${state.form.orderId
+				// 					}&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
+				// 			});
+				// 		} else {
+				// 			uni.redirectTo({
+				// 				url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}&vehicleId=${state.form.vehicleId}`,
+				// 			});
+
+				// 		}
+				// 	}
+				// });
 			})
 			.catch((res) => {
 				console.log(res);
@@ -483,7 +484,7 @@
 			issueDate: "请输入发证日期", //发证日期
 			vehPosImgUrl: "", //行驶证正面
 			vehNegImgUrl: "", //行驶证证反面
-			vanType: "0", //1，客车 2.货车
+			vanType: 1, //1，客车 2.货车
 			useUserType: 0, //车辆用户类型
 			useUserTypeName: "普通车",
 			vehicleSign: 2, //前/后装标识
@@ -539,7 +540,7 @@
 	});
 	onLoad((option : any) => {
 		state.form.orderId = option.orderId;
-		state.form.vanType = option.vanType;
+		state.form.vanType = Number(option.vanType);
 		state.vehiclePlateColor = option.vehiclePlateColor;
 		if (option.vehicleId) {
 			state.form.vehicleId = option.vehicleId;
@@ -762,7 +763,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)
 			if (state.choiceIndex === "3") {

subpackage/orders/components/order-info-item.vue

@@ -48,7 +48,7 @@
 	.label {
 		font-size: 26rpx;
 		color: #999999;
-		min-width: 112rpx;
+		min-width: 130rpx;
 	}
 
 	.value {

subpackage/orders/essential-information-two.vue

@@ -95,10 +95,9 @@
 	import { onLoad, onShow, onPageScroll, onUnload } from "@dcloudio/uni-app";
 	import {
 		addressQuery,
-		searchOrder,
 		productReCode,
 		addProduct,
-		orderAdd
+		orderAdd,orderDetailQuery
 	} from "@/utils/network/api.js";
 	import { request,requestNew } from "@/utils/network/request.js";
 	import { reactive, ref } from "vue";
@@ -211,8 +210,8 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(searchOrder, options).then((res) => {
-			const data = stringToJson(res.bizContent);
+		requestNew(orderDetailQuery, options).then((res) => {
+			const data =res;
 			console.log(data);
 			orderStepGoActon(data);
 		});

subpackage/orders/essential-information.vue

@@ -74,7 +74,6 @@
 	import { onLoad, onShow, onPageScroll, onUnload } from "@dcloudio/uni-app";
 	import {
 		addressQuery,
-		searchOrder,
 		isSubmitOrderApi,
 		plateCheck,
 		etcVehiclePlateVer
@@ -199,58 +198,6 @@
 			}
 		})
 	}
-	//按照订单阶段去跳转
-	const orderGoAction = () => {
-		var orderParmas = {
-			vehicleId: state.data.vehiclePlate + "_" + state.data.vehiclePlateColor,
-			opId: getItem(StorageKeys.OpenId),
-			source: "WECHAT",
-		};
-		const options = {
-			type: 2,
-			data: orderParmas,
-			method: "POST",
-			showLoading: true,
-		};
-		request(searchOrder, options).then((res) => {
-			const data = stringToJson(res.bizContent);
-			console.log(data);
-			orderStepGoActon(data);
-		});
-	};
-	//订单状态舔砖
-	const orderStepGoActon = (val : any) => {
-		console.log("订单状态舔砖", val);
-		//完成填写基本信息
-		if (val.orderStep === 1) {
-			if (state.data.userType === 1 || val.orderStep === 27) {
-				uni.redirectTo({
-					url: `/subpackage/orders/opening-account-people?orderId=${val.orderId}&&vehiclePlateColor=${val.vehiclePlateColor}`,
-				});
-			} else {
-				uni.redirectTo({
-					url: `/subpackage/orders/opening-account-unit?orderId=${val.orderId}&&vehiclePlateColor=${val.vehiclePlateColor}`,
-				});
-			}
-		} else if (val.orderStep === 2) {
-			uni.redirectTo({
-				url: `/subpackage/orders/car-release?orderId=${val.orderId}&&vehiclePlateColor=${val.vehiclePlateColor}`,
-			});
-		} else if (val.orderStep === 3) {
-			uni.redirectTo({
-				url: `/subpackage/orders/choice-product?orderId=${val.orderId}`,
-			});
-		} else if (val.orderStep === 4) {
-			uni.redirectTo({
-				url: `/subpackage/orders/product-detail?orderId=${val.orderId}&&clientFee=${val.product.clientFee}&&id=${val.productId}`,
-			});
-		} else if (val.orderStep === 26) {
-			uni.redirectTo({
-				url: `/subpackage/orders/product-detail?orderId=${val.orderId}&&clientFee=${val.product.clientFee}&&id=${val.productId}`,
-			});
-		}
-	};
-
 	onLoad((option : any) => {
 		state.data.vanType = option.vanType; //1客车  2货车
 		state.data.opId = getItem(StorageKeys.OpenId);

subpackage/orders/opening-account-people.vue

@@ -243,11 +243,9 @@
 		onPageScroll,
 	} from "@dcloudio/uni-app";
 	import {
-		etcOcrCard,
-		register,
 		getUserMsg,
 		ocrAllQuery,
-		userUpload
+		userUpload,idCardOcr,registerFull
 	} from "@/utils/network/api.js";
 
 	import {
@@ -321,7 +319,8 @@
 		isEnableBook: true,  //他人办理时是否上传委托书
 		isEnableInfo: true,  //小程序信息带出
 		isEnableOCRData: true,  //允许修改OCR识别出来的数据
-		vehicleId: ""
+		vehicleId: "",
+		jsCode:""
 	});
 	const userGenderAction = () => {
 		state.genderShow = true;
@@ -450,6 +449,14 @@
 		state.vehicleId = option.vehicleId;
 		getGlobalParam(); //全局配置数据
 		console.log("option", option)
+		uni.login({
+			provider: "weixin",
+			success: function(e) {
+				console.log("jsCode",e.code)
+				state.jsCode=e.code
+		
+			},
+		});
 	});
 
 	//监听页面滚动
@@ -563,7 +570,7 @@
 		state.isTakePhotoModeShow = false
 		var imageType = state.choiceIndex;
 		// uploadFile(val.tempImagePath, imageType, ocrAllQuery).then((data) => {
-		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") {
@@ -640,7 +647,9 @@
 			department: "",
 			userIdImgUrl: state.form.userPosImgUrl,
 			userIdImgBase64: "",
+			jsCode:state.jsCode
 		}
+		
 		const options = {
 			type: 2,
 			data: data,
@@ -648,7 +657,7 @@
 			showLoading: true,
 		};
 		return new Promise(async (resolve, reject) => {
-			const res = await request(register, options);
+			const res = await requestNew(registerFull, options);
 			const data = stringToJson(res.bizContent);
 			resolve(data);
 		}).catch((error) => {

subpackage/orders/opening-account-unit.vue

@@ -126,15 +126,12 @@
 	import viewfinder from "../../components/viewfinder.vue"
 	import {
 		ocrAllQuery,
-		fileUpload,
-		envs,
-		etcOcrCard,
 		etcCompanyCardInfoSubmit,
-		register,
+		idCardOcr,registerFull
 	} from "@/utils/network/api.js";
 
 	import {
-		request
+		request, requestNew
 	} from "@/utils/network/request.js";
 
 	import {
@@ -197,7 +194,8 @@
 		vehiclePlateColor: '',
 		isSign: '',
 		type: 1,
-		vehicleId: ""
+		vehicleId: "",
+		jsCode:""
 	});
 
 	const savaHandle = () => {
@@ -279,6 +277,14 @@
 		state.type = option.type;
 		state.vehicleId = option.vehicleId;
 		console.log("state.type", option)
+		uni.login({
+			provider: "weixin",
+			success: function(e) {
+				console.log("jsCode",e.code)
+				state.jsCode=e.code
+		
+			},
+		});
 	});
 
 	//监听页面滚动
@@ -374,7 +380,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.choiceIndex === "1") {
 				state.form.agentName = data.name;
@@ -435,7 +441,8 @@
 			agentName: state.form.agentName,
 			department: state.form.department,
 			userIdImgUrl: state.form.posImgUrl,
-			userIdImgBase64: ""
+			userIdImgBase64: "",
+			jsCode:state.jsCode
 		}
 		const options = {
 			type: 2,
@@ -444,7 +451,7 @@
 			showLoading: true,
 		};
 		return new Promise(async (resolve, reject) => {
-			const res = await request(register, options);
+			const res = await requestNew(registerFull, options);
 			const data = stringToJson(res.bizContent);
 			resolve(data);
 		}).catch((error) => {

subpackage/orders/order-confirm-receipt.vue

@@ -25,11 +25,10 @@
 	import orderInfoItem from "./components/order-info-item";
 	import { reactive } from "vue";
 	import { onLoad } from "@dcloudio/uni-app";
-	import { request, requestNew } from "@/utils/network/request.js";
-	import { msg, confirm, getOrderStatusName } from "@/utils/utils";
-	import { orderDetail, receiveOrder,orderReceiveGoods } from "@/utils/network/api";
+	import {requestNew } from "@/utils/network/request.js";
+	import {confirm, getOrderStatusName } from "@/utils/utils";
+	import {orderReceiveGoods,orderDetailQuery } from "@/utils/network/api";
 	import { getItem, StorageKeys } from "@/utils/storage";
-	import { stringToJson } from "@/utils/network/encryption";
 
 	const state = reactive({
 		//订单信息
@@ -65,7 +64,7 @@
 			type: 2,
 			data: {
 				opId: getItem(StorageKeys.OpenId),
-				orderId:state.orderInfo.orderId
+				orderId:state.orderInfo.orderNo
 			},
 			method: "POST",
 			showLoading: true,
@@ -99,10 +98,11 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(orderDetail, options).then((res) => {
-			state.orderInfo = stringToJson(res.bizContent);
+		requestNew(orderDetailQuery, options).then((res) => {
+			console.log("获取订单详情",res)
+			state.orderInfo =res.data;
 
-			state.list[0].value = state.orderInfo.orderId;
+			state.list[0].value = state.orderInfo.orderNo;
 			state.list[1].value = state.orderInfo.vehiclePlate;
 			state.list[2].value = getOrderStatusName(state.orderInfo.orderStep);
 			state.list[3].value = state.orderInfo.cardId ? state.orderInfo.cardId : "";
@@ -144,7 +144,7 @@
 		}
 
 		.order-box {
-			padding: 0px 30rpx 10rpx;
+			padding: 0px 24rpx 10rpx;
 
 			.order-item {
 				padding: 28rpx 0px 0px;

subpackage/orders/order-details-new.vue

@@ -524,8 +524,8 @@
 	import popupActiveOrder from "@/pages/order/components/popup-active-order.vue";
 	import { reactive } from "vue";
 	import { onLoad, onUnload, onShow } from "@dcloudio/uni-app";
-	import { request } from "@/utils/network/request";
-	import { editOrderAddr, orderDetail } from "@/utils/network/api";
+	import { request, requestNew } from "@/utils/network/request";
+	import { editOrderAddr,orderDetailQuery } from "@/utils/network/api";
 	import { stringToJson } from "@/utils/network/encryption";
 	import useOrderSkip from "@/composables/order/useOrderSkip";
 	import { getETCStatusName, getOBUStatusName, msg, getOrderTypeName, getCarTypeName, getOrderTime, isBlank, timesDiff } from "@/utils/utils";
@@ -560,8 +560,9 @@
 			method: 'POST',
 			showLoading: true,
 		}
-		request(orderDetail, options).then((res) => {
-			state.orderInfo = stringToJson(res.bizContent);
+		requestNew(orderDetailQuery, options).then((res) => {
+			state.orderInfo = res.data;
+			console.log("state.orderInfo",state.orderInfo)
 			// 订单发货后未激活  30天 以后 结束订单功能  insertTime   >30  算出来距离今天是负数  updateTime<30(结束订单)
 			for (var i in state.orderInfo) {
 				if (state.orderInfo['insertTime']) {

subpackage/orders/order-evaluate-product.vue

@@ -56,13 +56,12 @@
 <script setup lang="ts">
 	import evaluateStar from "./components/evaluate-star.vue"
 	import { reactive } from "vue";
-	import { confirm, isBlank, msg } from "@/utils/utils";
+	import { confirm, msg } from "@/utils/utils";
 	import tagPopup from "./components/popup-order-evaluate-tag";
 	import { request } from "@/utils/network/request";
-	import { orderDetail, orderEvaluate, orderEvaluateTag, saleMessage, addEvaluation, judageQuanProduct } from "@/utils/network/api";
+	import { orderDetail,orderEvaluateTag, addEvaluation} from "@/utils/network/api";
 	import { onLoad } from "@dcloudio/uni-app";
 	import { stringToJson } from "@/utils/network/encryption";
-	import { getItem, StorageKeys } from "@/utils/storage";
 
 	const state = reactive({
 		orderInfo: {} as any, //订单信息

subpackage/orders/order_payment.vue

@@ -61,7 +61,7 @@
 	const savaHandle = (val) => {
 		console.log("val", val)
 		if (state.isclick) {
-			etcVehiclePlateVerRequest().then(() => {
+			// etcVehiclePlateVerRequest().then(() => {
 				if (val.payStatus == "SUCCESS") {
 					return;
 				}
@@ -142,14 +142,14 @@
 									type: 2,
 									data: {
 										orderId: state.orderId,
-										wxOpenid: openidData.openid,
+										wxOpenId: openidData.openid,
 										payType: val.payType
 									},
 									method: "POST",
 									showLoading: true,
 								};
 								requestNew(payApply, options).then((res) => {
-									const data = stringToJson(res.bizContent);
+									const data =res;
 									console.log("data======111", data)
 									if (data) {
 										console.log("进来了")
@@ -183,36 +183,9 @@
 
 					// #endif
 				}
-			})
+			// })
 		}
-
 	};
-	const getOpenID = () => {
-		uni.login({
-			provider: "weixin",
-			success: function (e) {
-				getOpenid(e.code);
-			},
-		});
-	};
-	const getOpenid = (code) => {
-		const options = {
-			type: 2,
-			data: {
-				"jsCode": code
-			},
-			method: "POST",
-			showLoading: true,
-		};
-		// #ifdef MP-WEIXIN
-		request(getOpenidApi, options).then((res) => {
-			const result = stringToJson(res.bizContent);
-			console.log("获取微信小程序openid", result);
-			const openidData = stringToJson(result.data);
-			state.openid = openidData.openid;
-		});
-		// #endif
-	}
 	const refresh = () => {
 		state.isclick = true
 		let source = ""
@@ -224,7 +197,6 @@
 		// #endif
 		var data = {
 			orderId: state.orderId,
-			source: source   //请求方来源
 		};
 		const options = {
 			type: 2,
@@ -234,7 +206,8 @@
 		};
 		console.log("输出内容", options);
 		requestNew(payQuery, options).then((res) => {
-			const data = stringToJson(res.bizContent);
+			console.log("res====",res)
+			const data = res;
 			console.log(data);
 			if (data.paymentStatus == 'ALLSUCCESS') {
 				gotoEditUserOrUnitInfo()
@@ -300,7 +273,6 @@
 		// #endif
 		var data = {
 			orderId: state.orderId,
-			source: source //请求方来源
 		};
 		const options = {
 			type: 2,
@@ -310,7 +282,7 @@
 		};
 		console.log("输出内容", options);
 		requestNew(payQuery, options).then((res) => {
-			const data = stringToJson(res.bizContent);
+			const data = res;
 			console.log(data);
 			if (data.paymentStatus == 'ALLSUCCESS') {
 				// isValueCard  1 储值卡   2 记账卡

subpackage/orders/payment.vue

@@ -242,12 +242,6 @@
 			provider: "weixin",
 			success: function (e) {
 				getOpenid(e.code);
-				// uni.request({
-				//   url: `https://api.weixin.qq.com/sns/jscode2session?appid=${wechatAppID}&secret=${wechatSecret}&js_code=${e.code}&grant_type=authorization_code`,
-				//   success: (res: any) => {
-				//     state.openid = res.data.openid;
-				//   },
-				// });
 			},
 		});
 	};

subpackage/orders/product-detail.vue

@@ -47,10 +47,7 @@
 	} from "vue";
 	import {
 		getOpenidApi,
-		getAgreementApi,
-		PAYDETECTION,
-		envs,
-		agreementConfirmApi,payQuery
+		envs,payQuery,agreementInSertOrder,agreeOrderProdcut
 	} from "@/utils/network/api.js";
 	import {
 		request,requestNew
@@ -170,8 +167,8 @@ console.log("fileType",fileType)
 			showLoading: true,
 		};
 		return new Promise(async (resolve, reject) => {
-			const res = await request(agreementConfirmApi, options);
-			const data = stringToJson(res.bizContent);
+			const res = await requestNew(agreeOrderProdcut, options);
+			const data = res;
 			console.log("确认协议", data)
 			
 			resolve(data);
@@ -236,8 +233,8 @@ console.log("fileType",fileType)
 			method: "POST",
 			showLoading: true,
 		};
-		request(getAgreementApi, options).then((res) => {
-			let data = stringToJson(res.bizContent);
+		requestNew(agreementInSertOrder, options).then((res) => {
+			let data = res;
 			let supAgreeArr=data.data
 			console.log("data==",supAgreeArr)
 			for(var m=0;m<supAgreeArr.length;m++){
@@ -266,8 +263,7 @@ console.log("fileType",fileType)
 		// getOpenID();
 		// #endif
 		var data = {
-			orderId: state.orderId,
-			source: source   //请求方来源
+			orderId: state.orderId
 		};
 		const options = {
 			type: 2,
@@ -277,13 +273,13 @@ console.log("fileType",fileType)
 		};
 		console.log("输出内容", options);
 		requestNew(payQuery, options).then((res) => {
-			// console.log(res.bizContent);
-			const data = stringToJson(res.bizContent);
+			const data = res
 			console.log(data);
 			// console.log(typeof(data));
-			// if (data.paymentStatus == 'ALLSUCCESS') {
-			// 	gotoEditUserOrUnitInfo()
-			// }
+			if (data.paymentStatus == 'ALLSUCCESS') {
+				state.allMoney=data.sumFee*0.01
+				return;
+			}
 			state.dataArray = data.datas;
 			// HANDLE("办理费",1){},
 			//     MARGIN("保证金",2){},

subpackage/orders/sign-up.vue

@@ -43,7 +43,7 @@
 	import {
 		getOpenidApi,
 		infoQuery,
-		envs, etcQYAction, channelSingQueryApi,userSign
+		envs, channelSingQueryApi,userSign,getOpenId
 	} from "@/utils/network/api";
 	const imgURL = `${fileURL}image/`;
 
@@ -145,12 +145,12 @@
 			showLoading: true,
 		};
 		// #ifdef MP-WEIXIN
-		request(getOpenidApi, options).then((res) => {
-			const result = stringToJson(res.bizContent);
+		requestNew(getOpenId, options).then((res) => {
+			const result = res;
 			const openidData = stringToJson(result.data);
 			state.openid = openidData.openid;
 			console.log("获取微信小程序openid", state.openid);
-			setItem("QYorder", state);
+			setItem("QYorder", openidData);
 		});
 		// #endif
 	}

utils/network/api.js

@@ -240,7 +240,6 @@ export const PAYMENTORDERAPPLY = "377421d6ed4f48a29575aa126838a4d2" //CSMSN-订
 export const businessApi = "b275644e586b447791eede4ad6a41640" //业务完成日志
 export const inventoryEquipmentApi = "5570160d4b8d46408664b6c289de6b57" //库存设备统计
 export const getOpenidApi = "53c0698b512a44539ea05cc88157e68b" //获取微信小程序openid
-// export const getAgreementApi = "32a9d99a781a4bf2af29a46d903702bd" //根据订单编号获取渠道产品的补充协议
 export const getAgreementApi = "a8b7a57c7e7546848c1c0cc4c3dfe19a" //根据订单编号获取渠道产品的补充协议(新)
 export const mobileIsRepeatApi = "19d58812148d41bbb7d435ab93928787" //个人账号重复注册校验
 export const transferRecordApi = "323bc6e1f3304c83921155fc220e9e37" //过户记录查询
@@ -323,4 +322,14 @@ export const payQuery= "/iaw/issue/order/payQuery"  //支付查询
 export const userSign= "/iaw/app/issue/userSign/query"  //签约检测
 export const orderCancel= "/iaw/issue/order/orderCancel"  //订单取消
 export const queryPage= "/iaw/issue/order/queryPage"  //订单分页查询
-export const orderReceiveGoods= "/iaw/issue/order/orderReceiveGoods"  //订单收货
+export const orderReceiveGoods= "/iaw/issue/order/orderReceiveGoods"  //订单收货
+export const orderDetailQuery= "/iaw/issue/order/orderDetailQuery"  //订单详情查询
+export const getOpenId= "/iaw/issue/userBasic/getOpenId"  //获取微信小程序openid
+export const agreementInSertOrder= "/iaw/issue/order/agreementInSertOrder"  //订单查询协议
+export const agreeOrderProdcut= "/iaw/issue/order/agreeOrderProduct"  //订单确认协议
+export const idCardOcr= "/iaw/ocr/idCardOcr"  //身份证OCR识别
+export const vehicleLicenseOcr= "/iaw/ocr/vehicleLicenseOcr"  //车辆行驶证OCR识别
+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"  //无感注册登录接口

utils/network/request.js

@@ -362,17 +362,35 @@ export function requestNew(code, options = {}, start = false) {
 			if (res.statusCode == 200 && res.data.code == 0) {
 				resolve(res.data.data)
 			} else {
-				uni.showModal({
-					title: '提示',
-					content: res.data.message,
-					success: function(res) {
-						if (res.confirm) {
-							console.log('用户点击确定2');
-						} else if (res.cancel) {
-							console.log('用户点击取消2');
+				// 未知错误：登录凭证失效!
+				if(res.data.code == 403003 && res.data.message=='未知错误：登录凭证失效!'){
+					uni.showModal({
+						title: '提示',
+						content: res.data.message,
+						confirmText: '去登录',
+						showCancel: false,
+						success: function(res) {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: `/login/login`,
+								})
+							}
 						}
-					}
-				});
+					});
+				}else{
+					uni.showModal({
+						title: '提示',
+						content: res.data.message,
+						success: function(res) {
+							if (res.confirm) {
+								console.log('用户点击确定2');
+							} else if (res.cancel) {
+								console.log('用户点击取消2');
+							}
+						}
+					});
+				}
+				
 				reject(res.data.message)
 				return
 			}

utils/utils.ts

@@ -6,7 +6,7 @@ import {
 } from "@/utils/network/encryption";
 import { agentId } from "@/utils/network/difference";
 import {
-	request
+	request,requestNew
 } from "@/utils/network/request.js";
 export const msg = (title : string = "", param : any = {}) => {
 	if (!title) return;
@@ -440,7 +440,7 @@ export const uploadFile = (tempImagePath, imageType, code) => {
 			success: (uploadFileRes) => {
 				let uploadFileImage = 'http://100.64.2.113:9000' + '/default-bucket/' + JSON.parse(uploadFileRes.data).data.ossFilePath
 				console.log("111", JSON.parse(uploadFileRes.data).data.ossFilePath,JSON.parse(uploadFileRes.data));
-				if (code == 15) { //身份证 imageType 1 2
+				if (code == "/iaw/ocr/idCardOcr") { //身份证 imageType 1 2
 					var data = {
 						source: "1",
 						agencyId: agentId,
@@ -448,7 +448,7 @@ export const uploadFile = (tempImagePath, imageType, code) => {
 						fileName: tempImagePath,
 						url: uploadFileImage
 					};
-				} else if (code == 16) {  //行驶证  imageType 1正 2反
+				} else if (code == "/iaw/ocr/vehicleLicenseOcr") {  //行驶证  imageType 1正 2反
 					var data = {
 						source: "1",
 						agencyId: agentId,
@@ -477,7 +477,7 @@ export const uploadFile = (tempImagePath, imageType, code) => {
 					method: "POST",
 					showLoading: true,
 				};
-				request(code, options).then((res) => {
+				requestNew(code, options).then((res) => {
 					const data = stringToJson(res.bizContent);
 					console.log('输出内容=====123', data)
 					resolve(data)