From 932cab1a490bb6ccc1c243fc939b3acbb11d037c 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 18:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=81=E5=90=8D=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E6=97=B6=E7=9A=84=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue             |  4 +++-
 pages/lockDetail/lockDetail.vue | 11 ++++++++---
 pages/setting/setting.vue       |  6 +++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 6b71afc..ff29734 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -38,7 +38,9 @@
                   <view v-if="lock.days" class="lock-status" style="background-color: #63b8af">余{{lock.days}}天</view>
                   <view v-if="lock.keyStatus === 110403" class="lock-status" style="background-color: #63b8af">未生效</view>
                   <view v-if="lock.keyStatus === 110405" class="lock-status">已冻结</view>
-                  <view class="lock-time">
+                  <view class="lock-time"
+                        :style="{padding: lock.keyStatus === 110401 && !lock.days ? '12rpx 24rpx 0 24rpx'
+                        :'6rpx 24rpx 0 24rpx'}">
                     <view v-if="lock.keyType === 1 || lock.keyType === 3" style="font-size: 32rpx">{{
                         getTimeLimit(lock.keyType) }}</view>
                     <view v-else>
diff --git a/pages/lockDetail/lockDetail.vue b/pages/lockDetail/lockDetail.vue
index a1d5db4..6c8b2f3 100644
--- a/pages/lockDetail/lockDetail.vue
+++ b/pages/lockDetail/lockDetail.vue
@@ -1,5 +1,6 @@
 <template>
   <view>
+    <view class="lock-name">{{ currentLockInfo.lockAlias }}</view>
     <view class="top">
       <image class="top-background" src="/static/images/background_main.jpg" mode="aspectFill"></image>
       <view style="width: 100%;height: 50rpx">
@@ -80,9 +81,6 @@ export default {
     SwitchLoading
   },
   onLoad() {
-    uni.setNavigationBarTitle({
-      title: this.currentLockInfo.lockAlias
-    })
     this.getServeTime()
   },
   methods: {
@@ -185,6 +183,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.lock-name {
+  text-align: center;
+  font-size: 32rpx;
+  padding: 32rpx 32rpx 0 32rpx;
+  font-weight: bold;
+}
+
 .top {
   margin-top: 32rpx;
   margin-left: 32rpx;
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index 866f716..261f398 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -2,9 +2,9 @@
   <view>
     <view class="view">
       <view class="view-button">
-        <view>名称</view>
-        <view class="view-button" style="padding: 0">
-          <view class="info">{{currentLockInfo.lockAlias}}</view>
+        <view style="width: 350rpx">名称</view>
+        <view class="view-button" style="padding: 20rpx 0">
+          <view class="info" style="line-height: 40rpx">{{currentLockInfo.lockAlias}}</view>
         </view>
       </view>
       <view class="view-line"></view>