From ad1d857bf204d3e651e7d11b83b7de65b2f8bde0 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:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=99=90=E6=97=B6=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84=E5=88=86=E9=92=9F=E4=B8=8D=E5=8F=AF=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LockDatetimePicker/LockDatetimePicker.vue    | 16 ++++++++++++++--
 pages/createPassword/createPassword.vue          |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/components/LockDatetimePicker/LockDatetimePicker.vue b/components/LockDatetimePicker/LockDatetimePicker.vue
index 5a2219e..911b896 100644
--- a/components/LockDatetimePicker/LockDatetimePicker.vue
+++ b/components/LockDatetimePicker/LockDatetimePicker.vue
@@ -6,7 +6,8 @@
         {{ timeFormat(time, 'yyyy-mm-dd h:M') }}
       </view>
     </view>
-    <up-datetime-picker itemHeight="60" :minDate="minDate" :title="placeholder" :show="show" v-model="time"
+    <up-datetime-picker :filter="filter" itemHeight="60" :minDate="minDate" :title="placeholder" :show="show"
+                        v-model="time"
                         mode="datetime" @confirm="confirm" :closeOnClickOverlay="true"
                         @close="close"></up-datetime-picker>
   </view>
@@ -21,7 +22,11 @@ export default {
     title: String,
     value: Number,
     minDate: Number,
-    placeholder: String
+    placeholder: String,
+    type: {
+      type: String,
+      default: 'datetime'
+    }
   },
   data() {
     return {
@@ -34,6 +39,13 @@ export default {
   },
   methods: {
     timeFormat,
+    filter(mode, options) {
+      if (mode === 'minute' && this.type === 'datehour') {
+        return options.filter((option) => option === '00')
+      }
+
+      return options
+    },
     changeShow() {
       this.show = !this.show
     },
diff --git a/pages/createPassword/createPassword.vue b/pages/createPassword/createPassword.vue
index dd1dfad..e45b153 100644
--- a/pages/createPassword/createPassword.vue
+++ b/pages/createPassword/createPassword.vue
@@ -19,7 +19,7 @@
         <LockInput :value="temporaryName" title="名称" placeholder="给密码命名"
                    @changeInput="changeTemporaryInput"></LockInput>
         <view style="margin-top: 20rpx">
-          <LockDatetimePicker title="失效时间" :value="temporaryTime" :minDate="minDate"
+          <LockDatetimePicker title="失效时间" :value="temporaryTime" :minDate="minDate" type="datehour"
                               placeholder="请选择失效时间" @changeTime="changeTemporaryTime"></LockDatetimePicker>
         </view>
         <view class="text">{{ text }}</view>