From 239abddf0657fb173a03d389bdc8052d49387a8a Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Wed, 13 Aug 2025 15:24:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/back/backCode.vue    | 11 ++++++++---
 src/pages/back/backCodeAdd.vue | 17 +++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/pages/back/backCode.vue b/src/pages/back/backCode.vue
index 4f1c051..3e9b2d7 100644
--- a/src/pages/back/backCode.vue
+++ b/src/pages/back/backCode.vue
@@ -521,10 +521,15 @@ const scanStart = async () => {
 
 // 处理扫描成功事件
 const handleScanSuccess = (result) => {
-    qrCode.value = result?.data?.split('?qrcode=')[1] || ''
-    if (qrCode.value === '' || result?.canceled) {
+    qrCode.value = result?.data || ''
+    console.log("xxxxxxxxxxx",result)
+    console.log("yyyyyyyyyyy",qrCode.value)
+    if (qrCode.value == '') {
         uni.showToast({ title: '扫码识别失败', icon: 'none' })
-    } else {
+    } else if(qrCode.value == '操作已取消'){
+        qrCode.value = ''
+        uni.showToast({ title: '操作已取消', icon: 'none' })
+    }else {
         getMaInfoScan()
     }
 }
diff --git a/src/pages/back/backCodeAdd.vue b/src/pages/back/backCodeAdd.vue
index f8f2c74..6364bea 100644
--- a/src/pages/back/backCodeAdd.vue
+++ b/src/pages/back/backCodeAdd.vue
@@ -433,12 +433,17 @@ const uploadSignUrlFj = (file) => {
 
 // 处理扫描成功事件
 const handleScanSuccess = (result) => {
-  qrCode.value = result?.data?.split('?qrcode=')[1] || ''
-  if (qrCode.value == '' || result?.canceled) {
-    uni.showToast({ title: '扫码识别失败', icon: 'none' })
-  } else {
-    getMaInfoScan()
-  }
+  qrCode.value = result?.data || ''
+  console.log("xxxxxxxxxxx",result)
+  console.log("yyyyyyyyyyy",qrCode.value)
+    if (qrCode.value == '') {
+        uni.showToast({ title: '扫码识别失败', icon: 'none' })
+    } else if(qrCode.value == '操作已取消'){
+        qrCode.value = ''
+        uni.showToast({ title: '操作已取消', icon: 'none' })
+    }else {
+        getMaInfoScan()
+    }
 }
 
 // 处理扫描失败事件