From fc7b1fc82b4d8752243d11b0b660e5065c86e2b7 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Fri, 29 Aug 2025 11:46:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/dateUpdate/index.vue         |  9 ++++++++-
 src/pages/devicesSearch/ocrSearch2.vue | 11 +++++++++--
 src/pages/standardBox/codeList.vue     |  9 ++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/pages/dateUpdate/index.vue b/src/pages/dateUpdate/index.vue
index 38902a6..8bcde77 100644
--- a/src/pages/dateUpdate/index.vue
+++ b/src/pages/dateUpdate/index.vue
@@ -178,6 +178,8 @@ const pluginCheckRetries = ref(0)
 const maxRetries = ref(5)
 const focusTimeout = ref(null)
 const systemInfo = ref(null)
+const screenHeight=ref(null)
+const screenWidth=ref(null)
 
 const currentDate = ref('')
 const minDate = ref('')
@@ -263,6 +265,11 @@ const getDeviceInfo = () => {
     const systemInfoData = uni.getSystemInfoSync();
     console.log('设备信息:', systemInfoData);
     systemInfo.value = systemInfoData;
+    // 获取屏幕高度和宽度
+    const screenHeight = systemInfoData.screenHeight;
+    const screenWidth = systemInfoData.screenWidth;
+    this.screenHeight = screenHeight;
+    this.screenWidth = screenWidth;
   } catch (error) {
     console.error('获取设备信息失败:', error);
   }
@@ -639,7 +646,7 @@ const takePicture = async () => {
     if (!CameraPreview) {
       throw new Error('相机插件不可用');
     }
-    CameraPreview.takePicture({width:640, height:540, quality: 50}, async (base64PictureData) => {
+    CameraPreview.takePicture({width:this.screenWidth, height:this.screenHeight, quality: 50}, async (base64PictureData) => {
       console.log('拍照返回数据',base64PictureData);
       await processImage(base64PictureData);
     });
diff --git a/src/pages/devicesSearch/ocrSearch2.vue b/src/pages/devicesSearch/ocrSearch2.vue
index 2910ebd..621eb52 100644
--- a/src/pages/devicesSearch/ocrSearch2.vue
+++ b/src/pages/devicesSearch/ocrSearch2.vue
@@ -179,7 +179,9 @@ export default {
       focusTimeout: null,
       // 设备信息
       systemInfo: null,
-      isOverToday: false
+      isOverToday: false,
+      screenHeight: null,
+      screenWidth: null,
     }
   },
   onBackPress(options) {
@@ -230,6 +232,11 @@ export default {
         const systemInfo = uni.getSystemInfoSync();
         console.log('设备信息:', systemInfo);
         this.systemInfo = systemInfo;
+        // 获取屏幕高度和宽度
+        const screenHeight = systemInfo.screenHeight; // 屏幕高度：1000
+        const screenWidth = systemInfo.screenWidth;   // 屏幕宽度：600
+        this.screenHeight = screenHeight;
+        this.screenWidth = screenWidth;
       } catch (error) {
         console.error('获取设备信息失败:', error);
       }
@@ -510,7 +517,7 @@ export default {
         // 拍照前先进行聚焦
         console.log('拍照前聚焦...');
         console.log('开始拍照...');
-        CameraPreview.takePicture({width:640, height:540, quality: 50}, async (base64PictureData) => {
+        CameraPreview.takePicture({width:this.screenWidth, height:this.screenHeight, quality: 50}, async (base64PictureData) => {
           console.log('拍照返回数据',base64PictureData);
           await this.processImage(base64PictureData);
         });
diff --git a/src/pages/standardBox/codeList.vue b/src/pages/standardBox/codeList.vue
index a3dc129..3d33cce 100644
--- a/src/pages/standardBox/codeList.vue
+++ b/src/pages/standardBox/codeList.vue
@@ -174,6 +174,8 @@ const pluginCheckRetries = ref(0)
 const maxRetries = ref(5)
 const focusTimeout = ref(null)
 const systemInfo = ref(null)
+const screenHeight = ref(null)
+const screenWidth = ref(null)
 
 const getCodeList = () => {
     console.log(boxInfo.value)
@@ -351,6 +353,11 @@ const getDeviceInfo = () => {
     const systemInfoData = uni.getSystemInfoSync();
     console.log('设备信息:', systemInfoData);
     systemInfo.value = systemInfoData;
+    // 获取屏幕高度和宽度
+    const screenHeight = systemInfoData.screenHeight; // 屏幕高度：1000
+    const screenWidth = systemInfoData.screenWidth;   // 屏幕宽度：600
+    this.screenHeight = screenHeight;
+    this.screenWidth = screenWidth;
   } catch (error) {
     console.error('获取设备信息失败:', error);
   }
@@ -523,7 +530,7 @@ const takePicture = async () => {
     if (!CameraPreview) {
       throw new Error('相机插件不可用');
     }
-    CameraPreview.takePicture({width:640, height:540, quality: 50}, async (base64PictureData) => {
+    CameraPreview.takePicture({width:this.screenWidth, height:this.screenHeight, quality: 50}, async (base64PictureData) => {
       console.log('拍照返回数据',base64PictureData);
       await processImage(base64PictureData);
     });