参数修改车辆信息上传

subpackage/orders/car-release.vue

@@ -130,6 +130,9 @@
 						<u-input inputAlign="right" placeholder="请输入总质量" v-model="state.form.totalMass"
 							:disabled="state.isEnableChangeOCRCarInfo" />
 					</u-form-item>
+					<u-form-item label="车轴数">
+						<u-input inputAlign="right" placeholder="请输入车轴数" v-model="state.form.axleCount" />
+					</u-form-item>
 					<view class="form-item">
 						<label>车辆用户类型</label>
 						<view class="select" @click="state.actionSheetShow = true">{{state.form.useUserTypeName}}</view>
@@ -240,12 +243,23 @@
 			msg("请上次车头照");
 			return;
 		}
+		if (state.form.type == 1) {
+			state.form.axleCount = 2;
+		} else {
+			if (!state.form.axleCount) {
+				msg("请输入车轴数");
+				return;
+			}
+		}
 		state.form.vehicleId =
 			state.form.vehicleIdNum + "_" + state.vehiclePlateColor;
 		state.form.opId = getItem(StorageKeys.OpenId);
 		state.form.approvedCount = parseFloat(state.form.approvedCount);
 		state.form.maintenaceMass = parseFloat(state.form.maintenaceMass);
 		state.form.totalMass = parseFloat(state.form.totalMass);
+		state.form.permittedWeight = parseFloat(state.form.permittedWeight);
+		state.form.permittedTowWeight = parseFloat(state.form.permittedTowWeight);
+
 		const options = {
 			type: 2,
 			data: state.form,
@@ -283,7 +297,7 @@
 								// 	url: `/subpackage/orders/interestsList?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`// url: `/subpackage/orders/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
 								// });
 								uni.redirectTo({
-									url: `/subpackage/orders/product-detail?orderId=${state.orderId}&&clientFee=${state.clientFee}&&id=${state.id}&&data=${items}&&isValueCard=${getItem("isValueCard")}`,
+									url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}`,
 								});
 								// #endif
 
@@ -293,8 +307,11 @@
 							// uni.redirectTo({
 							//   url: `/subpackage/orders/sign-up?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`,
 							// });
+							// uni.redirectTo({
+							// 	url: `/subpackage/orders/interestsList?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`
+							// });
 							uni.redirectTo({
-								url: `/subpackage/orders/interestsList?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}`
+								url: `/subpackage/orders/product-detail?orderId=${state.form.orderId}&&clientFee=${getItem("clientFee")}&&id=${getItem("productId")}&&isValueCard=${getItem("isValueCard")}`,
 							});
 							// uni.redirectTo({
 							//    url: `/subpackage/orders/release-products?orderId=${state.form.orderId}&clientFee=${getItem('clientFee')}&&id=${getItem('productId')}`,
@@ -489,6 +506,8 @@
 								state.form.issueDate = data.issue;
 								state.form.vehPosImgUrl = data.imageUrl;
 								state.form.vehicleModel = data.model;
+								state.form.permittedWeight = data.alc ? data.alc : 0;
+								state.form.permittedTowWeight = data.towing ? data.towing : 0;
 							} else {
 								// state.form.approvedCount = parseFloat(data.apc);
 								// state.form.maintenaceMass = parseFloat(data.unladen);

subpackage/orders/choice-product.vue

@@ -81,7 +81,7 @@
 		// 	url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isSign=${state.isSign}&isValueCard=${state.isValueCard}`,
 		// });
 		uni.redirectTo({
-			url: `/subpackage/orders/interestsList?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}`,
+			url: `/subpackage/orders/interestsList?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&fee=${Number(state.fee)}`,
 		});
 	}
 	const savaHandle = (val) => {
@@ -118,7 +118,7 @@
 			// 	url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}`,
 			// });
 			uni.redirectTo({
-				url: `/subpackage/orders/interestsList?promoteId=${val['promoteId']}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}`,
+				url: `/subpackage/orders/interestsList?promoteId=${val['promoteId']}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&fee=${Number(val.fee)}`,
 			});
 		} else {
 			state.radiolist1 = [];
@@ -130,6 +130,7 @@
 				state.radiolist1.push(obj)
 			}
 			state.choiceCardShow = true;
+			state.fee = val.fee;
 			console.log("state.radiolist1", state.radiolist1)
 		}
 	};
@@ -231,6 +232,7 @@
 				tip: "绑定微信支付，无需绑定银行卡",
 			},
 		],
+		fee: 0  //产品金额
 	});
 </script>
 

subpackage/orders/essential-information.vue

@@ -155,6 +155,8 @@
 		isValueCard: '',
 		checked: false,
 		agreeURL: "",
