Merge branch 'main' of https://git.kingkongcang.com/YoGo/SFH5

pages/unlock/index.vue

@@ -239,7 +239,16 @@
 					}" shape="circle">
 						取消
 					</uv-button>
-					<uv-button :customStyle="{
+					
+					<uv-button v-if="[3, 7].includes(Number(state.selectItem?.lockTypeId))" @click="RemoteOpen" :customStyle="{
+						height: '86rpx',
+						background: '#FB322E',
+						color: '#fff',
+						fontSize: '32rpx',
+					}" color="#FB322E" shape="circle">
+						一键开锁
+					</uv-button>
+					<uv-button v-else @click="GetLockPwd" :customStyle="{
 						height: '86rpx',
 						background: '#FB322E',
 						color: '#fff',
@@ -951,6 +960,30 @@ const cancelMoveOutRqt = (item) => {
 		}
 	})
 }
+
+// 获取锁的密码
+function RemoteOpen() {
+    uni.showLoading({mask:true})
+    getLockApi.RemoteOpen({ lockMac: state.value.selectItem.lockMac,input: '',siteId:state.value.selectItem.siteId }).then(res => {
+        state.tryPWDCount++
+        if(res.data.isSuccess) {
+             uni.showToast({
+                title:t('door.UnlockSuccessful'),
+                duration:3000,
+                icon:'none'
+            })
+            uni.hideLoading()
+        } else {
+            uni.hideLoading()
+            uni.showToast({
+                title:res.data.message,
+                duration:3000,
+                icon:'none'
+            })
+            
+        }
+    })
+}
 const lockPwd = ref('')
 // 获取锁的密码
 function GetLockPwd() {
@@ -966,7 +999,7 @@ function GetLockPwd() {
 			})
 		} else {
 			uni.hideLoading()
-			lockPwd.value = res.data
+			lockPwd.value = res.data.password
 		}
 	})
 }
@@ -1516,6 +1549,7 @@ onShow(() => {
 	.header {
 		width: 100%;
 		padding: 20rpx;
+		padding-bottom: 36rpx;
 
 		:deep(.uv-tabs__wrapper__nav__item) {
 			height: 80rpx !important;