diff --git a/.gitignore b/.gitignore index ea8ee76..fd3777d 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,6 @@ logs .pnpm-lock.yaml -userData \ No newline at end of file +userData + +test/* \ No newline at end of file diff --git a/components/miaoQRScanner.vue b/components/miaoQRScanner.vue index 858bdce..bd60dc0 100644 --- a/components/miaoQRScanner.vue +++ b/components/miaoQRScanner.vue @@ -42,18 +42,17 @@ const handleVideoTrack = (track: MediaStreamTrack) => { let errCount = 0 // @ts-ignore const imageCapture = new ImageCapture(track) - timer = setInterval(() => { + timer = setInterval(async () => { try { - imageCapture.grabFrame().then((videoFrame: VideoFrame) => { - const data = getQRData(videoFrame) - if (data &&!scannerResult.has(data)) { - console.log(data) - scannerResult.add(data) - result.push(data) - emit('onResult', data) - } - videoFrame.close() - }) + const videoFrame = await imageCapture.grabFrame() + const data = getQRData(videoFrame) + if (data && !scannerResult.has(data)) { + console.log(data) + scannerResult.add(data) + result.push(data) + emit('onResult', data) + } + videoFrame.close() } catch (e) { errCount++ if (errCount > 10) { @@ -96,6 +95,8 @@ onBeforeUnmount(() => { video { height: inherit; width: inherit; + max-height: inherit; + max-width: inherit; object-fit: contain; } } diff --git a/pages/tools/fucksq.vue b/pages/tools/fucksq.vue index 6dd13b4..faf7c60 100644 --- a/pages/tools/fucksq.vue +++ b/pages/tools/fucksq.vue @@ -4,14 +4,14 @@
- + - + 扫码 @@ -22,11 +22,12 @@ - 开始 + 开始 - 清空输出 + 清空输出
@@ -48,8 +49,11 @@