From fc6ed7861e7771b16452f8e88a5c67d9b0d9c9c6 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 十二月 2023 14:10:35 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/common/qrCodeApp.vue | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/views/common/qrCodeApp.vue b/src/views/common/qrCodeApp.vue
index 3aff601..8c297ac 100644
--- a/src/views/common/qrCodeApp.vue
+++ b/src/views/common/qrCodeApp.vue
@@ -39,10 +39,10 @@
},
//鍥炶皟鎵弿缁撴灉
onDecode(result) {
- console.log(result);
if (result !== "") {
- this.$emit("onDecode", result);
- alert(result)
+ this.result=result
+ this.$emit("ok",this.result)
+ this.cancelCode()
}
},
// 鐩告満鍙嶈浆
@@ -73,12 +73,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: 鎮ㄩ渶瑕佹巿浜堢浉鏈鸿闂潈闄�";
@@ -104,12 +99,7 @@
}
},
watch: {
- "result": {
- handler(newVal) {
- console.log('鎵弿鍊�' + newVal);
- },
- deep: true
- }
+
}
};
</script>
--
Gitblit v1.9.3