Authored by 陈轩

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

@@ -17,7 +17,8 @@ var nowTime = 0; @@ -17,7 +17,8 @@ var nowTime = 0;
17 17
18 var startTime = 0; 18 var startTime = 0;
19 19
20 -var endTime = 0; 20 +var endTime = 0,
  21 + diffTime = 0;// 误差时间
21 22
22 var dateText = 0, 23 var dateText = 0,
23 newDate = 0, 24 newDate = 0,
@@ -183,7 +184,11 @@ $( @@ -183,7 +184,11 @@ $(
183 184
184 endTime = data.endTime; 185 endTime = data.endTime;
185 186
186 - nowTime = Date.parse(new Date()) / 1000; 187 + diffTime = data.currentTime;
  188 +
  189 + // nowTime = Date.parse(new Date()) / 1000;
  190 +
  191 + nowTime = diffTime;// 使用请求服务器时间作为当前时间
187 192
188 if (startTime > nowTime) { 193 if (startTime > nowTime) {
189 offsetTime = startTime - nowTime; 194 offsetTime = startTime - nowTime;