diff --git a/pages/unlock/index.vue b/pages/unlock/index.vue
index cd33783..729d5b0 100644
--- a/pages/unlock/index.vue
+++ b/pages/unlock/index.vue
@@ -2,10 +2,10 @@
 	<view class="container" :class="[`${themeInfo.theme}-theme`]">
 		<view class="header">
 			<uv-tabs @change="handleChange" :current="state.current" lineWidth="80rpx" lineHeight="10rpx"
-				lineColor="#f56c6c" :scrollable="false" :list="list">
+				lineColor="#FF1E2E" :scrollable="false" :list="list">
 			</uv-tabs>
 		</view>
-		<view class="content">
+		<view class="unlock-wrap content">
 			<view class="card orderList" v-for="item in currentOrderList" :key="item.orderId">
 				<view class="orderInfo">
 					<!-- <uv-button shape="circle">复制</uv-button> -->
@@ -215,25 +215,26 @@
 				</view>
 			</view>
 		</uv-popup>
-		<uv-popup ref="devicePopupRef" zIndex="999" round="24rpx">
-			<view class="popupBox popupBoxW710">
+		<uv-popup ref="devicePopupRef" zIndex="999" round="24rpx" :safeAreaInsetBottom="false">
+			<view class="popupBox popupBoxW650">
 				<view class="title fontb font32">
 					开门二维码
 				</view>
 				<view class="content">
-					<img @click="showImage(QRCode)" alt="加载失败" v-show="ifShow" class="paw" width="100%" height="300rpx"
+					<img @click="showImage(QRCode)" alt="加载失败" v-show="ifShow" class="paw" width="280rpx" height="280rpx"
 						:src="QRCode"></img>
-					<text class="textGray font26">二维码的有效期仅为15分钟</text>
+					<text class="textGray font26" style="z-index: 9; margin: 0 0 30rpx 0;">二维码的有效期仅为15分钟</text>
 				</view>
 				<view class="btnBox">
-					<uv-button @click="closeDevicePopup" :customStyle="{
+					<!-- <uv-button @click="closeDevicePopup" :customStyle="{
 						height: '86rpx',
 						color: '#000',
 						fontSize: '32rpx',
 					}" shape="circle">
 						取消
-					</uv-button>
+					</uv-button> -->
 					<uv-button @click="GetQRCode" :customStyle="{
+						width: '86%',
 						height: '86rpx',
 						background: '#FB322E',
 						color: '#fff',
@@ -244,14 +245,14 @@
 				</view>
 			</view>
 		</uv-popup>
-		<uv-popup ref="pawPopupRef" zIndex="999" round="24px">
-			<view class="popupBox pwdBox popupBoxW710">
+		<uv-popup ref="pawPopupRef" zIndex="999" round="24px" :safeAreaInsetBottom="false">
+			<view class="popupBox pwdBox popupBoxW650">
 				<view class="title fontb font32">
-					开锁
+					开锁密码
 				</view>
 				<view class="content">
 					<text class="font26 textRed fontb" style="font-size: 60rpx;">{{ lockPwd }}#</text>
-					<text class="textGray font26">输入密码即可开锁{{ [3, 7].includes(Number(state.selectItem?.lockTypeId)) ?
+					<text class="textGray font26" style="margin: 20rpx 0 30rpx;">输入密码即可开锁{{ [3, 7].includes(Number(state.selectItem?.lockTypeId)) ?
 						"或一键开锁" :
 						"" }}</text>
 				</view>
@@ -1499,6 +1500,10 @@ onShow(() => {
 	width: 710rpx;
 }
 
+.popupBoxW650 {
+	width: 650rpx;
+}
+
 .popupBox {
 	display: flex;
 	flex-direction: column;
@@ -1506,6 +1511,7 @@ onShow(() => {
 
 	.title {
 		text-align: center;
+		z-index: 9;
 	}
 
 	.content {
@@ -1522,6 +1528,7 @@ onShow(() => {
 	.btnBox {
 		display: flex;
 		gap: 20rpx;
+		padding: 0 20rpx;
 		width: 100%;
 
 		:deep(.uv-button-wrapper) {
@@ -1675,6 +1682,10 @@ onShow(() => {
 		}
 	}
 
+	.paw {
+		margin: -20rpx auto -34rpx;
+		z-index: 1;
+	}
 }
 
 .container {
@@ -1682,8 +1693,6 @@ onShow(() => {
 	display: flex;
 	flex-direction: column;
 	align-items: center;
-	min-height: 100vh;
-	padding-bottom: 400rpx;
 
 	.header {
 		width: 100%;
@@ -1697,10 +1706,16 @@ onShow(() => {
 		:deep(.uv-tabs__wrapper__nav__item__text) {
 			font-size: 32rpx;
 			font-weight: bold;
-			padding-bottom: 10rpx;
+			padding-bottom: 6rpx;
 		}
 	}
 
+	.unlock-wrap {
+		height: calc(100vh - 160rpx);
+		padding-bottom: 160rpx;
+		overflow: auto;
+	}
+
 	.content {
 		display: flex;
 		width: 100%;