diff --git a/components/Login/Login.vue b/components/Login/Login.vue index 691327e..3ef27b3 100644 --- a/components/Login/Login.vue +++ b/components/Login/Login.vue @@ -10,7 +10,9 @@ import { getUserInfoAction } from '@/api/index.js' - + import { + getToken + } from '@/tool/member.js' const mask_show = ref(true) const login_show = ref(true) @@ -30,10 +32,12 @@ const getUserInfo = () => { login_show.value = true mask_show.value = true - getUserInfoAction((info) => { - login_show.value = false - mask_show.value = false - }, false) + if (getToken()) { + getUserInfoAction((info) => { + login_show.value = false + mask_show.value = false + }, false) + } } defineExpose({ diff --git a/pages/main/user/user.vue b/pages/main/user/user.vue index 1abacbd..cd05ed1 100644 --- a/pages/main/user/user.vue +++ b/pages/main/user/user.vue @@ -9,9 +9,14 @@ } from 'vue' import config from '@/config.js' import { + getToken, delToken } from '@/tool/member.js' + import { + getUserInfoAction + } from '@/api/index.js' const login_ref = ref(null) + const user_info = ref(false) const loginRef = (e) => { login_ref.value = e } @@ -19,38 +24,88 @@ delToken() login_ref.value.getUserInfo() } + + import { + onShow + } from '@dcloudio/uni-app' + + onShow(() => { + getUserInfo() + }) + + const getUserInfo = () => { + if (getToken()) { + getUserInfoAction((info) => { + user_info.value = info + }, false) + } + } +