|
@@ -17,19 +17,20 @@ export const diff = (dt1, dt2) => {
|
17
|
17
|
return [bw, day, hour, min, sec]
|
18
|
18
|
}
|
19
|
19
|
|
20
|
|
-let systemInfo = null;
|
|
20
|
+export function getDateByStr(dtStr) {
|
|
21
|
+ if (!dtStr) return undefined;
|
|
22
|
+
|
|
23
|
+ const t = dtStr.split(/[-T :]/);
|
|
24
|
+
|
|
25
|
+ return new Date(t[0], t[1]-1, t[2], t[3] || 0, t[4] || 0, t[5] || 0)
|
|
26
|
+}
|
21
|
27
|
|
22
|
28
|
//例子 getDateFormat(new Date().valueOf(),true,'yyyy/M/d')
|
23
|
29
|
export function formatDate(dt, fmt) {
|
24
|
30
|
if (!dt) return dt;
|
25
|
31
|
|
26
|
|
- if (!systemInfo) {
|
27
|
|
- systemInfo = Taro.getSystemInfoSync()
|
28
|
|
- }
|
29
|
|
-
|
30
|
32
|
// 解决苹果手机不能正常初始化的问题
|
31
|
|
- const dtStr = systemInfo.system.indexOf('iOS') > -1 && typeof dt === 'string' ? dt.replace(/-/g, "/") : dt;
|
32
|
|
- const date = new Date(dtStr)
|
|
33
|
+ const date = typeof dt === 'string' ? getDateByStr(dt) : new Date(dt);
|
33
|
34
|
|
34
|
35
|
var o = {
|
35
|
36
|
"M+": date.getMonth() + 1, //月份
|