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 |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/views/common/qrCodeApp.vue b/src/views/common/qrCodeApp.vue
index b3c1f61..f0bada3 100644
--- a/src/views/common/qrCodeApp.vue
+++ b/src/views/common/qrCodeApp.vue
@@ -41,6 +41,8 @@
         onDecode(result) {
             console.log(result);
             if (result !== "") {
+                this.result=result
+                this.$emit("ok",result)
                 alert(result)            
             }
         },

--
Gitblit v1.9.3