修改下单流程等

applyCard/car-release.vue

@@ -170,7 +170,7 @@
 	import {
 		reactive,ref,
 	} from "vue";
-	import navBgCar from "./components/nav-bg-car4";
+	import navBgCar from "./components/nav-bg-car3";
 	import navBar from "../components/nav-bar/nav-bar2.vue";
 	import carNumberInput from "@/components/car-number-input/car-number-input.vue";
 	import {

applyCard/choice-product.vue

@@ -62,22 +62,28 @@
 	const scrollTop =ref(0);//滚动距离
 	
 	const savaHandle = (val) => {
-		productReCodeAction(val.id).then(value => {
-			
-			if (val.isValueCard === 2) {
-				setItem('clientFee', val.clientFee)
-				setItem("productId", val.id)
-			}
-			
-			if (state.userType === "1") {
-			  uni.redirectTo({
-			    url: `/applyCard/opening-account-people?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
-			  });
-			} else {
-			  uni.redirectTo({
-			    url: `/applyCard/opening-account-unit?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
+		// productReCodeAction(val.id).then(value => {
+			//isValueCard: 1为记账卡 (需要签约) || 2储值卡
+			// if (val.isValueCard === 1) {
+			// 	setItem('clientFee', val.clientFee)
+			// 	setItem("productId", val.id)
+			// }
+			setItem('clientFee', val.clientFee)
+			setItem("productId", val.id)
+			setItem("isValueCard", val.isValueCard)
+			uni.redirectTo({
+			    url: `/applyCard/essential-information?userType=${state.userType}&type=${state.type}`,
 			  });
-			}
+			
+			// if (state.userType === 1) {
+			//   uni.redirectTo({
+			//     url: `/applyCard/opening-account-people?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
+			//   });
+			// } else {
+			//   uni.redirectTo({
+			//     url: `/applyCard/opening-account-unit?orderId=${state.orderId}&vehiclePlateColor=${state.vehiclePlateColor}`,
+			//   });
+			// }
 			
 			// if (val.isValueCard === 2) {
 			// 	setItem('clientFee', val.clientFee)
@@ -91,7 +97,7 @@
 			// 		url: `/applyCard/product-detail?orderId=${state.orderId}&&clientFee=${val.clientFee}&&id=${val.id}`,
 			// 	});
 			// }
-		})
+		// })
 
 	};
 

applyCard/essential-information.vue

@@ -218,19 +218,19 @@
 					// uni.navigateTo({
 					// 	url: `/applyCard/choice-product?orderId=${data.orderId}&userType=${state.data.userType}&vehiclePlateColor=${state.data.vehiclePlateColor}`,
 					// })
-					uni.redirectTo({
-						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}`,
-					//   });
-					// }
+					// uni.redirectTo({
+					// 	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}`,
+					  });
+					}
 				}
 			});
 		});

applyCard/release-products.vue

@@ -55,7 +55,7 @@
 		fileURL
 	} from "@/datas/fileURL.js";
 	import navBar from "../components/nav-bar/nav-bar2.vue";
-	import navBgCar from "./components/nav-bg-car5";
+	import navBgCar from "./components/nav-bg-car4";
 	const imgURL = `${fileURL}image/`;
 
 	const savaHandle = () => {

applyCard/sign-up.vue

@@ -45,7 +45,7 @@
 	import navBar from "../components/nav-bar/nav-bar2.vue";
 	import navBgCar from "./components/nav-bg-car4";
 	import {
-		setItem
+		setItem,getItem
 	} from "@/utils/storage";
 	import {
 		msg
@@ -105,6 +105,7 @@
 			var data = {
 				orderId: state.orderId,
 				subOpenId: state.openid,
+				openId: getItem('openId'),
 			};
 			const options = {
 				type: 2,

issueActivation/components/layout-numberplate-color.vue

@@ -1,7 +1,7 @@
 <!-- 车牌颜色选择组件 -->
 <template>
 	<view class="numberplates">
-		<view class="numberplate" v-for="(item,index) in state.numberplateColorList" @click="checkNumberplateColor(item)">
+		<view class="numberplate" v-for="(item,index) in state.numberplateColorList" @click="checkNumberplateColor(item)" :key="index">
 			<image :src="`${$imgUrl}issueActivation/${item.src}.png`" class="numberplate-bg"></image>
 			<view class="numberplate-name" :style="`color:${item.color}`">{{numberplate}}</view>
 			<image :src="`${$imgUrl}issueActivation/${item.checkSrc}.png`" class="numberplate-icon-check"

issueActivation/old-user.vue

@@ -4,17 +4,24 @@
 		<carNumerInput @numberInputResult="numberInputResult">
 		</carNumerInput>
 	</view>
-	<view class="plate-color" @click="chooseColor">
+	<!-- <view class="plate-color" @click="chooseColor">
 		<view class="tit">车牌颜色</view>
 		<view class="value">{{state.vehiclePlateColorStr}}</view>
 		<view class="icon">
 			<image :src="`${$imgUrl}common/arror-right.png`"></image>
 		</view>
+	</view> -->
+	<!-- 车牌颜色 -->
+	<view class="plate-color">
+		<view class="title">选择车牌颜色</view>
+		<numberplateColor :numberplate="state.numberplate?state.numberplate:state.vehiclePlateNumber" :numberplateCor="{ id: 0 }"
+			@numberplateResult="checkNumberplateColor">
+		</numberplateColor>
 	</view>
 	<view class="btn">
 		<submit-button title="确定" @submit="submit"></submit-button>
 	</view>
-<!-- <image src="http://222.85.144.89:19002/default-bucket/image/applyCard/brank/gongshang-bg.png"></image> -->
+	<!-- <image src="http://222.85.144.89:19002/default-bucket/image/applyCard/brank/gongshang-bg.png"></image> -->
 	<u-popup v-model="state.showPopup" mode="bottom">
 		<view v-if="state.showPopup">
 			<popup-numberplate-color :numberplateCor="state.curNumberplateColor" :numberplate="state.numberplate"
@@ -46,9 +53,10 @@
 		stringToJson
 	} from "@/utils/network/encryption";
 	import popupNumberplateColor from "./components/popup-choose-numberplate-color";
+	import numberplateColor from "./components/layout-numberplate-color";
 	import carNumerInput from "@/components/car-number-input/car-number-input";
 	const tools = require("../static/etcUtil/tools.js");
-
+	
 	onLoad((option) => {
 		console.log(option);
 	})
@@ -63,18 +71,25 @@
 		vehiclePlateColor: 0,
 		vehiclePlateColorStr: "请选择车牌颜色",
 		numberplate: "",
+		vehiclePlateNumber: "贵A12345",
 
 	})
