From 68ae0e6a2dc077d8b85187ee3dbee4b87a6c9b90 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 21 三月 2024 18:02:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/visitorApplication/visitorApplication.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index bdf5b0a..ecc0b4f 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -107,8 +107,8 @@
<u-datetime-picker
v-if="form1.starttime"
:show="show5"
- :minDate="new Date(form1.starttime).getTime()"
- :maxDate="new Date(maxTime).getTime()"
+ :minDate="formatTimeStamp(form1.starttime)"
+ :maxDate="formatTimeStamp(maxTime)"
mode="datetime"
@cancel="show5 = false"
@confirm="setoutDate"
@@ -619,6 +619,9 @@
this.form1.endtime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM');
this.show5 = false
},
+ formatTimeStamp(date) {
+ return Date.parse(new Date(`${date}`)) || Date.parse(new Date(`${date.replace(/-/g,'/')}`))
+ },
// 鏌ヨ鐢ㄦ埛
getUser() {
if (this.verify === '0') {
--
Gitblit v1.9.3