xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

时间问题

Browse Source
This commit is contained in:
luying
2022-08-29 16:39:07 +08:00
parent 9da78b5497
commit 0a57b2f00c
6 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shared/pubUtils/timeUtil.ts
View File

@@ -305,7 +305,7 @@ class Time {
public getAfterDayWithHour(day: number = 0, hour = REFRESH_TIME, minute = 0, seconds = 0) {
let t = this._setHour(this.time.getTime(), hour, minute, seconds, 0);
// console.log(t.getTime(), this.time.getTime());
if(this.time.getTime() >= t.getTime()) {
if(this.time.getTime() > t.getTime()) {
let timestamp = t.getTime() + (day + 1) * this.DAY_TO_MS;
return this._returnResult(timestamp);
} else {

12
shared/pubUtils/util.ts
View File

@@ -118,10 +118,14 @@ export function decodeIdCntArrayStr(str: string, multi: number) {
* @param preTime 之前的时间
* @param proTime 之后的时间
*/
export function deltaDays(preTime: Date, proTime: Date): number {
let beginZeroPoint = getZeroPointOfTimeD(preTime);
let endZeroPoint = getZeroPointOfTimeD(proTime);
return moment(endZeroPoint).diff(moment(beginZeroPoint), "days");
export function deltaDays(preTime: Date, proTime: Date, useNaturalZero = false): number {
if(useNaturalZero) {
return moment(proTime).diff(moment(preTime), "days");
} else {
let beginZeroPoint = getZeroPointOfTimeD(preTime);
let endZeroPoint = getZeroPointOfTimeD(proTime);
return moment(endZeroPoint).diff(moment(beginZeroPoint), "days");
}
}
/**