Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827

pages/6155/ImgCrop.vue

@@ -58,7 +58,9 @@
 								// 处理像素数据并发送
 								
 								console.log("res.data.length="+res.data.length);
-						
+								eventChannel.emit('ImgCutOverPath', {
+									picPath: e.tempFilePath
+								});
 								 
 								 eventChannel.emit('ImgCutOver',{piexls:res.data,picPath:e.tempFilePath});
 								

pages/6170/deviceControl/index.vue

@@ -630,11 +630,9 @@
 					sizeType: ['original', 'compressed'],
 					sourceType: ['album', 'camera'],
 					success: (res) => {
-						// 将选择的图片赋值给selectedImage
 						const file = res.tempFiles[0];
 						const fileSize = file.size || 0;
 						if (fileSize > 2 * 1024 * 1024) {
-							console.log(`文件过大: ${fileSize} 字节`); // 调试日志
 							uni.showToast({
 								title: '图片大小不能超过2MB',
 								icon: 'none',
@@ -642,13 +640,19 @@
 							});
 							return;
 						}
-						this.selectedImage = res.tempFilePaths[0];
+						let that = this;
-						console.log('选择的图片:', res);
+						uni.navigateTo({
+							url: "/pages/6155/ImgCrop",
+							events: {
+								ImgCutOverPath :function (data) {
+									that.selectedImage = data.picPath;
+								}
 							},
-					fail: (err) => {
+							success(ev) {
-						uni.showToast({
+								ev.eventChannel.emit('checkImg', {
-							title: '选择图片失败',
+									data: res.tempFiles[0].path,
-							icon: 'none'
+								});
+							}
 						});
 					}
 				});
@@ -1156,24 +1160,30 @@
 							// 1设备切换灯光实时返回
 							switch (deviceState[0]) {
 								case 1:
-									this.currentMainMode = this.getMainLightModeLabel(deviceState[
+									this.currentMainMode = this.getMainLightModeLabel(
+										deviceState[
 											1]);
 									this.sliderValue = deviceState[2];
 									this.deviceInfo.batteryRemainingTime = deviceState[3];
 									break;
 									// 12为设备实时上报
 								case 12:
-									this.currentMainMode = this.getMainLightModeLabel(deviceState[
+									this.currentMainMode = this.getMainLightModeLabel(
+										deviceState[
 											1]);
 									this.isLaserOn = deviceState[2] === 1; //第3位表示当时激光灯档位
 									this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
 									if (this.deviceInfo) {
-										this.deviceInfo.batteryPercentage = deviceState[3];  //第4位电量百分比
+										this.deviceInfo.batteryPercentage = deviceState[
-										this.deviceInfo.chargeState = deviceState[4];  //第5位为充电状态（0没有充电，1正在充电，2为已充满）
+											3]; //第4位电量百分比
-										this.deviceInfo.batteryRemainingTime = deviceState[5]; //第6位200代表电池剩余续航时间200分钟
+										this.deviceInfo.chargeState = deviceState[
+											4]; //第5位为充电状态（0没有充电，1正在充电，2为已充满）
+										this.deviceInfo.batteryRemainingTime = deviceState[
+											5]; //第6位200代表电池剩余续航时间200分钟
 									}
 									setTimeout(() => {
-										if (this.deviceInfo.batteryPercentage <20 && this.deviceInfo.chargeState == 0) {
+										if (this.deviceInfo.batteryPercentage < 20 &&
+											this.deviceInfo.chargeState == 0) {
 											this.popupType = 'bettery';
 											this.popupMessage = '请及时充电';
 											this.showPopupFlag = true;
@@ -1625,7 +1635,7 @@
 	/* 弹窗主体 */
 	.agreement-popup {
 		width: 100%;
-		height: 50%;
+		/* height: 50%; */
 		background-color: rgb(42, 42, 42);
 		border-radius: 60rpx 60rpx 0rpx 0rpx;
 		padding: 40rpx;

pages/common/qrcode/qrcode.vue

@@ -87,6 +87,21 @@
 				}
 			},
 	},
+	// 处理返回键
+	onBackPress() {
+		// 如果绑定成功了，返回时也要刷新首页
+		if (this.isSuccess) {
+			uni.$emit('refreshDeviceList');
+		}
+		return false; // 允许正常返回
+	},
+	// 页面卸载时处理
+	onUnload() {
+		// 如果绑定成功了，卸载时也要刷新首页
+		if (this.isSuccess) {
+			uni.$emit('refreshDeviceList');
+		}
+	},
 	onLoad(options) {
 		if (options.deviceId) {
 			this.deviceId = decodeURIComponent(options.deviceId);