+		orderId: "",
+		totalAmount: ""
 	});
 	const globalParam = () => {
 		const options = {
@@ -304,6 +306,7 @@
 					orderGoAction();
 				} else {
 					const data = stringToJson(res.bizContent);
+					state.orderId = data.orderId
 					console.log(data);
 					//提交产品信息
 					productReCodeAction(data.orderId).then((result) => {
@@ -394,6 +397,7 @@
 		state.data.promoteId = option.promoteId;
 		state.isValueCard = option.isValueCard
 		state.data.cardType = option.isValueCard
+		state.totalAmount = option.totalAmount;
 		console.log("订单选择推广发行产品接口", option)
 		getInfo();
 		uni.getLocation({
@@ -499,7 +503,7 @@
 				orderId: state.orderId, //订单编号	
 				openId: getItem(StorageKeys.OpenId), //操作人 id
 				equityId: state.data.promoteId, //权益Id
-				totalAmount: allMoney * 100, //总金额
+				totalAmount: state.totalAmount, //总金额
 				isRepeatPurchase: 0
 			},
 			method: "POST",

subpackage/orders/interestsList.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="item" v-for="(item,index) in state.list" :key='index'>
-			<view class="title">
+			<view class="title" @click="addInterestsList(item)">
 				<view>
 					<view v-if='item.children' style="display: inline-block;">
 						<image :class="item.isShow?'imageChange':'imageDefault'" @click="changeIsShow(index)"
@@ -9,20 +9,20 @@
 					</view>
 					<text><text>{{item.productName}}</text>&nbsp;&nbsp;<text>¥{{item.discountPrice * 0.01}}</text></text>
 				</view>
-				<checkbox-group @change='getValue(index)'>
+				<!-- <checkbox-group @change='getValue(index)'>
 					<label>
 						<checkbox :value="index" />
 					</label>
-				</checkbox-group>
+				</checkbox-group> -->
 			</view>
 			<view v-if="item.isShow" class="children" v-for="(itemChild,index) in item.children" :key='index'>
 				<view><text>{{itemChild.productName}}</text>&nbsp;&nbsp;<text>{{itemChild.discountPrice * 0.01}}</text>
 				</view>
 			</view>
 		</view>
-		<button type="default" class="button" @click="addInterestsList()">
+		<!-- <button type="default" class="button" @click="addInterestsList()">
 			加购权益
-		</button>
+		</button> -->
 	</view>
 </template>
 
@@ -67,6 +67,7 @@
 		type: 0,
 		userType: 0,
 		promoteId: "",  //产品id
+		totalAmount: 0,  //产品+权益产品金额
 	})
 
 	onLoad((option : any) => {
@@ -80,14 +81,16 @@
 		state.type = option.type;
 		state.isValueCard = option.isValueCard;
 		state.promoteId = option.promoteId;
+		state.totalAmount = option.fee;
 		getList();
 		getOpenID();
 
 		console.log("option", option)
 	})
-	const addInterestsList = () => {
+	const addInterestsList = (item) => {
+		state.totalAmount = Number(state.totalAmount) + Number(item.discountPrice)
 		uni.redirectTo({
-			url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}`,
+			url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}&totalAmount=${state.totalAmount}`,
 		});
 		return;
 		state.choiceValueComplete = [];
@@ -140,9 +143,7 @@
 					url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isValueCard=${state.isValueCard}`,
 				});
 			});
-
 		});
-
 	}
 
 

subpackage/orders/order_payment.vue

@@ -283,9 +283,10 @@
 			//     PRESTORE("预存金",3){},
 			//     EQUITY("权益费",4){},
 			for (let i = 0; i < state.dataArray.length; i++) {
-				if (state.dataArray[i].payType === 'HANDLE') {
-					state.dataArray[i].payName = '办理费'
-				} else if (state.dataArray[i].payType === 'MARGIN') {
+				// if (state.dataArray[i].payType === 'HANDLE') {
+				// 	state.dataArray[i].payName = '办理费'
+				// } else
+				if (state.dataArray[i].payType === 'MARGIN') {
 					state.dataArray[i].payName = '保证金'
 				} else if (state.dataArray[i].payType === 'PRESTORE') {
 					state.dataArray[i].payName = '预存金'
@@ -382,9 +383,10 @@
 			//     PRESTORE("预存金",3){},
 			//     EQUITY("权益费",4){},
 			for (let i = 0; i < state.dataArray.length; i++) {
-				if (state.dataArray[i].payType === 'HANDLE') {
-					state.dataArray[i].payName = '办理费'
-				} else if (state.dataArray[i].payType === 'MARGIN') {
+				// if (state.dataArray[i].payType === 'HANDLE') {
+				// 	state.dataArray[i].payName = '办理费'
+				// } else 
+				if (state.dataArray[i].payType === 'MARGIN') {
 					state.dataArray[i].payName = '保证金'
 				} else if (state.dataArray[i].payType === 'PRESTORE') {
 					state.dataArray[i].payName = '预存金'

subpackage/orders/product-detail.vue

@@ -496,9 +496,10 @@
 			//     PRESTORE("预存金",3){},
 			//     EQUITY("权益费",4){},
 			for (let i = 0; i < state.dataArray.length; i++) {
-				if (state.dataArray[i].payType === 'HANDLE') {
-					state.dataArray[i].payName = '办理费'
-				} else if (state.dataArray[i].payType === 'MARGIN') {
+				// if (state.dataArray[i].payType === 'HANDLE') {
+				// 	state.dataArray[i].payName = '办理费'
+				// } else
+				if (state.dataArray[i].payType === 'MARGIN') {
 					state.dataArray[i].payName = '保证金'
 				} else if (state.dataArray[i].payType === 'PRESTORE') {
 					state.dataArray[i].payName = '预存金'