Showing
8 changed files
with
96 additions
and
24 deletions
| @@ -965,9 +965,7 @@ Page({ | @@ -965,9 +965,7 @@ Page({ | ||
| 965 | (reserveDate.getMonth() + 1) + | 965 | (reserveDate.getMonth() + 1) + |
| 966 | "-" + | 966 | "-" + |
| 967 | reserveDate.getDate(); | 967 | reserveDate.getDate(); |
| 968 | - let times=new Date( | ||
| 969 | - reserveTime + " " + temp_ddate | ||
| 970 | - ).getTime() / 1000 | 968 | + let times = this.getNewDate(reserveTime + " " + temp_ddate).getTime() / 1000 |
| 971 | App.Reserve.SetReserveTempDdate({ | 969 | App.Reserve.SetReserveTempDdate({ |
| 972 | rid:this.id, | 970 | rid:this.id, |
| 973 | temp_ddate:times, | 971 | temp_ddate:times, |
| @@ -985,6 +983,17 @@ Page({ | @@ -985,6 +983,17 @@ Page({ | ||
| 985 | } | 983 | } |
| 986 | }) | 984 | }) |
| 987 | }, | 985 | }, |
| 986 | + // ios 部分机型不兼容new Date() 转换字符串 | ||
| 987 | + getNewDate(data) { | ||
| 988 | + if(typeof data === 'string') { | ||
| 989 | + let arr = data.split(/[- : \/]/) | ||
| 990 | + if(arr[1] !== undefined || arr[1] !== null){ | ||
| 991 | + arr[1] = arr[1] - 1 | ||
| 992 | + } | ||
| 993 | + return new Date(...arr) | ||
| 994 | + } | ||
| 995 | + return new Date(data || new Date()) | ||
| 996 | + }, | ||
| 988 | //根据起始时间（获取时间时间段） | 997 | //根据起始时间（获取时间时间段） |
| 989 | computeHour (time1, time2, interval) { | 998 | computeHour (time1, time2, interval) { |
| 990 | //time1 开始时间 time2结束时间 interval间隔时长 | 999 | //time1 开始时间 time2结束时间 interval间隔时长 |
| @@ -920,9 +920,7 @@ Page({ | @@ -920,9 +920,7 @@ Page({ | ||
| 920 | (reserveDate.getMonth() + 1) + | 920 | (reserveDate.getMonth() + 1) + |
| 921 | "-" + | 921 | "-" + |
| 922 | reserveDate.getDate(); | 922 | reserveDate.getDate(); |
| 923 | - let times=new Date( | ||
| 924 | - reserveTime + " " + temp_ddate | ||
| 925 | - ).getTime() / 1000 | 923 | + let times = this.getNewDate(reserveTime + " " + temp_ddate).getTime() / 1000 |
| 926 | App.Reserve.SetReserveTempDdate({ | 924 | App.Reserve.SetReserveTempDdate({ |
| 927 | rid:this.id, | 925 | rid:this.id, |
| 928 | temp_ddate:times, | 926 | temp_ddate:times, |
| @@ -940,6 +938,17 @@ Page({ | @@ -940,6 +938,17 @@ Page({ | ||
| 940 | } | 938 | } |
| 941 | }) | 939 | }) |
| 942 | }, | 940 | }, |
| 941 | + // ios 部分机型不兼容new Date() 转换字符串 | ||
| 942 | + getNewDate(data) { | ||
| 943 | + if(typeof data === 'string') { | ||
| 944 | + let arr = data.split(/[- : \/]/) | ||
| 945 | + if(arr[1] !== undefined || arr[1] !== null){ | ||
| 946 | + arr[1] = arr[1] - 1 | ||
| 947 | + } | ||
| 948 | + return new Date(...arr) | ||
| 949 | + } | ||
| 950 | + return new Date(data || new Date()) | ||
| 951 | + }, | ||
| 943 | //根据起始时间（获取时间时间段） | 952 | //根据起始时间（获取时间时间段） |
| 944 | computeHour (time1, time2, interval) { | 953 | computeHour (time1, time2, interval) { |
| 945 | //time1 开始时间 time2结束时间 interval间隔时长 | 954 | //time1 开始时间 time2结束时间 interval间隔时长 |
| @@ -920,9 +920,7 @@ Page({ | @@ -920,9 +920,7 @@ Page({ | ||
| 920 | (reserveDate.getMonth() + 1) + | 920 | (reserveDate.getMonth() + 1) + |
| 921 | "-" + | 921 | "-" + |
| 922 | reserveDate.getDate(); | 922 | reserveDate.getDate(); |
| 923 | - let times=new Date( | ||
| 924 | - reserveTime + " " + temp_ddate | ||
| 925 | - ).getTime() / 1000 | 923 | + let times = this.getNewDate(reserveTime + " " + temp_ddate).getTime() / 1000 |
| 926 | App.Reserve.SetReserveTempDdate({ | 924 | App.Reserve.SetReserveTempDdate({ |
| 927 | rid:this.id, | 925 | rid:this.id, |
| 928 | temp_ddate:times, | 926 | temp_ddate:times, |
| @@ -940,6 +938,17 @@ Page({ | @@ -940,6 +938,17 @@ Page({ | ||
| 940 | } | 938 | } |
| 941 | }) | 939 | }) |
| 942 | }, | 940 | }, |
| 941 | + // ios 部分机型不兼容new Date() 转换字符串 | ||
| 942 | + getNewDate(data) { | ||
| 943 | + if(typeof data === 'string') { | ||
| 944 | + let arr = data.split(/[- : \/]/) | ||
| 945 | + if(arr[1] !== undefined || arr[1] !== null){ | ||
| 946 | + arr[1] = arr[1] - 1 | ||
| 947 | + } | ||
| 948 | + return new Date(...arr) | ||
| 949 | + } | ||
| 950 | + return new Date(data || new Date()) | ||
| 951 | + }, | ||
| 943 | //根据起始时间（获取时间时间段） | 952 | //根据起始时间（获取时间时间段） |
| 944 | computeHour (time1, time2, interval) { | 953 | computeHour (time1, time2, interval) { |
| 945 | //time1 开始时间 time2结束时间 interval间隔时长 | 954 | //time1 开始时间 time2结束时间 interval间隔时长 |
| @@ -919,9 +919,7 @@ Page({ | @@ -919,9 +919,7 @@ Page({ | ||
| 919 | (reserveDate.getMonth() + 1) + | 919 | (reserveDate.getMonth() + 1) + |
| 920 | "-" + | 920 | "-" + |
| 921 | reserveDate.getDate(); | 921 | reserveDate.getDate(); |
| 922 | - let times=new Date( | ||
| 923 | - reserveTime + " " + temp_ddate | ||
| 924 | - ).getTime() / 1000 | 922 | + let times = this.getNewDate(reserveTime + " " + temp_ddate).getTime() / 1000 |
| 925 | App.Reserve.SetReserveTempDdate({ | 923 | App.Reserve.SetReserveTempDdate({ |
| 926 | rid:this.id, | 924 | rid:this.id, |
| 927 | temp_ddate:times, | 925 | temp_ddate:times, |
| @@ -939,6 +937,17 @@ Page({ | @@ -939,6 +937,17 @@ Page({ | ||
| 939 | } | 937 | } |
| 940 | }) | 938 | }) |
| 941 | }, | 939 | }, |
| 940 | + // ios 部分机型不兼容new Date() 转换字符串 | ||
| 941 | + getNewDate(data) { | ||
| 942 | + if(typeof data === 'string') { | ||
| 943 | + let arr = data.split(/[- : \/]/) | ||
| 944 | + if(arr[1] !== undefined || arr[1] !== null){ | ||
| 945 | + arr[1] = arr[1] - 1 | ||
| 946 | + } | ||
| 947 | + return new Date(...arr) | ||
| 948 | + } | ||
| 949 | + return new Date(data || new Date()) | ||
| 950 | + }, | ||
| 942 | //根据起始时间（获取时间时间段） | 951 | //根据起始时间（获取时间时间段） |
| 943 | computeHour (time1, time2, interval) { | 952 | computeHour (time1, time2, interval) { |
| 944 | //time1 开始时间 time2结束时间 interval间隔时长 | 953 | //time1 开始时间 time2结束时间 interval间隔时长 |
| @@ -875,9 +875,7 @@ Page({ | @@ -875,9 +875,7 @@ Page({ | ||
| 875 | (reserveDate.getMonth() + 1) + | 875 | (reserveDate.getMonth() + 1) + |
| 876 | "-" + | 876 | "-" + |
| 877 | reserveDate.getDate(); | 877 | reserveDate.getDate(); |
| 878 | - let times=new Date( | ||
| 879 | - reserveTime + " " + temp_ddate | ||
| 880 | - ).getTime() / 1000 | 878 | + let times = this.getNewDate(reserveTime + " " + temp_ddate).getTime() / 1000 |
| 881 | App.Reserve.SetReserveTempDdate({ | 879 | App.Reserve.SetReserveTempDdate({ |
| 882 | rid:this.id, | 880 | rid:this.id, |
| 883 | temp_ddate:times, | 881 | temp_ddate:times, |
| @@ -895,6 +893,17 @@ Page({ | @@ -895,6 +893,17 @@ Page({ | ||
| 895 | } | 893 | } |
| 896 | }) | 894 | }) |
| 897 | }, | 895 | }, |
| 896 | + // ios 部分机型不兼容new Date() 转换字符串 | ||
| 897 | + getNewDate(data) { | ||
| 898 | + if(typeof data === 'string') { | ||
| 899 | + let arr = data.split(/[- : \/]/) | ||
| 900 | + if(arr[1] !== undefined || arr[1] !== null){ | ||
| 901 | + arr[1] = arr[1] - 1 | ||
| 902 | + } | ||
| 903 | + return new Date(...arr) | ||
| 904 | + } | ||
| 905 | + return new Date(data || new Date()) | ||
| 906 | + }, | ||
| 898 | //根据起始时间（获取时间时间段） | 907 | //根据起始时间（获取时间时间段） |
| 899 | computeHour (time1, time2, interval) { | 908 | computeHour (time1, time2, interval) { |
| 900 | //time1 开始时间 time2结束时间 interval间隔时长 | 909 | //time1 开始时间 time2结束时间 interval间隔时长 |
| @@ -920,9 +920,7 @@ Page({ | @@ -920,9 +920,7 @@ Page({ | ||
| 920 | (reserveDate.getMonth() + 1) + | 920 | (reserveDate.getMonth() + 1) + |
| 921 | "-" + | 921 | "-" + |
| 922 | reserveDate.getDate(); | 922 | reserveDate.getDate(); |
| 923 | - let times=new Date( | ||
| 924 | - reserveTime + " " + temp_ddate | ||
| 925 | - ).getTime() / 1000 | 923 | + let times = this.getNewDate(reserveTime + " " + temp_ddate).getTime() / 1000 |
| 926 | App.Reserve.SetReserveTempDdate({ | 924 | App.Reserve.SetReserveTempDdate({ |
| 927 | rid:this.id, | 925 | rid:this.id, |
| 928 | temp_ddate:times, | 926 | temp_ddate:times, |
| @@ -940,6 +938,17 @@ Page({ | @@ -940,6 +938,17 @@ Page({ | ||
| 940 | } | 938 | } |
| 941 | }) | 939 | }) |
| 942 | }, | 940 | }, |
| 941 | + // ios 部分机型不兼容new Date() 转换字符串 | ||
| 942 | + getNewDate(data) { | ||
| 943 | + if(typeof data === 'string') { | ||
| 944 | + let arr = data.split(/[- : \/]/) | ||
| 945 | + if(arr[1] !== undefined || arr[1] !== null){ | ||
| 946 | + arr[1] = arr[1] - 1 | ||
| 947 | + } | ||
| 948 | + return new Date(...arr) | ||
| 949 | + } | ||
| 950 | + return new Date(data || new Date()) | ||
| 951 | + }, | ||
| 943 | //根据起始时间（获取时间时间段） | 952 | //根据起始时间（获取时间时间段） |
| 944 | computeHour (time1, time2, interval) { | 953 | computeHour (time1, time2, interval) { |
| 945 | //time1 开始时间 time2结束时间 interval间隔时长 | 954 | //time1 开始时间 time2结束时间 interval间隔时长 |
| @@ -919,9 +919,7 @@ Page({ | @@ -919,9 +919,7 @@ Page({ | ||
| 919 | (reserveDate.getMonth() + 1) + | 919 | (reserveDate.getMonth() + 1) + |
| 920 | "-" + | 920 | "-" + |
| 921 | reserveDate.getDate(); | 921 | reserveDate.getDate(); |
| 922 | - let times=new Date( | ||
| 923 | - reserveTime + " " + temp_ddate | ||
| 924 | - ).getTime() / 1000 | 922 | + let times = this.getNewDate(reserveTime + " " + temp_ddate).getTime() / 1000 |
| 925 | App.Reserve.SetReserveTempDdate({ | 923 | App.Reserve.SetReserveTempDdate({ |
| 926 | rid:this.id, | 924 | rid:this.id, |
| 927 | temp_ddate:times, | 925 | temp_ddate:times, |
| @@ -939,6 +937,17 @@ Page({ | @@ -939,6 +937,17 @@ Page({ | ||
| 939 | } | 937 | } |
| 940 | }) | 938 | }) |
| 941 | }, | 939 | }, |
| 940 | + // ios 部分机型不兼容new Date() 转换字符串 | ||
| 941 | + getNewDate(data) { | ||
| 942 | + if(typeof data === 'string') { | ||
| 943 | + let arr = data.split(/[- : \/]/) | ||
| 944 | + if(arr[1] !== undefined || arr[1] !== null){ | ||
| 945 | + arr[1] = arr[1] - 1 | ||
| 946 | + } | ||
| 947 | + return new Date(...arr) | ||
| 948 | + } | ||
| 949 | + return new Date(data || new Date()) | ||
| 950 | + }, | ||
| 942 | //根据起始时间（获取时间时间段） | 951 | //根据起始时间（获取时间时间段） |
| 943 | computeHour (time1, time2, interval) { | 952 | computeHour (time1, time2, interval) { |
| 944 | //time1 开始时间 time2结束时间 interval间隔时长 | 953 | //time1 开始时间 time2结束时间 interval间隔时长 |
| @@ -956,9 +956,7 @@ Page({ | @@ -956,9 +956,7 @@ Page({ | ||
| 956 | (reserveDate.getMonth() + 1) + | 956 | (reserveDate.getMonth() + 1) + |
| 957 | "-" + | 957 | "-" + |
| 958 | reserveDate.getDate(); | 958 | reserveDate.getDate(); |
| 959 | - let times=new Date( | ||
| 960 | - reserveTime + " " + temp_ddate | ||
| 961 | - ).getTime() / 1000 | 959 | + let times = this.getNewDate(reserveTime + " " + temp_ddate).getTime() / 1000 |
| 962 | App.Reserve.SetReserveTempDdate({ | 960 | App.Reserve.SetReserveTempDdate({ |
| 963 | rid:this.id, | 961 | rid:this.id, |
| 964 | temp_ddate:times, | 962 | temp_ddate:times, |
| @@ -976,6 +974,17 @@ Page({ | @@ -976,6 +974,17 @@ Page({ | ||
| 976 | } | 974 | } |
| 977 | }) | 975 | }) |
| 978 | }, | 976 | }, |
| 977 | + // ios 部分机型不兼容new Date() 转换字符串 | ||
| 978 | + getNewDate(data) { | ||
| 979 | + if(typeof data === 'string') { | ||
| 980 | + let arr = data.split(/[- : \/]/) | ||
| 981 | + if(arr[1] !== undefined || arr[1] !== null){ | ||
| 982 | + arr[1] = arr[1] - 1 | ||
| 983 | + } | ||
| 984 | + return new Date(...arr) | ||
| 985 | + } | ||
| 986 | + return new Date(data || new Date()) | ||
| 987 | + }, | ||
| 979 | //根据起始时间（获取时间时间段） | 988 | //根据起始时间（获取时间时间段） |
| 980 | computeHour (time1, time2, interval) { | 989 | computeHour (time1, time2, interval) { |
| 981 | //time1 开始时间 time2结束时间 interval间隔时长 | 990 | //time1 开始时间 time2结束时间 interval间隔时长 |
-
Please register or login to post a comment