修改bug

components/viewfinder.vue

@@ -1,16 +1,17 @@
 <template>
 	<view style="width: 100%;height: 100vh;position: fixed;left: 0;top:0;z-index: 111111;">
-		<view ref="targetView" class="container viewfinder">
+		<view class="viewfinder">
 			<view v-if="phoneType == 1"
-				style="display: flex;align-items: center;justify-content: flex-end;width: 100%;height: 100%;">
-				<image :src="fileURL + 'image/index/etc_bd_ocr_id_card_locator_front.png'"
-					style="height: 220rpx;margin-right: 30rpx;" mode="heightFix"></image>
-			</view>
-			<view v-if="phoneType == 2" style="margin: 30rpx 0 0 30rpx;">
-				<image :src="fileURL + 'image/index/etc_bd_ocr_id_card_locator_back.png'" style="height: 160rpx;"
-					mode="heightFix">
-				</image>
-			</view>
+							style="display: flex;align-items: center;justify-content: flex-end;width: 100%;height: 100%;">
+							<image :src="fileURL + 'image/index/etc_bd_ocr_id_card_locator_front.png'"
+								style="height: 220rpx;margin-right: 30rpx;" mode="heightFix"></image>
+						</view>
+						<view v-if="phoneType == 2" style="margin: 30rpx 0 0 30rpx;">
+							<image :src="fileURL + 'image/index/etc_bd_ocr_id_card_locator_back.png'" style="height: 160rpx;"
+								mode="heightFix">
+							</image>
+						</view>
+
 			<view v-if="phoneType == 3"
 				style="margin: -30rpx 0 0 30rpx;display: flex;height: 100%;align-self: flex-end;flex-direction: column;justify-content: flex-end;">
 				<view style="border: 1px solid #fff;height: 160rpx;width: 160rpx;">
@@ -23,45 +24,46 @@
 
 				</view>
 			</view>
-			<canvas canvas-id="canvasbg" id="canvasbg" style="width: 100%;height: 100%;"></canvas>
+
 		</view>
 		<!-- camera -->
-		<camera v-if="startPhoto" id="camera" style="height: 70vh;width: 100vh;background-color: black;width: 100%;"
+		<camera v-if="showStartPhoto" id="camera" style="height: 70vh;width: 100vh;background-color: black;width: 100%;"
 			mode="normal" :device-position="cameraPosition" :flash="flash" @stop="cameraStop" @error="cameraError" />
 
-		<view v-if="!startPhoto" style="height: 70vh;background-color: black;">
-			<canvas canvas-id="canvasId" id="canvasId" style="height: 100vh;width: 100vh;"
+		<view v-if="!showStartPhoto" style="height: 70vh;background-color: black;">
+			<image style="position: absolute;top: 20%;left: 10%;touch-action: none;" :src="srcImg"
 				@touchstart="handleTouchStart" @touchmove="handleTouchMove" @touchend="handleTouchEnd"
-				:style="{ transform: `translate(${offsetX}px, ${offsetY}px) rotate(${rotateDegree}deg) scale(${scale})`, transition: 'transform ' + transitionDuration + 's' }"></canvas>
+				:style="{ transform: `translate(${offsetX}px, ${offsetY}px) rotate(${rotateDegree}deg) scale(${scale})`, transition: 'transform ' + transitionDuration + 's' }">
+			</image>
 		</view>
 
 		<view style="background-color: #A5A5A5;top: 60%;width: 100%;height: 40%;position: absolute;">