+	
+	/* 选择车牌颜色 */
+	const checkNumberplateColor = (item : any) => {
+		state.vehiclePlateColor = item.id;
+		// state.vehiclePlateColorStr = colorItem.title;
+	};
 
 	//车牌颜色选择回调结果
-	const numberplateResult = (colorItem: any) => {
+	const numberplateResult = (colorItem : any) => {
 		console.log(colorItem);
 		state.vehiclePlateColor = colorItem.id;
 		state.vehiclePlateColorStr = colorItem.title;
 		state.showPopup = false;
 	}
 
-	const numberInputResult = (e:string) => {
+	const numberInputResult = (e : string) => {
 		state.numberplate = e;
 	}
 
@@ -100,7 +115,7 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(gongWuChefindFormatVehicleInfo, options).then((res: any) => {
+		request(gongWuChefindFormatVehicleInfo, options).then((res : any) => {
 
 
 			const result = stringToJson(res.bizContent)
@@ -112,7 +127,7 @@
 		})
 	}
 
-	const getGongWuCheDanWeiJinDu = (vehicleType: number, vehiclePlateColor: number, vehiclePlate: string, deptName:
+	const getGongWuCheDanWeiJinDu = (vehicleType : number, vehiclePlateColor : number, vehiclePlate : string, deptName :
 		string) => {
 
 		const options = {
@@ -124,7 +139,7 @@
 			method: "POST",
 			showLoading: true,
 		};
-		request(gongWuCheDanWeiJinDu, options).then((res: any) => {
+		request(gongWuCheDanWeiJinDu, options).then((res : any) => {
 
 
 			const result = stringToJson(res.bizContent)
@@ -132,7 +147,7 @@
 
 			if (result) {
 				//成功调到查询界面
-				tools.showModalAlert("历史用户信息检测成功，请您前往特制卡申请进行单位查询", function(res) {
+				tools.showModalAlert("历史用户信息检测成功，请您前往特制卡申请进行单位查询", function (res) {
 					if (res.confirm) { //确定
 						// tools.toUrl(route.scompnayQuery + '?deptShortName=' + deptShortName)
 						navTo("/issueActivation/query-company-list?deptShortName=" + deptName)
@@ -141,7 +156,7 @@
 				});
 
 			} else {
-				tools.showModalAlert("未检测到历史用户信息，是否前往特制卡申请进行新增单位", function(res) {
+				tools.showModalAlert("未检测到历史用户信息，是否前往特制卡申请进行新增单位", function (res) {
 					if (res.confirm) { //确定
 						// tools.toUrl(route.scompnayQuery)
 						navTo("/issueActivation/query-company-list")
@@ -154,7 +169,7 @@
 	}
 
 	//车牌号验证方法	 
-	function isVehicleNumber(vehicleNumber: string) {
+	function isVehicleNumber(vehicleNumber : string) {
 
 		var xreg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/;
 
@@ -192,10 +207,11 @@
 
 	.plate-color {
 		display: flex;
-		align-items: center;
+		// align-items: center;
+		flex-direction: column;
 		margin: 30rpx 30rpx 60rpx 30rpx;
 		padding: 20rpx 0;
-		border-bottom: 1px solid #ddd;
+		// border-bottom: 1px solid #ddd;
 	}
 
 	.plate-color .tit {
@@ -222,4 +238,4 @@
 	.btn {
 		padding: 0 30rpx;
 	}
-</style>
+</style>

pages/index/index.vue

@@ -9,7 +9,7 @@
 				<block v-if="state.swiperList.length >0" v-for="item in state.swiperList"
 						:key="item.id" >
 					<swiper-item class="swiper-item" @click="gotoLink(item)" >
-						<image :src="item.imgUrl?item.imgUrl:fileURL + 'image/index/banner-1.png'" mode="widthFix"></image>
+						<image :src="item.imgUrl?strReplace(item.imgUrl):fileURL + 'image/index/banner-1.png'" mode="widthFix"></image>
 					</swiper-item>
 				</block>
 				<block v-else><swiper-item class="swiper-item">
@@ -230,6 +230,7 @@
 	import {
 		queryKey,
 		querySwiper,
+		envs,
 	} from "@/utils/network/api.js";
 	import {
 		reactive
@@ -493,6 +494,11 @@
 				console.log(err);
 			});
 	}
+	
+	//替换图片地址
+	const strReplace = (str : string) => {
+		return str.replace('192.168.100.63:8087', envs[process.env.NODE_ENV].baseUrl)
+	}
 </script>
 
 <style>