Authored by 陈轩

Merge remote-tracking branch 'origin/release/5.1' into release/5.1

... ... @@ -17,7 +17,8 @@ var nowTime = 0;
var startTime = 0;
var endTime = 0;
var endTime = 0,
diffTime = 0;// 误差时间
var dateText = 0,
newDate = 0,
... ... @@ -183,7 +184,11 @@ $(
endTime = data.endTime;
nowTime = Date.parse(new Date()) / 1000;
diffTime = data.currentTime;
// nowTime = Date.parse(new Date()) / 1000;
nowTime = diffTime;// 使用请求服务器时间作为当前时间
if (startTime > nowTime) {
offsetTime = startTime - nowTime;
... ...