From 5b12b5f198b4bde7b8963953bbfc2223b808a3dc Mon Sep 17 00:00:00 2001
From: fanpeng <438123081@qq.com>
Date: Mon, 14 Jul 2025 15:00:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=93=9D=E7=89=99?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E5=92=8C=E5=85=B3=E9=97=AD=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B9=B3=E5=8F=B0=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/addDevice/bindLock.vue |  2 ++
 pages/feature/bindFace.vue   | 12 ++++++------
 pages/setting/setting.vue    |  2 ++
 stores/bluetooth.js          |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pages/addDevice/bindLock.vue b/pages/addDevice/bindLock.vue
index 6a5a722..91f7e73 100644
--- a/pages/addDevice/bindLock.vue
+++ b/pages/addDevice/bindLock.vue
@@ -90,8 +90,10 @@
         })
         if (addUserCode === 0) {
           this.closeBluetoothConnection()
+          // #ifdef MP
           this.closeAllBluetooth()
           this.initAndListenBluetooth()
+          // #endif
         } else if (addUserCode === -1) {
           uni.hideLoading()
           uni.showToast({
diff --git a/pages/feature/bindFace.vue b/pages/feature/bindFace.vue
index 761c25b..f3dd856 100644
--- a/pages/feature/bindFace.vue
+++ b/pages/feature/bindFace.vue
@@ -116,15 +116,15 @@
 
 <style scoped lang="scss">
   .button {
-    border-radius: 64rpx;
     width: 686rpx;
-    margin-left: 32rpx;
     height: 100rpx;
-    line-height: 100rpx;
-    text-align: center;
-    background-color: #63b8af;
-    color: #fff;
+    margin-left: 32rpx;
     font-size: 32rpx;
     font-weight: bold;
+    line-height: 100rpx;
+    color: #fff;
+    text-align: center;
+    background-color: #63b8af;
+    border-radius: 64rpx;
   }
 </style>
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index f2d3bc5..5e33d6a 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -347,7 +347,9 @@
       lockId: $bluetooth.currentLockInfo.lockName.toString(),
       uid: $user.userInfo.uid.toString()
     })
+    // #ifdef MP
     $bluetooth.closeBluetoothConnection()
+    // #endif
     if (code === 0) {
       const { code: resultCode } = await lockDataUploadRequest({
         lockId: $bluetooth.currentLockInfo.lockId,
diff --git a/stores/bluetooth.js b/stores/bluetooth.js
index 5763d41..d8d60f8 100644
--- a/stores/bluetooth.js
+++ b/stores/bluetooth.js
@@ -249,7 +249,7 @@ export const useBluetoothStore = defineStore('ble', {
               }
             }
             // 蓝牙已经初始化
-            if (err.errMsg === 'openBluetoothAdapter:fail already opened') {
+            if (err.errMsg === 'openBluetoothAdapter:fail already opened' || err.code === -1) {
               resolve(true)
               return
             }