From aecdfb8c9f8c5f20dc9adb61adf0a9c1385b9f14 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 17 一月 2024 09:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/common/qrCodeApp.vue | 37 ++++++++++++-------------------------
1 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/src/views/common/qrCodeApp.vue b/src/views/common/qrCodeApp.vue
index c50d1d4..2e5ef67 100644
--- a/src/views/common/qrCodeApp.vue
+++ b/src/views/common/qrCodeApp.vue
@@ -18,8 +18,6 @@
</div>
</template>
<script>
-// 涓嬭浇鎻掍欢
-// cnpm install --save vue-qrcode-reader
// 寮曞叆
import { QrcodeStream } from "vue-qrcode-reader";
export default {
@@ -29,7 +27,7 @@
data() {
return {
isShow: true,
- camera: "front",
+ camera: "rear",
result: "", // 鎵爜缁撴灉淇℃伅
error: "" // 閿欒淇℃伅
};
@@ -37,27 +35,26 @@
created() { },
methods: {
openCamera(){
- this.camera="front"
+ this.camera='rear'
},
//鍥炶皟鎵弿缁撴灉
onDecode(result) {
- console.log(result);
if (result !== "") {
- this.$emit("onDecode", result);
- alert(result)
+ this.result=result
+ this.$emit("ok",this.result)
+ this.cancelCode()
}
},
// 鐩告満鍙嶈浆
switchCamera() {
switch (this.camera) {
- //鍓嶇疆
- case 'front':
- //杞�
- this.camera = 'rear'
- break
- //鍙嶄箣
+ //鍙嶄箣
case 'rear':
- this.camera = 'front'
+ this.camera = 'front'
+ break
+ case 'front':
+ //鍚庣疆
+ this.camera = 'rear'
break
default:
this.$toast('閿欒')
@@ -75,12 +72,7 @@
async onInit(promise) {
try {
const { capabilities } = await promise;
- console.log(
- "馃殌 ~ file: cameracomponent.vue:47 ~ onInit ~ capabilities",
- capabilities
- );
} catch (error) {
- // console.log()
this.$toast(error.name);
if (error.name === "NotAllowedError") {
this.error = "ERROR: 鎮ㄩ渶瑕佹巿浜堢浉鏈鸿闂潈闄�";
@@ -106,12 +98,7 @@
}
},
watch: {
- "result": {
- handler(newVal) {
- console.log('鎵弿鍊�' + newVal);
- },
- deep: true
- }
+
}
};
</script>
--
Gitblit v1.9.3