Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m17s

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-02-25 15:53:21 +07:00
commit e90c22cc9b

View file

@ -272,6 +272,7 @@ async function openCamera() {
return return
} }
if (!isPermissionCameraDenied.value) {
// change camera device // change camera device
if (cameraIsOn.value) { if (cameraIsOn.value) {
await camera.value?.stop() await camera.value?.stop()
@ -280,6 +281,14 @@ async function openCamera() {
await changeCamera() // start() await changeCamera() // start()
} }
cameraIsOn.value = !cameraIsOn.value cameraIsOn.value = !cameraIsOn.value
} else {
messageError(
$q,
'',
'ไม่สามารถเข้าถึงกล้องได้ กรุณาอนุญาตการเข้าถึงกล้องในเบราว์เซอร์ของคุณ'
)
return
}
} }
/** change camera device*/ /** change camera device*/
@ -542,7 +551,6 @@ async function requestCamera() {
try { try {
await navigator.mediaDevices.getUserMedia({ video: true }) await navigator.mediaDevices.getUserMedia({ video: true })
} catch (err) { } catch (err) {
console.error('ผู้ใช้ปฏิเสธการเข้าถึง หรือเกิดข้อผิดพลาด: ', err)
isPermissionCameraDenied.value = true isPermissionCameraDenied.value = true
} }
} }
@ -671,12 +679,7 @@ watch(
<div <div
v-if="!cameraIsOn && img == null" v-if="!cameraIsOn && img == null"
class="preview-placeholder" class="preview-placeholder"
@click=" @click="() => !isDisabledCheckTime && openCamera()"
() =>
!isDisabledCheckTime &&
!isPermissionCameraDenied &&
openCamera()
"
> >
<div class="text-center"> <div class="text-center">
<q-icon <q-icon