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

diff --git a/src/views/common/qrCodeApp.vue b/src/views/common/qrCodeApp.vue
index b3c1f61..ef13928 100644
--- a/src/views/common/qrCodeApp.vue
+++ b/src/views/common/qrCodeApp.vue
@@ -41,7 +41,10 @@
         onDecode(result) {
             console.log(result);
             if (result !== "") {
-                alert(result)            
+                this.result=result
+                this.$emit("ok",this.result)
+                this.cancelCode()
+                // alert(result)            
             }
         },
         // 鐩告満鍙嶈浆

--
Gitblit v1.9.3