-			<view style="display: flex;flex-direction: row;justify-content: center;align-items: center;height: 100%;">
-				<view style="flex: 1;"></view>
-				<image @click="camera" :src="fileURL + 'image/index/etc_bd_ocr_cancel.png'"
-					style="width: 50rpx;height: 50rpx;"></image>
-				<view style="flex: 1;"></view>
-				<image @click="takePhoto" :src="fileURL + 'image/index/etc_bd_ocr_take_photo_normal.png'"
-					:style="startPhoto ? 'width: 140rpx;height: 140rpx;' : 'width: 80rpx;height: 80rpx;'"></image>
-				<view style="flex: 1;"></view>
-				<image v-if="false" @click="success" :src="fileURL + 'image/index/etc_bd_ocr_confirm.png'"
-					style="width: 50rpx;height: 50rpx;"></image>
-				<view style="flex: 1;"></view>
-			</view>
-		</view>
+					<view style="display: flex;flex-direction: row;justify-content: center;align-items: center;height: 100%;">
+						<view style="flex: 1;"></view>
+						<image @click="camera" :src="fileURL + 'image/index/etc_bd_ocr_cancel.png'"
+							style="width: 50rpx;height: 50rpx;"></image>
+						<view style="flex: 1;"></view>
+						<image @click="takePhoto" :src="fileURL + 'image/index/etc_bd_ocr_take_photo_normal.png'"
+							:style="startPhoto ? 'width: 140rpx;height: 140rpx;' : 'width: 80rpx;height: 80rpx;'"></image>
+						<view style="flex: 1;"></view>
+						<image v-if="false" @click="success" :src="fileURL + 'image/index/etc_bd_ocr_confirm.png'"
+							style="width: 50rpx;height: 50rpx;"></image>
+						<view style="flex: 1;"></view>
+					</view>
+				</view>
+
 	</view>
 </template>
 
 <script setup lang="ts">
 	import {
-		ref,
-		getCurrentInstance,
-		onMounted,
-		nextTick
-	} from 'vue'
+			fileURL
+		} from "@/datas/fileURL.js";
+
 	import {
-		fileURL
-	} from "@/datas/fileURL.js";
+		ref
+	} from 'vue'
+
 	let prop = defineProps({
 		phoneType: {
 			type: Number,
@@ -98,22 +100,11 @@
 	let touchMoveDistance = ref(0)
 	let scale = ref(1)
 	let transitionDuration = ref(0)
-	let startPhoto = ref(prop.showStartPhoto)
 	const startX = ref(0);
 	const startY = ref(0);
 	const offsetX = ref(0);
 	const offsetY = ref(0);
 	const dragging = ref(false);
-	const canvasId = 'canvasId';
-	const targetView = ref();
-	const currentInstance = ref();
-
-	onMounted(() => {
-		currentInstance.value = getCurrentInstance()
-		if (!prop.showStartPhoto) {
-			emit('confirmReturn', { tempImagePath: prop.images })
-		}
-	})
 
 	const handleTouchStart = (event : TouchEvent) => {
 		console.log('手柄触摸启动', '==1')
@@ -168,18 +159,19 @@
 			cameraContext = uni.createCameraContext();
 			// #endif
 			// #ifdef MP-ALIPAY
-			cameraContext = uni.createCameraContext('camera');
+			cameraContext = my.createCameraContext('camera');
 			// #endif
 			// 调用拍照方法
 			cameraContext.takePhoto({
 				quality: 'normal',
-				success: (res : any) => {
+				success: (res) => {
 					// 在这里处理拍照成功后的逻辑，res.tempImagePath 为拍照的图片路径
-					// srcImg.value = res.tempImagePath
-					startPhoto.value = false
-					cameraContext.stopRecord();
-					getViewPosition(res.tempImagePath)
 					console.log('拍照成功:', res.tempImagePath);
+					srcImg.value = res.tempImagePath
+					// showStartPhoto.value = false
+					cameraContext.stopRecord();
+					emit('confirmReturn', res)
+					console.log("1111")
 				},
 				fail: (error) => {
 					console.error('拍照失败:', error);
@@ -193,82 +185,12 @@
 
 	}
 
-	const getViewPosition = (src : any) => {
-		const context = uni.createCanvasContext(canvasId, currentInstance.value)
-		const query = uni.createSelectorQuery().in(currentInstance.value)
-		// query.in(this)
-		query.select('.container').boundingClientRect((rect : any) => {
-			if (rect) {
-				uni.getSystemInfo({
-					success: (res) => {
-						console.log(res, '===============', res.windowHeight, res.windowWidth)
-						// 获取图片信息
-						uni.getImageInfo({
-							src: src,
-							success: (imgS) => {
-								//((res.windowHeight - res.statusBarHeight) * 0.33)
-								console.log('====', rect, '输出内容======', imgS.width, imgS.height) //140 1.8(res.windowHeight * 0.23)
-								// canvas.drawImage(img, 起始 x 坐标, 起始 y 坐标, 宽度, 高度, 绘制到 Canvas 的起始 x 坐标, 绘制到 Canvas 的起始 y 坐标, 裁剪后的宽度, 裁剪后的高度);
-								context.drawImage(src, imgS.width * 0.1, imgS.height * 0.3, rect.width * 2.2, rect.height * 2.2, rect.left, rect.top, rect.width, rect.height);
-								context.draw(false, () => {
-									uni.canvasToTempFilePath({
-										canvasId: canvasId,
-										x: rect.left,
-										y: rect.top,
-										width: rect.width,
-										height: rect.height,
-										destWidth: rect.width,
-										destHeight: rect.height,
-										success(res : any) {
-											// res.tempFilePath 是转换后的图片路径
-											res.tempImagePath = res.tempFilePath
-											emit('confirmReturn', res)
-										},
-										fail(err) {
-											console.error('canvasToTempFilePath failed', err);
-										}
-									}, currentInstance.value)
-								});
-							},
-							fail: (error) => {
-								console.error('获取图片信息失败', error);
-							},
-						});
-					}
-				})
-
-
-
-
-				//把当前画布指定区域的内容导出生成指定大小的图片，并返回文件路径。在自定义组件下，第二个参数传入自定义组件实例，以操作组件内 <canvas> 组件。
-				console.log('视图的位置信息：', rect);
-				console.log('视图的 x 坐标：', rect.left);
-				console.log('视图的 y 坐标：', rect.top);
-				console.log('视图的宽度：', rect.width);
-				console.log('视图的高度：', rect.height);
-			}
-		}).exec();
-	};
-
 	//成功
 	function success() {
-
-	}
-
-	//获取节点信息
-	function boundingClientRect(fun : any) {
-		const query = uni.createSelectorQuery().in(currentInstance.value)
-		query.select('.container').boundingClientRect((rect : any) => {
-			if (rect) {
-				//把当前画布指定区域的内容导出生成指定大小的图片，并返回文件路径。在自定义组件下，第二个参数传入自定义组件实例，以操作组件内 <canvas> 组件。
-				console.log('视图的位置信息：', rect);
-				console.log('视图的 x 坐标：', rect.left);
-				console.log('视图的 y 坐标：', rect.top);
-				console.log('视图的宽度：', rect.width);
-				console.log('视图的高度：', rect.height);
-				fun(rect)
-			}
-		}).exec();
+		console.log('图片地址', srcImg.value);
+		emit('confirmReturn', {
+			tempImagePath: srcImg.value
+		})
 	}
 
 	//重新拍摄
@@ -291,13 +213,13 @@
 	.viewfinder {
 		pointer-events: none;
 		position: absolute;
-		top: 180px;
-		left: 40px;
+		top: 20%;
+		left: 10%;
 		width: 80%;
-		height: 200px;
+		height: 400rpx;
 		border: 2px solid #fff;
 		box-sizing: border-box;
 		border-radius: 16rpx;
 		z-index: 2;
 	}
-</style>
+</style>

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

@@ -284,14 +284,14 @@
 			orderInfos.cardStatus = orderInfo.cardStatus;
 			orderInfos.obuId = orderInfo.obuId;
 			orderInfos.obuStatus = orderInfo.obuStatus;
-			let arr = orderInfo.vehicleDimensions.split("X");
-			orderInfos.outlineL = parseInt(arr[0]); //外廓 长
-			orderInfos.outlineW = parseInt(arr[1]); //外廓 宽
-			if(arr[2].indexOf('mm')){
-				orderInfos.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
-			}else{
-				orderInfos.outlineH = arr[2] //外廓 高
-			}
+			// let arr = orderInfo.vehicleDimensions.split("X");
+			// orderInfos.outlineL = parseInt(arr[0]); //外廓 长
+			// orderInfos.outlineW = parseInt(arr[1]); //外廓 宽
+			// if(arr[2].indexOf('mm')){
+			// 	orderInfos.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
+			// }else{
+			// 	orderInfos.outlineH = arr[2] //外廓 高
+			// }
 			orderInfos.type = orderInfo.type;
 			orderInfos.axleCount = orderInfo.vehicleAxleCount;
 			orderInfos.approvedCount = orderInfo.vehicleApprovedCount;

subpackage/after-sale/equipment-upgrade/upgrade-confirm.vue

@@ -522,15 +522,15 @@
 					fileDataStrings.vehiclePlateColor = orderInfo.vehiclePlateColor; //车牌颜色
 					console.log("车辆信息", orderInfo)
 					fileDataStrings.vehicleDimensions = orderInfo.vehicleDimensions;
-					let arr = orderInfo.vehicleDimensions.split("X");
-					console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X"))
-					fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
-					fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
-					if(arr[2].indexOf('mm')){
-						fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
-					}else{
-						fileDataStrings.outlineH = arr[2] //外廓 高
-					}
+					// let arr = orderInfo.vehicleDimensions.split("X");
+					// console.log("orderInfo.vehicleDimensions", orderInfo.vehicleDimensions.split("X"))
+					// fileDataStrings.outlineL = parseInt(arr[0]); //外廓 长
+					// fileDataStrings.outlineW = parseInt(arr[1]); //外廓 宽
+					// if(arr[2].indexOf('mm')){
+					// 	fileDataStrings.outlineH = parseInt(arr[2].substring(0, arr[2].length - 2)); //外廓 高
+					// }else{
+					// 	fileDataStrings.outlineH = arr[2] //外廓 高
+					// }
 					fileDataStrings.vehicleIdNo = orderInfo.vehicleEngineNum; //车编号
 					fileDataStrings.vehiclePlateColorStr = getVehiclePlateColor(orderInfo
 						.vehiclePlateColor);