From 367001f1277461984f0da2d15d19521b9f87ae3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Wed, 4 Sep 2024 11:02:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E8=BF=87=E9=95=BF=E6=98=BE=E7=A4=BAbug=202.=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=A6=96=E9=A1=B5=E5=88=97=E8=A1=A8=E8=BF=9C=E7=A8=8B?=
 =?UTF-8?q?=E5=BC=80=E9=94=81=E6=98=BE=E7=A4=BA=203.=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=92=A5=E5=8C=99=E7=A9=BA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/LockInput/LockInput.vue  |  2 +-
 pages/home/home.vue                 | 13 +++++++++----
 pages/keyDetail/keyDetail.vue       |  2 +-
 pages/keyList/keyList.vue           |  7 +++++++
 pages/lockDetail/lockDetail.vue     | 11 +++++++++++
 pages/passwordList/passwordList.vue | 16 ++++++++++++++++
 6 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/components/LockInput/LockInput.vue b/components/LockInput/LockInput.vue
index 056de2d..7ecf326 100644
--- a/components/LockInput/LockInput.vue
+++ b/components/LockInput/LockInput.vue
@@ -3,7 +3,7 @@
     <view class="name">
       <view class="name-text">{{ title }}</view>
       <input :value="value" class="name-input" :placeholder="placeholder" placeholder-class="placeholder-class"
-             maxlength="16" @input="changeInput"></input>
+             maxlength="50" @input="changeInput"></input>
     </view>
   </view>
 </template>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index ff29734..74df04d 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -34,10 +34,15 @@
                     </view>
                   </view>
                   <view class="lock-name">{{lock.lockAlias}}</view>
-                  <view v-if="lock.keyStatus === 110412" class="lock-status">已过期</view>
-                  <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 style="display: flex;align-items: center">
+                    <view v-if="lock.keyStatus === 110412" class="lock-status">已过期</view>
+                    <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 v-if="lock.lockSetting.remoteUnlock === 1" class="lock-status" style="background-color:
+                    #63b8af">远程开锁
+                    </view>
+                  </view>
                   <view class="lock-time"
                         :style="{padding: lock.keyStatus === 110401 && !lock.days ? '12rpx 24rpx 0 24rpx'
                         :'6rpx 24rpx 0 24rpx'}">
diff --git a/pages/keyDetail/keyDetail.vue b/pages/keyDetail/keyDetail.vue
index b5c4035..2da44aa 100644
--- a/pages/keyDetail/keyDetail.vue
+++ b/pages/keyDetail/keyDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <view>
     <view class="item">
-      <view class="item-title">名称</view>
+      <view class="item-title" style="width: 350rpx">名称</view>
       <view class="item-content">{{ currentKeyInfo.keyName }}</view>
     </view>
     <view class="item" style="margin-top: 2rpx">
diff --git a/pages/keyList/keyList.vue b/pages/keyList/keyList.vue
index 5faa250..11a07a5 100644
--- a/pages/keyList/keyList.vue
+++ b/pages/keyList/keyList.vue
@@ -191,6 +191,13 @@ export default {
     },
     async resetKey() {
       const that = this
+      if(that.keyList.length === 0) {
+        uni.showToast({
+          title: '暂无钥匙，无需重置',
+          icon: 'none'
+        })
+        return
+      }
       uni.showModal({
         title: '提示',
         content: '确定要重置钥匙，该锁的所有钥匙都将被删除',
diff --git a/pages/lockDetail/lockDetail.vue b/pages/lockDetail/lockDetail.vue
index 110e7d3..83b91d2 100644
--- a/pages/lockDetail/lockDetail.vue
+++ b/pages/lockDetail/lockDetail.vue
@@ -1,5 +1,6 @@
 <template>
   <view>
+    <view class="days" v-if="currentLockInfo.days">钥匙将在{{ currentLockInfo.days }}天后失效</view>
     <view class="lock-name">{{ currentLockInfo.lockAlias }}</view>
     <view class="top">
       <image class="top-background" src="/static/images/background_main.jpg" mode="aspectFill"></image>
@@ -187,6 +188,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.days {
+  line-height: 60rpx;
+  background: #faecc9;
+  color: #bc9839;
+  text-align: center;
+  font-size: 32rpx;
+  width: 750rpx;
+  height: 60rpx;
+}
+
 .lock-name {
   text-align: center;
   font-size: 32rpx;
diff --git a/pages/passwordList/passwordList.vue b/pages/passwordList/passwordList.vue
index 55d0fe8..bcf00a1 100644
--- a/pages/passwordList/passwordList.vue
+++ b/pages/passwordList/passwordList.vue
@@ -159,11 +159,22 @@ export default {
     },
     async resetPassword() {
       const that = this
+      if(this.passwordList.length === 0) {
+        uni.showToast({
+          title: '暂无密码，无需重置',
+          icon: 'none'
+        })
+        return
+      }
       uni.showModal({
         title: '提示',
         content: '确定要重置密码，该锁的所有密码都将被删除',
         async success(res) {
           if(res.confirm) {
+            uni.showLoading({
+              title: '重置中',
+              mask: true
+            })
             const { code } = await that.resetLockPassword({
               uid: that.userInfo.uid.toString(),
               keyId: that.currentLockInfo.keyId.toString()
@@ -175,6 +186,7 @@ export default {
               })
               console.log('重置密码返回', requestCode, message)
               if(requestCode === 0) {
+                uni.hideLoading()
                 uni.showToast({
                   title: '重置密码成功',
                   icon: 'none'
@@ -185,16 +197,20 @@ export default {
                 })
                 that.getPasswordList(that.passwordSearch)
               } else {
+                uni.hideLoading()
                 uni.showToast({
                   title: message,
                   icon: 'none'
                 })
               }
             } else if(code === -1) {
+              uni.hideLoading()
               uni.showToast({
                 title: '重置密码失败，请保持在锁附近',
                 icon: 'none'
               })
+            } else {
+              uni.hideLoading()
             }
           }
         }