Merge branch 'jenkins' of http://git.dayaedu.com/lex/classroom-instruments into jenkins

index.html

@@ -177,20 +177,6 @@
     }
     (function (window) {
 
-<<<<<<< HEAD
-      if ('serviceWorker' in navigator) {
-        let refreshing = false
-        let flag = caches.keys().length > 0
-        console.log(caches.keys(), `0903是否有缓存${flag}`);
-        caches.keys().then(function (cacheNames) {
-          cacheNames.forEach(function (cacheName) {
-            caches.delete(cacheName);
-          });
-          if (flag) {
-            window.location.reload()
-          }
-        });
-=======
       // if ('serviceWorker' in navigator) {
       //   // let refreshing = false
       //   let flag = caches.keys().length > 0
@@ -203,7 +189,6 @@
       //       window.location.reload()
       //     }
       //   });
->>>>>>> startLogin
 
       //   // 尝试监听install