diff --git a/uniapp/src/pages/login/login.vue b/uniapp/src/pages/login/login.vue index 8e3eea39..14865787 100644 --- a/uniapp/src/pages/login/login.vue +++ b/uniapp/src/pages/login/login.vue @@ -245,6 +245,7 @@ import wechatOa, { UrlScene } from '@/utils/wechat' // #endif import { onLoad, onShow } from '@dcloudio/uni-app' import { computed, reactive, ref, shallowRef, watch } from 'vue' +import { storeToRefs } from 'pinia' enum LoginWayEnum { ACCOUNT = 1, @@ -258,7 +259,8 @@ isWeixin.value = isWeixinClient() const route = useRoute() const router = useRouter() -const userStore = useUserStore() +const userStore = useUserStore() +const { userInfo, isLogin } = storeToRefs(userStore) const appStore = useAppStore() const showModel = ref(false) const uCodeRef = shallowRef() @@ -329,7 +331,8 @@ const loginFun = async () => { uni.hideLoading() uni.$u.toast(error) } -} +} + const loginHandle = async (data: any) => { const { token, mobile } = data @@ -467,7 +470,6 @@ onLoad(async () => { const data = await oaLogin(options) if (data) { loginData.value = data - loginHandle(loginData.value) } } @@ -479,7 +481,10 @@ onLoad(async () => { wechatOa.setAuthData() } //#endif -}) +}) +if (isLogin.value == true) { + window.location.href = '/mobile/pages/user/user' +}