Commit 54f55b15 authored by leiqingsong's avatar leiqingsong

修改

parent 00fc81ed
export function getUserId() { export function getUserId() {
<<<<<<< HEAD
let userInfo = localStorage.getItem('user') let userInfo = localStorage.getItem('user')
if(userInfo){ if(userInfo){
return JSON.parse(userInfo).userId || ''; return JSON.parse(userInfo).userId || '';
...@@ -7,11 +6,4 @@ export function getUserId() { ...@@ -7,11 +6,4 @@ export function getUserId() {
return '' return ''
} }
=======
if (localStorage.getItem("user")) {
return JSON.parse(localStorage.getItem('user')).userId;
} else {
return "";
}
>>>>>>> fda7ecc8c9d2dc436d2ae853fbd549faf9b8cb85
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment