登录修改

parent b3563247
...@@ -18,6 +18,8 @@ declare module 'vue' { ...@@ -18,6 +18,8 @@ declare module 'vue' {
VanList: typeof import('vant/es')['List'] VanList: typeof import('vant/es')['List']
VanPopup: typeof import('vant/es')['Popup'] VanPopup: typeof import('vant/es')['Popup']
VanPullRefresh: typeof import('vant/es')['PullRefresh'] VanPullRefresh: typeof import('vant/es')['PullRefresh']
VanSearch: typeof import('vant/es')['Search']
VanSticky: typeof import('vant/es')['Sticky']
VanTab: typeof import('vant/es')['Tab'] VanTab: typeof import('vant/es')['Tab']
VanTabs: typeof import('vant/es')['Tabs'] VanTabs: typeof import('vant/es')['Tabs']
VanTextEllipsis: typeof import('vant/es')['TextEllipsis'] VanTextEllipsis: typeof import('vant/es')['TextEllipsis']
......
...@@ -8,7 +8,7 @@ onLaunch(async () => { ...@@ -8,7 +8,7 @@ onLaunch(async () => {
// #ifdef H5-SGY // #ifdef H5-SGY
if (import.meta.env.VITE_APP_ENV === 'production') { if (import.meta.env.VITE_APP_ENV === 'production') {
userStore.logout() userStore.logout()
fastLoginBySgy() await fastLoginBySgy()
return return
} else { } else {
if (userStore.logout) await signIn2(); if (userStore.logout) await signIn2();
......
...@@ -103,7 +103,8 @@ const login = async () => { ...@@ -103,7 +103,8 @@ const login = async () => {
userStore.login(res) userStore.login(res)
closeToast() closeToast()
showToast('登录成功') showToast('登录成功')
router.pushTab({ name: 'home' }) // router.pushTab({ name: 'home' })
router.back()
} }
const sgyLoginParams = ref({ const sgyLoginParams = ref({
...@@ -131,7 +132,8 @@ const fastLoginBySgy = () => { ...@@ -131,7 +132,8 @@ const fastLoginBySgy = () => {
title: '登录成功', title: '登录成功',
icon: 'success' icon: 'success'
}) })
router.pushTab({ name: 'mine' }) // router.pushTab({ name: 'home' })
router.back()
} }
}); });
} }
......
...@@ -96,10 +96,10 @@ const total = reactive({ ...@@ -96,10 +96,10 @@ const total = reactive({
2: 0 2: 0
}) })
onShow(() => { onShow(async() => {
// toLogin() // toLogin()
// if (userStore.isLogin()) // if (userStore.isLogin())
getOrganizeList() await getOrganizeList()
}) })
const toLogin = () => { const toLogin = () => {
......
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