From d036a91f6d1f70acbaa3cda520904f37616d796e Mon Sep 17 00:00:00 2001
From: zernonia <59365435+zernonia@users.noreply.github.com>
Date: Thu, 5 Oct 2023 21:08:07 +0800
Subject: [PATCH] fix: 12am changed to 12pm wrongly (#4451)

* fix: 12am changed to 12pm wrongly

* fix: conditional
---
 components/lib/calendar/Calendar.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/lib/calendar/Calendar.vue b/components/lib/calendar/Calendar.vue
index d8d0668ad..34c714399 100755
--- a/components/lib/calendar/Calendar.vue
+++ b/components/lib/calendar/Calendar.vue
@@ -1803,6 +1803,8 @@ export default {
             } else {
                 if (this.hourFormat == '12' && h !== 12 && this.pm) {
                     h += 12;
+                } else if (this.hourFormat == '12' && h == 12 && !this.pm) {
+                    h = 0;
                 }
 
                 return { hour: h, minute: m, second: s };