|
@@ -1,5 +1,5 @@
|
|
const globalData = {
|
|
const globalData = {
|
|
- version:'3.0.17',
|
|
|
|
|
|
+ version:'3.1.0',
|
|
|
|
|
|
imgUrl:'https://edu-mp-img-1254259530.cos.ap-nanjing.myqcloud.com',
|
|
imgUrl:'https://edu-mp-img-1254259530.cos.ap-nanjing.myqcloud.com',
|
|
publicUrl: 'https://sqdx.jiaxintech.com'//测试地址
|
|
publicUrl: 'https://sqdx.jiaxintech.com'//测试地址
|
|
@@ -44,9 +44,10 @@ const timeFilter=function(date){
|
|
|
|
|
|
|
|
|
|
const timeFmt= function(str,fmt){
|
|
const timeFmt= function(str,fmt){
|
|
-
|
|
|
|
- let d=new Date(str)
|
|
|
|
-
|
|
|
|
|
|
+ let trexp=str.replace(/([0-9\-]+)[\s]+([0-9:+])/g,function(){return arguments[1]+"T"+arguments[2]})
|
|
|
|
+ let d=new Date(trexp!=""?trexp:str)
|
|
|
|
+ console.log("str:",str)
|
|
|
|
+ console.log(d);
|
|
let o = {
|
|
let o = {
|
|
"M+" : d.getMonth()+1, //月份
|
|
"M+" : d.getMonth()+1, //月份
|
|
"d+" : d.getDate(), //日
|
|
"d+" : d.getDate(), //日
|
|
@@ -57,11 +58,11 @@ const timeFmt= function(str,fmt){
|
|
"S" : d.getMilliseconds() //毫秒
|
|
"S" : d.getMilliseconds() //毫秒
|
|
};
|
|
};
|
|
if(/(y+)/.test(fmt))
|
|
if(/(y+)/.test(fmt))
|
|
- fmt=fmt.replace(RegExp.$1, (d.getFullYear()+"").substr(4 - RegExp.$1.length));
|
|
|
|
-for(var k in o)
|
|
|
|
- if(new RegExp("("+ k +")").test(fmt))
|
|
|
|
-fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
|
|
|
|
-return fmt;
|
|
|
|
|
|
+ fmt=fmt.replace(RegExp.$1, (d.getFullYear()+"").substr(4 - RegExp.$1.length));
|
|
|
|
+ for(var k in o)
|
|
|
|
+ if(new RegExp("("+ k +")").test(fmt))
|
|
|
|
+ fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
|
|
|
|
+ return fmt;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|