Michael Wang преди 5 години
родител
ревизия
375acd381d
променени са 2 файла, в които са добавени 17 реда и са изтрити 3 реда
  1. 1 0
      src/features/Login/Login.vue
  2. 16 3
      src/utils/ua.js

+ 1 - 0
src/features/Login/Login.vue

@@ -378,6 +378,7 @@ export default {
         "sdu.ecs.qmth.com.cn",
         "sdu.ecs.qmth.com.cn",
       ].includes(this.$route.params.domain)
       ].includes(this.$route.params.domain)
     ) {
     ) {
+      // console.log(UA.getBrowser(), chromeUA);
       if (
       if (
         UA.getBrowser().name !== "electron-exam-shell" ||
         UA.getBrowser().name !== "electron-exam-shell" ||
         UA.getBrowser().major !== "2" ||
         UA.getBrowser().major !== "2" ||

+ 16 - 3
src/utils/ua.js

@@ -5,14 +5,27 @@ const examShellRegex = [
   [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION],
   [UAParser.BROWSER.NAME, UAParser.BROWSER.VERSION],
 ];
 ];
 export default new UAParser(
 export default new UAParser(
-  null,
+  navigator.userAgent,
   // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_0) AppleWebKit/537.36 (KHTML, like Gecko) electron-exam-shell/2.0.0 Chrome/77.0.3865.120 Safari/537.36 ",
   // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_0) AppleWebKit/537.36 (KHTML, like Gecko) electron-exam-shell/2.0.0 Chrome/77.0.3865.120 Safari/537.36 ",
   { browser: examShellRegex }
   { browser: examShellRegex }
 );
 );
 
 
 export const chromeUA = new UAParser(
 export const chromeUA = new UAParser(
-  navigator.userAgent.replace("electron-exam-shell", ""),
-  { browser: examShellRegex }
+  navigator.userAgent.replace("electron-exam-shell/", ""),
+  null
 ).getBrowser();
 ).getBrowser();
 
 
+// const UA = new UAParser(
+//   // null,
+//   "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_0) AppleWebKit/537.36 (KHTML, like Gecko) electron-exam-shell/2.0.0 Chrome/76.0.3809.139 Electron/6.0.7 Safari/537.36",
+//   // navigator.userAgent,
+//   { browser: examShellRegex }
+// );
 // console.log(UA.getResult());
 // console.log(UA.getResult());
+
+// window.UA = new UAParser(
+//   // null,
+//   navigator.userAgent,
+//   // "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_0) AppleWebKit/537.36 (KHTML, like Gecko) electron-exam-shell/2.0.0 Chrome/77.0.3865.120 Safari/537.36 ",
+//   { browser: examShellRegex }
+// );