Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-sp

subpackage/personal-center/etc-activation.vue

 			</view>
 
 			<!-- 上传照片 -->
-			<view class="upload-section">
+			<view class="upload-section" v-if="formData.activeType == '2'">
 				<view class="section-title">上传照片</view>
 				<view class="picture-wrapper" @click="cardFileImageUpdate(100)">
 					<view class="bg">
 import {
 	getCodeName, getDicWithType
 } from "@/datas/queryKey.js";
-import { msg, strReplace, imgPathMontage, hasLogin, uploadFile, compressImage, chooseImageCompress } from "@/utils/utils";
+import { msg, strReplace, imgPathMontage, hasLogin, uploadFile, compressImage, chooseImageCompress, navTo } from "@/utils/utils";
 import uploadImg from '@/components/uploadOcr';
 import useOrderSkip from "@/composables/order/useOrderSkip";
 //办理订单按钮跳转业务逻辑
 	deviceImageUrl: '',
 	deviceImageName: '',
 	smsCode: '',
-	activeType: ''
+	activeType: '',
+	orderId: '',
+	orderNo: '',
 })
 
 const reset = () => {
 			let vehicle = res.modelList[0];
 			formData.phoneNumber = vehicle.mobile;
 			formData.activeType = vehicle.activeType;
+			formData.orderId = vehicle.orderId;
+			formData.orderNo = vehicle.orderNo;
 		}
 	})
 }
     const colorItem = getDicWithType('VEHICLE_COLOR_TYPE').find(item => item.code == formData.colorCode);
 	formData.colorName = colorItem.name;
 	formData.phoneNumber = vehicle.mobile
+	formData.orderId = vehicle.orderId;
+	formData.orderNo = vehicle.orderNo;
 };
 
 const bindColorPickerChange = (e) => {
 		return
 	}
 	
-	if (!formData.colorCode) {
+	if (formData.colorCode == undefined || formData.colorCode == null) {
 		uni.showToast({
 			title: '请选择车牌颜色',
 			icon: 'none'
 		return
 	}
 	
-	if (!formData.vehPosImgUrl) {
-		uni.showToast({
-			title: '请上传行驶证正面照',
-			icon: 'none'
-		})
-		return
-	}
-	
-	if (!formData.vehNegImgUrl) {
-		uni.showToast({
-			title: '请上传行驶证反面照',
-			icon: 'none'
-		})
-		return
-	}
-	
-	if (!formData.vehBodyUrl) {
-		uni.showToast({
-			title: '请上传车辆45度照',
-			icon: 'none'
-		})
-		return
-	}
-	
-	if (!formData.deviceImageUrl) {
-		uni.showToast({
-			title: '请上传ETC设备安装照',
-			icon: 'none'
-		})
-		return
+	if(formData.activeType == '2') {
+		if (!formData.vehPosImgUrl) {
+			uni.showToast({
+				title: '请上传行驶证正面照',
+				icon: 'none'
+			})
+			return
+		}
+		
+		if (!formData.vehNegImgUrl) {
+			uni.showToast({
+				title: '请上传行驶证反面照',
+				icon: 'none'
+			})
+			return
+		}
+		
+		if (!formData.vehBodyUrl) {
+			uni.showToast({
+				title: '请上传车辆45度照',
+				icon: 'none'
+			})
+			return
+		}
+		
+		if (!formData.deviceImageUrl) {
+			uni.showToast({
+				title: '请上传ETC设备安装照',
+				icon: 'none'
+			})
+			return
+		}
 	}
 	
 	
 }
 
 const next = () => {
-	if(formData.activeType == 1) {
-		gotoActiveOrder();
+	console.log(formData);
+	if(formData.activeType == '1') {
+		navTo(`/subpackage/after-sale/activation/operation-tips?id=${formData.orderId}&orderId=${formData.orderNo}&cardStatus=${undefined}&obuStatus=${undefined}&transfer=${formData.activeType}`);
 	} else {
 		
 	}