From 2e403b0ffa43b5411161d86b9c041acfb02831a1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 15 十二月 2023 09:51:47 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/common/qrCodeApp.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/common/qrCodeApp.vue b/src/views/common/qrCodeApp.vue
index 3aff601..f0bada3 100644
--- a/src/views/common/qrCodeApp.vue
+++ b/src/views/common/qrCodeApp.vue
@@ -41,8 +41,9 @@
onDecode(result) {
console.log(result);
if (result !== "") {
- this.$emit("onDecode", result);
- alert(result)
+ this.result=result
+ this.$emit("ok",result)
+ alert(result)
}
},
// 鐩告満鍙嶈浆
--
Gitblit v1.9.3