From ad2437550eb0c8f3c3c8736df1a38a713f920ec2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 十二月 2023 10:13:40 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/common/qrCodeApp.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/common/qrCodeApp.vue b/src/views/common/qrCodeApp.vue
index c50d1d4..ef13928 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 {
@@ -43,8 +41,10 @@
onDecode(result) {
console.log(result);
if (result !== "") {
- this.$emit("onDecode", result);
- alert(result)
+ this.result=result
+ this.$emit("ok",this.result)
+ this.cancelCode()
+ // alert(result)
}
},
// 鐩告満鍙嶈浆
@@ -52,7 +52,7 @@
switch (this.camera) {
//鍓嶇疆
case 'front':
- //杞�
+ //杞悗缃�
this.camera = 'rear'
break
//鍙嶄箣
--
Gitblit v1.9.3