|
|
@@ -2,30 +2,60 @@ var Crypto = require('cryptojs.js').Crypto;
|
|
2
|
2
|
var app = getApp();
|
|
3
|
3
|
|
|
4
|
4
|
function formatTime(date, format, isShort) {
|
|
5
|
|
- if (date) {
|
|
6
|
|
- date = new Date(ReplaceAllString(date.toString(),"-","/"));
|
|
7
|
|
- var year = date.getFullYear()
|
|
8
|
|
- var month = date.getMonth() + 1
|
|
9
|
|
- var day = date.getDate()
|
|
|
5
|
+ if (!date) return "";
|
|
|
6
|
+
|
|
|
7
|
+ let dateObj;
|
|
|
8
|
+ if (date instanceof Date) {
|
|
|
9
|
+ dateObj = date;
|
|
|
10
|
+ } else {
|
|
|
11
|
+ // 统一处理日期字符串格式
|
|
|
12
|
+ let dateStr = date.toString();
|
|
|
13
|
+
|
|
|
14
|
+ // 处理包含GMT的格式
|
|
|
15
|
+ if (dateStr.includes('GMT')) {
|
|
|
16
|
+ // 提取日期部分，转换为 yyyy/MM/dd HH:mm:ss 格式
|
|
|
17
|
+ let parts = dateStr.match(/(\w+)\s+(\w+)\s+(\d+)\s+(\d+)\s+(\d+):(\d+):(\d+)/);
|
|
|
18
|
+ if (parts) {
|
|
|
19
|
+ let months = {'Jan':1,'Feb':2,'Mar':3,'Apr':4,'May':5,'Jun':6,
|
|
|
20
|
+ 'Jul':7,'Aug':8,'Sep':9,'Oct':10,'Nov':11,'Dec':12};
|
|
|
21
|
+ let month = months[parts[2]];
|
|
|
22
|
+ dateStr = `${parts[4]}/${formatNumber(month)}/${formatNumber(parts[3])} ${parts[5]}:${parts[6]}:${parts[7]}`;
|
|
|
23
|
+ }
|
|
|
24
|
+ }
|
|
|
25
|
+
|
|
|
26
|
+ // 统一将-转换为/
|
|
|
27
|
+ dateStr = dateStr.replace(/-/g, '/');
|
|
|
28
|
+
|
|
|
29
|
+ // 确保日期格式为 yyyy/MM/dd HH:mm:ss
|
|
|
30
|
+ if (!/^\d{4}\/\d{1,2}\/\d{1,2}/.test(dateStr)) {
|
|
|
31
|
+ return "";
|
|
|
32
|
+ }
|
|
|
33
|
+
|
|
|
34
|
+ dateObj = new Date(dateStr);
|
|
|
35
|
+ }
|
|
10
|
36
|
|
|
11
|
|
- var hour = date.getHours()
|
|
12
|
|
- var minute = date.getMinutes()
|
|
13
|
|
- var second = date.getSeconds()
|
|
|
37
|
+ // 检查日期是否有效
|
|
|
38
|
+ if (isNaN(dateObj.getTime())) {
|
|
|
39
|
+ return "";
|
|
|
40
|
+ }
|
|
14
|
41
|
|
|
15
|
|
- if (!format)
|
|
16
|
|
- format = "/";
|
|
|
42
|
+ var year = dateObj.getFullYear();
|
|
|
43
|
+ var month = dateObj.getMonth() + 1;
|
|
|
44
|
+ var day = dateObj.getDate();
|
|
|
45
|
+ var hour = dateObj.getHours();
|
|
|
46
|
+ var minute = dateObj.getMinutes();
|
|
|
47
|
+ var second = dateObj.getSeconds();
|
|
17
|
48
|
|
|
18
|
|
- if (isShort)
|
|
19
|
|
- return [year, month, day].map(formatNumber).join(format);
|
|
20
|
|
- else
|
|
21
|
|
- return [year, month, day].map(formatNumber).join(format) + ' ' + [hour, minute, second].map(formatNumber).join(':');
|
|
|
49
|
+ if (!format) {
|
|
|
50
|
+ format = "/";
|
|
22
|
51
|
}
|
|
23
|
|
- else
|
|
24
|
|
- return "";
|
|
25
|
|
-}
|
|
26
|
52
|
|
|
27
|
|
-function checkIsArray(obj) {
|
|
28
|
|
- return Object.prototype.toString.call(obj) === '[object Array]';
|
|
|
53
|
+ if (isShort) {
|
|
|
54
|
+ return [year, month, day].map(formatNumber).join(format);
|
|
|
55
|
+ } else {
|
|
|
56
|
+ return [year, month, day].map(formatNumber).join(format) + ' ' +
|
|
|
57
|
+ [hour, minute, second].map(formatNumber).join(':');
|
|
|
58
|
+ }
|
|
29
|
59
|
}
|
|
30
|
60
|
|
|
31
|
61
|
function formatDateCHS(date,isLong) {
|
|
|
@@ -311,26 +341,41 @@ function getStorageValue(obj, name, defaultStatus, callback) {
|
|
311
|
341
|
}
|
|
312
|
342
|
|
|
313
|
343
|
function addDate(interval, number, date) {
|
|
|
344
|
+ const newDate = new Date(date);
|
|
|
345
|
+
|
|
314
|
346
|
switch (interval.toLowerCase()) {
|
|
315
|
347
|
case "y":
|
|
316
|
|
- return new Date(date.setFullYear(date.getFullYear() + number));
|
|
|
348
|
+ newDate.setFullYear(newDate.getFullYear() + number);
|
|
|
349
|
+ break;
|
|
317
|
350
|
case "m":
|
|
318
|
|
- return new Date(date.setMonth(date.getMonth() + number));
|
|
|
351
|
+ newDate.setMonth(newDate.getMonth() + number);
|
|
|
352
|
+ break;
|
|
319
|
353
|
case "d":
|
|
320
|
|
- return new Date(date.setDate(date.getDate() + number));
|
|
|
354
|
+ newDate.setDate(newDate.getDate() + number);
|
|
|
355
|
+ break;
|
|
321
|
356
|
case "w":
|
|
322
|
|
- return new Date(date.setDate(date.getDate() + 7 * number));
|
|
|
357
|
+ newDate.setDate(newDate.getDate() + 7 * number);
|
|
|
358
|
+ break;
|
|
323
|
359
|
case "h":
|
|
324
|
|
- return new Date(date.setHours(date.getHours() + number));
|
|
|
360
|
+ newDate.setHours(newDate.getHours() + number);
|
|
|
361
|
+ break;
|
|
325
|
362
|
case "n":
|
|
326
|
|
- return new Date(date.setMinutes(date.getMinutes() + number));
|
|
|
363
|
+ newDate.setMinutes(newDate.getMinutes() + number);
|
|
|
364
|
+ break;
|
|
327
|
365
|
case "s":
|
|
328
|
|
- return new Date(date.setSeconds(date.getSeconds() + number));
|
|
|
366
|
+ newDate.setSeconds(newDate.getSeconds() + number);
|
|
|
367
|
+ break;
|
|
329
|
368
|
case "l":
|
|
330
|
|
- return new Date(date.setMilliseconds(date.getMilliseconds() + number));
|
|
|
369
|
+ newDate.setMilliseconds(newDate.getMilliseconds() + number);
|
|
|
370
|
+ break;
|
|
|
371
|
+ default:
|
|
|
372
|
+ throw new Error(`不支持的间隔类型: ${interval}`);
|
|
331
|
373
|
}
|
|
|
374
|
+
|
|
|
375
|
+ return newDate;
|
|
332
|
376
|
}
|
|
333
|
377
|
|
|
|
378
|
+
|
|
334
|
379
|
function diffDate(interval, date1, date2) {
|
|
335
|
380
|
var long = date2.getTime() - date1.getTime(); //相差毫秒
|
|
336
|
381
|
switch (interval.toLowerCase()) {
|
|
|
@@ -353,18 +398,23 @@ function diffDate(interval, date1, date2) {
|
|
353
|
398
|
}
|
|
354
|
399
|
}
|
|
355
|
400
|
|
|
356
|
|
-
|
|
357
|
|
-function ReplaceAllString(str, replaceStrFrom, replaceStrTo) {//替换
|
|
358
|
|
- if (str && str.length > 0) {
|
|
359
|
|
- var reg = new RegExp(replaceStrFrom, "g");
|
|
360
|
|
- //console.log(str);
|
|
361
|
|
- return str.toString().replace(reg, replaceStrTo);
|
|
|
401
|
+/**
|
|
|
402
|
+ * 替换字符串中的所有匹配项
|
|
|
403
|
+ * @param {string} str - 需要替换的字符串
|
|
|
404
|
+ * @param {string} replaceStrFrom - 需要被替换的子字符串
|
|
|
405
|
+ * @param {string} replaceStrTo - 替换后的子字符串
|
|
|
406
|
+ * @returns {string} 替换后的字符串
|
|
|
407
|
+ */
|
|
|
408
|
+function ReplaceAllString(str, replaceStrFrom, replaceStrTo) {
|
|
|
409
|
+ if (typeof str === 'string' && typeof replaceStrFrom === 'string' && typeof replaceStrTo === 'string' && str.length > 0) {
|
|
|
410
|
+ const reg = new RegExp(replaceStrFrom, 'g');
|
|
|
411
|
+ return str.replace(reg, replaceStrTo);
|
|
362
|
412
|
}
|
|
363
|
|
- else
|
|
364
|
|
- return str;
|
|
|
413
|
+ return str;
|
|
365
|
414
|
}
|
|
366
|
415
|
|
|
367
|
416
|
|
|
|
417
|
+
|
|
368
|
418
|
function Trim(str) { //删除左右两端的空格
|
|
369
|
419
|
return str.replace(/(^\s*)|(\s*$)/g, "");
|
|
370
|
420
|
}
|
|
|
@@ -473,7 +523,6 @@ module.exports = {
|
|
473
|
523
|
diffDate: diffDate,
|
|
474
|
524
|
Trim: Trim,
|
|
475
|
525
|
IsNumber:IsNumber,
|
|
476
|
|
- checkIsArray: checkIsArray,
|
|
477
|
526
|
formatDateENG: formatDateENG,
|
|
478
|
527
|
formatMoney:formatMoney,
|
|
479
|
528
|
initMonthCalendar:initMonthCalendar
|
