调整下单流程

App.vue

@@ -125,5 +125,6 @@
 	// @import './uni_modules/vk-uview-ui/index.scss';
 	page {
 		font-family: "Microsoft Yahei";
+		// filter: grayscale(1)
 	}
 </style>

applyCard/car-release.vue

@@ -155,7 +155,7 @@
 	import {
 		reactive
 	} from "vue";
-	import navBgCar from "./components/nav-bg-car3";
+	import navBgCar from "./components/nav-bg-car4";
 	import navBar from "../components/nav-bar/nav-bar2.vue";
 	import {
 		pathToBase64
@@ -185,6 +185,9 @@
 	import {
 		getEtcCardStatus
 	} from "@/datas/etcCardStatus.js";
+	import {
+		getItem
+	} from "@/utils/storage";
 	const savaHandle = () => {
 
 		state.form.vehicleId =
@@ -204,7 +207,8 @@
 						state.show = true;
 					} else {
 						uni.navigateTo({
-							url: `/applyCard/choice-product?orderId=${state.form.orderId}`,
+							// url: `/applyCard/choice-product?orderId=${state.form.orderId}`,
+							url: `/applyCard/release-products?orderId=${state.form.orderId}&clientFee=${getItem('clientFee')}&&id=${getItem('productId')}`,
 						});
 					}
 				})

applyCard/choice-product.vue

@@ -43,7 +43,7 @@
 	import {
 		fileURL
 	} from "@/datas/fileURL.js";
