浏览代码

fix:mac地址相关逻辑bug修改

chenzhen2 1 年之前
父节点
当前提交
d0cbb4b4e1
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 1 0
      src/permission.ts
  2. 5 1
      src/utils/cookies.ts

+ 1 - 0
src/permission.ts

@@ -13,6 +13,7 @@ router.beforeEach(async (to: RouteLocationNormalized, _: RouteLocationNormalized
   let macAdr: string = getUrlParams('mac')
   if (macAdr && macAdr != "null" && macAdr != "NULL") {
     setCookieMac(macAdr)
+    localStorage.setItem('mac', macAdr)
   }
   await store.dispatch(UserActionTypes.ACTION_GET_USER_INFO, undefined)
   next()

+ 5 - 1
src/utils/cookies.ts

@@ -12,7 +12,11 @@ export const removeToken = () => Cookies.remove(Keys.tokenKey)
 export const setCookieUserInfo = (userInfo: any) => Cookies.set(Keys.userInfoKey, userInfo)
 export const setCookieMac = (mac: any) => Cookies.set(Keys.macKey, mac)
 export const getCookieMac = () => {
-  return Cookies.get(Keys.macKey)
+  let mac: any = Cookies.get(Keys.macKey)
+  if (!mac) {
+    mac = localStorage.getItem('mac')
+  }
+  return mac
 }
 export const getCookieUserInfo = () => {
   let userInfo: any = Cookies.get(Keys.userInfoKey)