From 8c3a83497ae6063576de674b9bf00612da89963c Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Mon, 27 Oct 2025 09:42:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/configNetwork/configNetwork.js      |  8 +++++
 .../pages/lockDetail/lockDetail.js            | 32 +++++++++++++++----
 package-lock.json                             |  8 ++---
 package.json                                  |  2 +-
 src/index.js                                  |  7 +++-
 5 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/miniprogram/miniprogram/pages/configNetwork/configNetwork.js b/miniprogram/miniprogram/pages/configNetwork/configNetwork.js
index 9b27041..7f47d30 100644
--- a/miniprogram/miniprogram/pages/configNetwork/configNetwork.js
+++ b/miniprogram/miniprogram/pages/configNetwork/configNetwork.js
@@ -5,6 +5,7 @@ const {
     starEventOn,
     connectWiFi,
     starEventOff,
+    getLockNetworkInfo,
 } = requirePlugin('starCloud')
 
 Page({
@@ -120,6 +121,13 @@ Page({
             password: password,
         });
         console.log('connectWiFi result', result);
+        if (result.code === 0) {
+            const networkInfo = await getLockNetworkInfo({
+                uid: this.data.accountInfo.uid,
+                deviceMac: this.data.lock.mac,
+            })
+            console.log('networkInfo', networkInfo)
+        }
         this.setData({loading: false, showConnectDialog: false});
         wx.hideLoading();
     },
diff --git a/miniprogram/miniprogram/pages/lockDetail/lockDetail.js b/miniprogram/miniprogram/pages/lockDetail/lockDetail.js
index a6dafd9..db0f0c8 100644
--- a/miniprogram/miniprogram/pages/lockDetail/lockDetail.js
+++ b/miniprogram/miniprogram/pages/lockDetail/lockDetail.js
@@ -124,11 +124,32 @@ Page({
 
     // 远程开锁
     async remoteUnLockRequest() {
-        await selectLock({
-            accountInfo: this.data.accountInfo,
-            lockId: this.data.lock.lockId
-        });
-        console.log('remoteUnLockRequest', await remoteUnLock());
+        await this.handleApiCall(async () => {
+            const app = getApp();
+            // 确保使用最新的锁信息
+            await selectLock({
+                accountInfo: this.data.accountInfo,
+                lockId: app.globalData.lock.lockId
+            });
+
+            const result = await remoteUnLock({
+                lockId: this.data.lock.lockId,
+                uid: this.data.accountInfo.uid,
+            })
+            console.log('result', result)
+
+            if (result.code === Result.Success.code) {
+                wx.showToast({
+                    title: '开门成功',
+                    icon: 'success'
+                });
+            } else {
+                wx.showToast({
+                    title: result.message,
+                    icon: 'fail'
+                });
+            }
+        }, '开门中...');
     },
 
     // 读取锁设置
@@ -164,7 +185,6 @@ Page({
                 disconnect: true,
                 type: 'open'
             });
-            console.log('openDoor result', result);
 
             if (result.code === Result.Success.code) {
                 wx.showToast({
diff --git a/package-lock.json b/package-lock.json
index 0b15942..8b7fd65 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -24,7 +24,7 @@
         "@dcloudio/uni-mp-xhs": "3.0.0-4030620241128001",
         "@dcloudio/uni-quickapp-webview": "3.0.0-4030620241128001",
         "pinia": "^2.2.8",
-        "star-cloud-uni": "^1.0.22",
+        "star-cloud-uni": "^1.0.23",
         "vue": "^3.5.13",
         "vue-i18n": "^9.1.9"
       },
@@ -10046,9 +10046,9 @@
       }
     },
     "node_modules/star-cloud-uni": {
-      "version": "1.0.22",
-      "resolved": "https://registry.npmjs.org/star-cloud-uni/-/star-cloud-uni-1.0.22.tgz",
-      "integrity": "sha512-9iJMxGfbe1m6lyLksU7mS4NI7VcUWu4SCu/TRXgJBLbfGrHnSK9Iil1Ym6KApZLR5rQICVYOoqLH+liBrX6z1w==",
+      "version": "1.0.23",
+      "resolved": "https://registry.npmjs.org/star-cloud-uni/-/star-cloud-uni-1.0.23.tgz",
+      "integrity": "sha512-LlYwyMv2BD3Nqpy/HfusDHQNBzwIUGVTtuSk6iT0gqGoYYpnbIxVRdu8ZtY8s0qok/diVP2JzWriKOWEnxnD/A==",
       "dependencies": {
         "buffer": "^6.0.3",
         "crc": "^4.3.2",
diff --git a/package.json b/package.json
index 9f8c1df..5510c68 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "@dcloudio/uni-mp-xhs": "3.0.0-4030620241128001",
     "@dcloudio/uni-quickapp-webview": "3.0.0-4030620241128001",
     "pinia": "^2.2.8",
-    "star-cloud-uni": "^1.0.22",
+    "star-cloud-uni": "^1.0.23",
     "vue": "^3.5.13",
     "vue-i18n": "^9.1.9"
   },
diff --git a/src/index.js b/src/index.js
index 19c669f..e725193 100644
--- a/src/index.js
+++ b/src/index.js
@@ -25,7 +25,8 @@ import {
     readSupportFunctionsSetting,
     getLockList,
     startSearchWiFi,
-    connectWiFi
+    connectWiFi,
+    getLockNetworkInfo,
 } from 'star-cloud-uni'
 
 // 用于存储事件监听器的Map
@@ -346,5 +347,9 @@ module.exports = {
 
     async connectWiFi(params){
         return await connectWiFi(params);
+    },
+
+    async getLockNetworkInfo(params){
+        return await getLockNetworkInfo(params);
     }
 }