This commit is contained in:
kuaifan 2022-03-03 14:35:21 +08:00
parent 8e72794c07
commit 16af625aef
3 changed files with 4 additions and 4 deletions

View File

@ -102,7 +102,7 @@
* @returns {*|string} * @returns {*|string}
*/ */
formatTime(date) { formatTime(date) {
let time = Math.round($A.Date(date).getTime() / 1000), let time = $A.Date(date, true),
string = ''; string = '';
if ($A.formatDate('Ymd') === $A.formatDate('Ymd', time)) { if ($A.formatDate('Ymd') === $A.formatDate('Ymd', time)) {
string = $A.formatDate('H:i', time) string = $A.formatDate('H:i', time)
@ -160,7 +160,7 @@
} else if (time < 0) { } else if (time < 0) {
return '-' + this.formatSeconds(time * -1); return '-' + this.formatSeconds(time * -1);
} else if (time == 0) { } else if (time == 0) {
return 0; return 0 + 's';
} }
return this.formatTime(date) return this.formatTime(date)
}, },

View File

@ -238,7 +238,7 @@ export default {
const {times} = this.addData; const {times} = this.addData;
let temp = $A.date2string(times, "Y-m-d H:i"); let temp = $A.date2string(times, "Y-m-d H:i");
if (temp[0] && temp[1]) { if (temp[0] && temp[1]) {
let d = Math.ceil(($A.Date(temp[1]).getTime() - $A.Date(temp[0]).getTime()) / 86400000); let d = Math.ceil(($A.Date(temp[1], true) - $A.Date(temp[0], true)) / 86400);
if (d > 0) { if (d > 0) {
return d; return d;
} }

View File

@ -266,7 +266,7 @@ export default {
}, },
completeAtFormat(date) { completeAtFormat(date) {
let time = Math.round($A.Date(date).getTime() / 1000); let time = $A.Date(date, true);
if ($A.formatDate('Y') === $A.formatDate('Y', time)) { if ($A.formatDate('Y') === $A.formatDate('Y', time)) {
return $A.formatDate('m-d H:i', time) return $A.formatDate('m-d H:i', time)
} else { } else {