时间字段控制

pages/index/index.vue

@@ -261,6 +261,7 @@
 	import MapLoader from '@/utils/AMap'
 	import Tabbar from '@/components/Tabbar.vue'
 	import {
+		newDate,
 		secondsDistance,
 		hourDistanceArr
 	} from '@/utils'
@@ -482,7 +483,7 @@
 					var  okbtn="前往注册"
 					var endTime=res.data.activityInfo.endTime;
 					
-					if(endTime&&secondsDistance(endTime)>0){
+					if(endTime&&secondsDistance(newDate(endTime))>0){
 						name="活动已结束"
 						okbtn="继续注册"
 						title="提示"

pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -114,7 +114,8 @@
 	import * as loginApi from '@/apis/login.js'
 
 	import QRCode from 'qrcodejs2'
-	import {
+	import {
+		newDate,
 		convertCanvasToImage,
 	} from '@/utils'
 	import {
@@ -203,7 +204,7 @@
 				
 				if(userCard){
 					var date=new Date().getTime()
-					var date2=new Date(userCard.endTime.replaceAll('-','/')).getTime();
+					var date2=newDate(userCard.endTime).getTime();
 					if(date<date2){
 						return true;
 					}

pages/searchPile/chargeProcess/dcCharging.vue

@@ -301,7 +301,8 @@
 	import * as API_weixin from '@/apis/weixin.js'
 	import * as userAPI from '@/apis/user.js'
 	
-	import {
+	import {
+		newDate,
 		secondsDistance,
 		hourDistanceArr
 	} from '@/utils'
@@ -482,7 +483,7 @@
 				var Fen=0;
 				var S=0;
 				if (this.chargingRecord.status == 1) {
-					var second = secondsDistance(this.chargingRecord.startTime);
+					var second = secondsDistance(newDate(this.chargingRecord.startTime));
 				
 				var ms=second;
 				
@@ -554,13 +555,7 @@
 						
 						if (this.chargingRecord.status == 1) {
 							this.percent=this.chargingGun.soc
-							// var second = secondsDistance(this.chargingRecord.startTime);
-							// var percent = (second / 60) / this.chargingRecord.estimateMinute * 100;
-							// //(this.percent)
-							// var sum=this.chargingGun.chargeTimeSec/60+this.chargingGun.remainMin;
-							// if(sum){
-							// 	this.percent=this.chargingGun.chargeTimeSec/60/sum*100	
-							// }
+							
 							
 						}
 					}else if(this.chargingGun.gunType==2){

utils/index.js

@@ -2,7 +2,7 @@ export const currentTimeStamp = () => new Date().getTime()
 
 export const unixTimeStamp = (val) => new Date(val).getTime()
 
-//今天多少天之前的时间
+// 苹果手机时间显示bug 
 export const newDate = (date) => {
 	var time=null;
 	if (date) {
@@ -52,7 +52,7 @@ export const afterYearTimeStamp = (yearCount, date) => {
 //计算某日期距当前的时间秒数
 export const secondsDistance = (date) => {
 	var now = new Date().getTime();
-	date = new Date(date.replaceAll('-','/')).getTime();
+	date = new Date(date).getTime();
 	var seconds = parseInt((now - date) / 1000);
 	return seconds;
 }