fix: some bug

src/main.ts

@@ -6,7 +6,7 @@ import { setupStore } from "/@/store";
 import { useElementPlus } from "../src/plugins/element-plus";
 import { useTable } from "../src/plugins/vxe-table";
 import { usI18n } from "../src/plugins/i18n";
-import "element-plus/dist/index.css";
+
 // 导入公共样式
 import "./style/index.scss";
 // 导入字体图标

src/plugins/element-plus/index.ts

@@ -32,6 +32,7 @@ import {
   ElRadioButton,
   ElRadioGroup
 } from "element-plus";
+import "element-plus/dist/index.css";
 
 const components = [
   ElAffix,

src/router/index.ts

@@ -120,13 +120,12 @@ export function resetRouter() {
 
 import NProgress from "../utils/progress";
 
-// const whiteList = ["/login", "/register"];
+const whiteList = ["/login", "/register"];
 
 router.beforeEach((to, _from, next) => {
   const name = storageSession.getItem("info");
   NProgress.start();
   const { t } = i18n.global;
-  // @ts-ignore
   to.meta.title ? (document.title = t(to.meta.title)) : ""; // 动态title
   if (name) {
     if (_from?.name) {
@@ -140,7 +139,11 @@ router.beforeEach((to, _from, next) => {
     }
   } else {
     if (to.path !== "/login") {
-      next({ path: "/login" });
+      if (whiteList.indexOf(to.path) !== -1) {
+        next();
+      } else {
+        next({ path: "/login" });
+      }
     } else {
       next();
     }

src/router/modules/remaining.ts

@@ -21,20 +21,6 @@ const remainingRouter = [
       rank: 102
     }
   },
-  // {
-  //   // 找不到路由重定向到404页面
-  //   path: "/:pathMatch(.*)",
-  //   name: "pathMatch",
-  //   component: Layout,
-  //   redirect: "/error/404",
-  //   meta: {
-  //     icon: "el-icon-s-home",
-  //     title: "message.hshome",
-  //     showLink: false,
-  //     savedPosition: false,
-  //     rank: 103,
-  //   },
-  // },
   {
     path: "/redirect",
     name: "redirect",

src/utils/deviceDetection/index.ts

@@ -2,6 +2,11 @@ interface deviceInter {
   match: Fn;
 }
 
+interface BrowserInter {
+  browser: string;
+  version: string;
+}
+
 // 检测设备类型(手机返回true,反之)
 export const deviceDetection = () => {
   const sUserAgent: deviceInter = navigator.userAgent.toLowerCase();
@@ -17,3 +22,16 @@ export const deviceDetection = () => {
     bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM
   );
 };
+
+// 获取浏览器型号以及版本
+export const getBrowserInfo = () => {
+  const ua = navigator.userAgent.toLowerCase();
+  const re = /(msie|firefox|chrome|opera|version).*?([\d.]+)/;
+  const m = ua.match(re);
+  const Sys: BrowserInter = {
+    browser: m[1].replace(/version/, "'safari"),
+    version: m[2]
+  };
+
+  return Sys;
+};