From a416d151c66f75386409d7a2863f53751ec36652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Tue, 3 Sep 2024 11:40:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5MAC/ID=E5=80=BC=202.=20=E4=BF=AE=E6=94=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=AE=BE=E5=A4=87=E6=88=96=E7=94=B5=E5=AD=90=E9=92=A5?=
 =?UTF-8?q?=E5=8C=99=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/setting/setting.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index 9c87fad..ef1f186 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -17,7 +17,7 @@
       <view class="view-button">
         <view>MAC/ID</view>
         <view class="view-button" style="padding: 0">
-          <view class="info">{{currentLockInfo.mac}}</view>
+          <view class="info">{{currentLockInfo.mac}}/{{currentLockInfo.lockId}}</view>
         </view>
       </view>
       <view class="view-line"></view>
@@ -98,9 +98,10 @@ export default {
     },
     deleteLock() {
       const that = this
+      const message = that.currentLockInfo.userType === 110301 ? '删除锁后，所有信息都会一起删除，确定删除锁吗？' : '确定删除该钥匙吗？'
       uni.showModal({
         title: '提示',
-        content: '确定删除该门锁吗？',
+        content: message,
         success: async function (res) {
           if (res.confirm) {
             uni.showLoading({