1. 修改设置页MAC/ID值

2. 修改删除设备或电子钥匙文案

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({