Skip to content

X
XiTianSenMall
Commit d75adae2 authored by leiqingsong's avatar leiqingsong
Browse files
Options

Merge branch 'dev_lqs' into 'master' 

Dev lqs

See merge request !46
parents ff4d4a1a 54f55b15
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
H5/src/utils/localGetter.js
View file @ d75adae2
export function getUserId() {
<<<<<<< HEAD
let userInfo = localStorage.getItem('user')
if(userInfo){
return JSON.parse(userInfo).userId || '';
......@@ -7,11 +6,4 @@ export function getUserId() {
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