dos

Public/static/js/common.js

@@ -69,13 +69,7 @@ let noInfo = {
 let createPosterLock = false;
 $('.loading-page').show();
 preloadimages(preloadImageList, function () {
-    const timestamp = timest();
-    if(timestamp > 1584633600)
-    {
-        $('.loading-page').hide();
-        $('.end-page').show();
-        return;
-    }
+
     let progress = 0.3;
     let timer = setInterval(function () {
         if (progress < 1) {
@@ -84,13 +78,20 @@ preloadimages(preloadImageList, function () {
             $('.loading-page .progress').css('width', 368 * progress + 'px');
             $('.loading-page .plant').css('transform', 'translateX(' + (-368 + (368 * progress)) + 'px)');
         } else {
+
+
             clearInterval(timer);
+            const timestamp = timest();
+
             if (browser.versions.weixin) {
                 let musicTime = setInterval(function () {
                     if ($('#music')[0].currentTime > 0) {
                         initPage();
                         $('.loading-page').hide();
                         $('.page1').show();
+                        if (timestamp > 1584633600) {
+                            $('.end-page').show();
+                        }
                         clearInterval(musicTime);
                     }
                 }, 100);
@@ -98,6 +99,9 @@ preloadimages(preloadImageList, function () {
                 initPage();
                 $('.loading-page').hide();
                 $('.page1').show();
+                if (timestamp > 1584633600) {
+                    $('.end-page').show();
+                }
             }
         }
     }, 60);
@@ -576,7 +580,7 @@ function checkIt(bind, maxNum) {
 }
 
 function timest() {
-    var tmp = Date.parse( new Date() ).toString();
-    tmp = tmp.substr(0,10);
+    var tmp = Date.parse(new Date()).toString();
+    tmp = tmp.substr(0, 10);
     return tmp;
-  }
\ No newline at end of file
+}
\ No newline at end of file