Browse Source

Ios 和安卓时间适配

zhengkaixin 4 năm trước cách đây
mục cha
commit
4cf79e50bb

+ 2 - 2
src/projects/business/views/Master/Attendance/LeaveInfo.vue

@@ -120,8 +120,8 @@ export default {
                 id: this.id
             }).then(response => {
                 this.detail = response;
-                var startTime=this.detail.startTime.replace('年','-').replace('月','-').replace('日','');
-                var endTime=this.detail.endTime.replace('年','-').replace('月','-').replace('日','');
+                var startTime=this.detail.startTime.replace('年','/').replace('月','/').replace('日','');
+                var endTime=this.detail.endTime.replace('年','/').replace('月','/').replace('日','');
 
                 var i=  daysDistance(startTime,endTime);
                 var day=i+(this.detail.endTimeQuantum-this.detail.startTimeQuantum)*0.5+0.5

+ 2 - 2
src/projects/business/views/Master/Attendance/VerifyLeaveInfo.vue

@@ -155,8 +155,8 @@
 					id: this.id
 				}).then(response => {
 					this.detail = response;
-                    var startTime=this.detail.startTime.replace('年','-').replace('月','-').replace('日','');
-                    var endTime=this.detail.endTime.replace('年','-').replace('月','-').replace('日','');
+                    var startTime=this.detail.startTime.replace('年','/').replace('月','/').replace('日','');
+                    var endTime=this.detail.endTime.replace('年','/').replace('月','/').replace('日','');
 
                     var i=  daysDistance(startTime,endTime);
                     var day=i+(this.detail.endTimeQuantum-this.detail.startTimeQuantum)*0.5+0.5

+ 8 - 2
src/utils/index.js

@@ -44,13 +44,19 @@ export const secondsDistance = (date) => {
 
 //计算两个时间的相差天数
 export const daysDistance = (date1, date2) => {
-	date1 = Date.parse(date1);
-	date2 = Date.parse(date2);
+	date1 = Date.parse(replaceTime(date1));
+	date2 = Date.parse(replaceTime(date2));
 	var ms = date2 - date1;
 	ms = ms < 0 ? 0 : ms;
 	var days = parseInt(Math.floor(ms / (24 * 3600 * 1000)));
 	return days;
 }
+function replaceTime(time) {
+	if(time==null){
+        return time;
+	}
+    return  time.replace(/\-/g,"\/");
+}
 //计算两个时间的相差小时数
 export const hourDistanceArr = (date1, date2) => {
 	if (!date1 || !date2) {