diff --git a/src/store/modules/user.js b/src/store/modules/user.js index abd9c87f..a85b11fd 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -105,8 +105,6 @@ const user = { getInfo().then(res => { const user = res.user - localStorage.setItem('TnMacCode', user.ecomputid); - // const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile4.png") : process.env.VUE_APP_BASE_API + user.avatar; const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile4.png") : user.avatar; diff --git a/src/views/login.vue b/src/views/login.vue index a7f737ac..d81c657b 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -344,7 +344,7 @@ import { encrypt, decrypt } from '@/utils/jsencrypt' import FingerprintJS from '@fingerprintjs/fingerprintjs' // 引入 // const uuidv4 = require("uuid/v4"); // 导入uuid生成插件 -const { v4: uuidv4 } = require('uuid'); +import { v4 as uuidv4 } from 'uuid'; export default { name: "Login", @@ -460,13 +460,16 @@ export default { }, methods: { async initMacId(){ - const fp = await FingerprintJS.load() - const result = await fp.get() - const macCode = result.visitorId - // let TnMacCode=localStorage.getItem('TnMacCode')||''; - // if(TnMacCode==''){ - // TnMacCode=macCode; - // } + // const fp = await FingerprintJS.load() + // const result = await fp.get() + // const macCode = result.visitorId + let macCode=localStorage.getItem('TnMacCode')||''; + if(!macCode){ + macCode=uuidv4().replaceAll('-',''); + localStorage.setItem('TnMacCode',macCode); + } + console.log("==>macCode==>",macCode); + let submitMacCode="202408###"+macCode; // console.log("==>==>",submitMacCode);