Commit f9799cd4446dfebc1327a5329675d2b7771d243e
1 parent
6b147281
修复时间格式不支持ios问题
Showing
1 changed file
with
2 additions
and
0 deletions
ruoyi-ui/src/utils/ruoyi.js
| @@ -17,6 +17,8 @@ export function parseTime(time, pattern) { | @@ -17,6 +17,8 @@ export function parseTime(time, pattern) { | ||
| 17 | } else { | 17 | } else { |
| 18 | if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { | 18 | if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { |
| 19 | time = parseInt(time) | 19 | time = parseInt(time) |
| 20 | + } else if (typeof time === 'string') { | ||
| 21 | + time = time.replace(new RegExp(/-/gm), '/'); | ||
| 20 | } | 22 | } |
| 21 | if ((typeof time === 'number') && (time.toString().length === 10)) { | 23 | if ((typeof time === 'number') && (time.toString().length === 10)) { |
| 22 | time = time * 1000 | 24 | time = time * 1000 |