-	import navBgCar from "./components/nav-bg-car4";
+	import navBgCar from "./components/nav-bg-car2";
 	import navBar from "../components/nav-bar/nav-bar2.vue";
 
 	import {
@@ -59,24 +59,42 @@
 	} from "@/utils/storage";
 	const savaHandle = (val) => {
 		productReCodeAction(val.id).then(value => {
+			
 			if (val.isValueCard === 2) {
 				setItem('clientFee', val.clientFee)
 				setItem("productId", val.id)
-				uni.navigateTo({
-					url: `/applyCard/release-products?orderId=${state.orderId}&&clientFee=${val.clientFee}&&id=${val.id}`,
-				});
+			}
+			
+			if (state.userType === "1") {
+			  uni.navigateTo({
+			    url: `/applyCard/opening-account-people?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
+			  });
 			} else {
-
-				uni.navigateTo({
-					url: `/applyCard/product-detail?orderId=${state.orderId}&&clientFee=${val.clientFee}&&id=${val.id}`,
-				});
+			  uni.navigateTo({
+			    url: `/applyCard/opening-account-unit?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
+			  });
 			}
+			
+			// if (val.isValueCard === 2) {
+			// 	setItem('clientFee', val.clientFee)
+			// 	setItem("productId", val.id)
+			// 	uni.navigateTo({
+			// 		url: `/applyCard/release-products?orderId=${state.orderId}&&clientFee=${val.clientFee}&&id=${val.id}`,
+			// 	});
+			// } else {
+
+			// 	uni.navigateTo({
+			// 		url: `/applyCard/product-detail?orderId=${state.orderId}&&clientFee=${val.clientFee}&&id=${val.id}`,
+			// 	});
+			// }
 		})
 
 	};
 
 	onLoad((option: any) => {
 		state.orderId = option.orderId;
+		state.userType = option.userType;
+		state.vehiclePlateColor = option.vehiclePlateColor;
 
 		var data = {
 			orderId: state.orderId,
@@ -116,6 +134,8 @@
 
 	const state = reactive({
 		orderId: "",
+		userType:"",
+		vehiclePlateColor:"",
 		data: {
 			show: false,
 			src: imgURL + "applyCard/edit.png",

applyCard/essential-information.vue

@@ -226,15 +226,19 @@ const nextAction = () => {
         orderGoAction();
       } else {
         const data = stringToJson(res.bizContent);
-        if (state.data.userType === "1") {
-          uni.navigateTo({
-            url: `/applyCard/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}`,
-          });
-        } else {
-          uni.navigateTo({
-            url: `/applyCard/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}`,
-          });
-        }
+		uni.navigateTo({
+			url: `/applyCard/choice-product?orderId=${data.orderId}&userType=${state.data.userType}&vehiclePlateColor=${state.data.vehiclePlateColor}`,
+		})
+		
+        // if (state.data.userType === "1") {
+        //   uni.navigateTo({
+        //     url: `/applyCard/opening-account-people?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}`,
+        //   });
+        // } else {
+        //   uni.navigateTo({
+        //     url: `/applyCard/opening-account-unit?orderId=${data.orderId}&&vehiclePlateColor=${state.data.vehiclePlateColor}`,
+        //   });
+        // }
       }
     });
   });
@@ -259,6 +263,7 @@ const orderGoAction = () => {
 };
 //订单状态舔砖
 const orderStepGoActon = (val: any) => {
+	console.log(val);
   //完成填写基本信息
   if (val.orderStep === 1) {
     if (state.data.userType === "1") {

applyCard/opening-account-people.vue

@@ -223,7 +223,7 @@
 </template>
 
 <script setup lang="ts">
-	import navBgCar from "./components/nav-bg-car2";
+	import navBgCar from "./components/nav-bg-car3";
 	import {
 		pathToBase64
 	} from "@/utils/image-tools/index.js";
@@ -324,7 +324,7 @@
 		request(etcUserCardInfoSubmit, options).then((res) => {
 			const data = stringToJson(res.bizContent);
 			uni.navigateTo({
-				url: `/applyCard/car-release?orderId=${state.orderId}&&vehiclePlateColor=${state.vehiclePlateColor}`,
+				url: `/applyCard/car-release?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
 			});
 		});
 	};
@@ -379,13 +379,15 @@
 			customerIdVld: "",
 			agentName: "",
 			agentGender: "",
+			agentTel: '',
+			agentPhone: "",
 			agentIdType: "101",
 			agentIdNum: "",
 			agentPosImgUrl: "",
 			agentNegImgUrl: "",
 			proxyUrl: "",
 			agentAddress: "",
-			agentIdVld: ''
+			agentIdVld: '',
 		};
 	};
 	onLoad((option: any) => {

applyCard/opening-account-unit.vue

@@ -98,7 +98,7 @@
 	import {
 		reactive
 	} from "vue";
-	import navBgCar from "./components/nav-bg-car2";
+	import navBgCar from "./components/nav-bg-car3";
 	import navBar from "../components/nav-bar/nav-bar2.vue";
 	import {
 		pathToBase64

applyCard/release-products.vue

@@ -76,7 +76,6 @@
 		state.clientFee = option.clientFee;
 		state.id = option.id;
 
-		state.data
 		var data = {};
 		const options = {
 			type: 2,

composables/order/useOrderSkip.ts

@@ -61,17 +61,18 @@ export default function useOrderSkip(){
 	//继续申请、修改资料
 	const gotoEditUserOrUnitInfo = (orderInfo:any) =>{
 		console.log("******************",orderInfo.orderStep);
+		console.log("********555555555555**********",orderInfo);
 		let url = '';
 		if(orderInfo.orderStep == OrderStatus.完成填写基本信息){
 			url = orderInfo.userType === 'PERSONAL_USER' ? '/applyCard/opening-account-people' : '/applyCard/opening-account-unit';
 		}else if(orderInfo.orderStep === OrderStatus["完成个人/单位信息上传"]){
 			url = '/applyCard/car-release';
 		}else if(orderInfo.orderStep === OrderStatus.完成车辆信息上传){
-			url = `/applyCard/choice-product`;
+			url = `/applyCard/release-products`;
 		}else{
 			url = `/applyCard/essential-information`;
 		}
-		navTo(`${url}?orderId=${orderInfo.orderId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}`);
+		navTo(`${url}?orderId=${orderInfo.orderId}&clientFee=${orderInfo.amount}&id=${orderInfo.productId}&vehiclePlateColor=${orderInfo.vehiclePlateColor}&fromOrder=true&type=${orderInfo.type}&userType=${orderInfo.userType === 'PERSONAL_USER' ? '1' : '2'}`);
 	}
 	
 	//确认收货

utils/network/encryption.js

@@ -17,7 +17,8 @@ function getDate() {
     pad2(date.getDate()) +
     pad2(date.getHours()) +
     pad2(date.getMinutes()) +
-    pad2(date.getSeconds())
+    pad2(date.getSeconds())+
+	pad2(date.getMilliseconds())
   );
 }
 
@@ -136,8 +137,7 @@ export function encryption(urlcode, subdata, type) {
   requestData["appId"] = "admin001";
   requestData["encryptType"] = "NONE";
   requestData["signType"] = "MD5";
-  requestData["reqId"] =
-    requestData["appId"] + "_" + getDate() + "_" + generateMixed(5);
+  requestData["reqId"] =requestData["appId"] + "_" + getDate() + "_" + generateMixed(5);
   requestData["timestamp"] = formatTime(new Date());
   //更据type判断是否转字符串
   if (type === 2) {