diff --git a/pages/roomDetail/roomDetail.js b/pages/roomDetail/roomDetail.js
index 884827a..72ff877 100644
--- a/pages/roomDetail/roomDetail.js
+++ b/pages/roomDetail/roomDetail.js
@@ -1180,7 +1180,7 @@ Page({
     this.setData({ event })
     var deviceinfo = this.data.deviceinfo
     if (deviceinfo.manufactureId == 201 || deviceinfo.manufactureId == 221) {
-      if (app.globalData.zgBlueStatus) {
+      if (this.data.isSearch) {
         if (event == 0) {
           this.openTheDoor()
         } else if (event == 3) {
@@ -1192,6 +1192,7 @@ Page({
         } else if (event == 11) {
           this.synchroPlatformTask()
         }
+        wx.hideLoading()
       } else {
         that.goBlue()
       }
@@ -2330,7 +2331,8 @@ Page({
                 clearInterval(that.data.timer)
                 this.setData({
                   bleStatus: '蓝牙已连接',
-                  deviceId: deviceId
+                  deviceId: deviceId,
+                  isSearch: true
                 })
                 app.globalData.zgBlueStatus = true
                 wx.hideLoading()
diff --git a/pages/userbluetoothUnlock/userbluetoothUnlock.js b/pages/userbluetoothUnlock/userbluetoothUnlock.js
index 7858f4d..3cc1822 100644
--- a/pages/userbluetoothUnlock/userbluetoothUnlock.js
+++ b/pages/userbluetoothUnlock/userbluetoothUnlock.js
@@ -1042,7 +1042,7 @@ Page({
       remotePasswordStatus:false
     })
     if (deviceinfo.manufactureId == 201||deviceinfo.manufactureId == 221) {
-      if (app.globalData.zgBlueStatus) {
+      if (this.data.isSearch) {
         if (event == 0) {
           this.openTheDoor()
         } else if (event == 1) {
@@ -1098,14 +1098,23 @@ Page({
       if (this.data.isSearch) {
         if (event == '0') {
           this.LwjopenLock()
-        } if(event == '3') {
+        }else if(event == '3') {
           this.configurewifj()
+        }else if(event == '12'){
+          this.goPasswordList()
+        }else if(event == '1'){
+          this.addPincode()
         }
       } else {
         this.searchDevicesMethods()
       }
     }
   },
+  addPincode: function() {
+    var that = this
+    taskId = 51
+    that.initBluetooth()
+  },
   configurewifj() {
     var that = this
     taskId = 121
@@ -1174,6 +1183,8 @@ Page({
                         } else if (that.data.event == '3') {
                           console.log("1298wifi");
                           that.configurewifj()
+                        }else if(that.data.event == '12'){
+                          that.goPasswordList()
                         }
                         wx.hideLoading({
                           success: (res) => {},
@@ -2158,7 +2169,8 @@ Page({
                 clearInterval(that.data.timer)
                 this.setData({
                   bleStatus: '蓝牙已连接',
-                  deviceId: deviceId
+                  deviceId: deviceId,
+                  isSearch: true
                 })
                 app.globalData.zgBlueStatus = true
                 wx.hideLoading()
@@ -2965,6 +2977,8 @@ Page({
             })
           }
         })
+      }else if(deviceinfo.manufactureId == 1201 || deviceinfo.manufactureId == 1241){
+
       }
     }
   },
diff --git a/pages/userbluetoothUnlock/userbluetoothUnlock.wxml b/pages/userbluetoothUnlock/userbluetoothUnlock.wxml
index c876b00..b5eac80 100644
--- a/pages/userbluetoothUnlock/userbluetoothUnlock.wxml
+++ b/pages/userbluetoothUnlock/userbluetoothUnlock.wxml
@@ -51,7 +51,7 @@
 			<view class="iconfont icon-xiaoxi text-green"></view>
 			<view class="text-grey text-sm">添加蓝牙密码</view>
 		</view>
-		<view class="actionli" bindtap="addRemotePassword" wx:if="userRole == 1">
+		<view class="actionli" bindtap="addRemotePassword" wx:if="userRole == 1" wx:if="{{deviceinfo.manufactureId ==201 || deviceinfo.manufactureId ==221}}">
 			<view class="iconfont icon-xiaoxi text-green"></view>
 			<view class="text-grey text-sm">添加远程密码</view>
 		</view>