blackteay/uniapp-vue3-vite-ts-template
1
0
Fork 0
mirror of https://gitee.com/h_mo/uniapp-vue3-vite-ts-template synced 2025-04-06 03:58:03 +08:00
Code Issues Projects Releases Wiki Activity

feat: tabBar页面登录优化

Browse Source
This commit is contained in:
h_mo 2023-05-08 21:17:04 +08:00
parent 4e68c4f5f3
commit 825db5362a
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pages.json
View File

@ -6,13 +6,18 @@
"style": { "style": {
"navigationBarTitleText": "Home" "navigationBarTitleText": "Home"
}, },
"meta": {} "meta": {
"tabBar": true
}
}, },
{ {
"name": "Demo", "name": "Demo",
"path": "pages/demo/index", "path": "pages/demo/index",
"style": { "style": {
"navigationBarTitleText": "Demo" "navigationBarTitleText": "Demo"
},
"meta": {
"tabBar": true
} }
}, },
{ {
@ -22,7 +27,8 @@
"navigationBarTitleText": "关于" "navigationBarTitleText": "关于"
}, },
"meta": { "meta": {
"ignoreAuth": true "ignoreAuth": true,
"tabBar": true
} }
}, },
{ {

13
src/pages/login/index.vue
View File

@ -28,11 +28,16 @@ const submit = (e: any) => {
setTimeout(() => { setTimeout(() => {
if (unref(pageQuery)?.redirect) { if (unref(pageQuery)?.redirect) {
// 如果有存在redirect(重定向)参数，登录成功后直接跳转 // 如果有存在redirect(重定向)参数，登录成功后直接跳转
// 这里replace方法无法跳转tabbar页面故改为replaceAll const params = omit(unref(pageQuery), ['redirect', 'tabBar']);
router.replaceAll({ name: unref(pageQuery).redirect, params: omit(unref(pageQuery), ['redirect']) }); if (unref(pageQuery)?.tabBar) {
// 这里replace方法无法跳转tabbar页面故改为replaceAll
router.replaceAll({ name: unref(pageQuery).redirect, params });
} else {
router.replace({ name: unref(pageQuery).redirect, params });
}
} else { } else {
// 不存在则回到首页 // 不存在则返回上一页
router.replaceAll({ name: 'Home' }); router.back();
} }
}, 1500); }, 1500);
}); });

7
src/router/guard.ts
View File

@ -16,7 +16,7 @@ function createBeforeEachGuard(router: Router) {
} else if (!authStore.isLogin && to && to.name !== 'Login') { } else if (!authStore.isLogin && to && to.name !== 'Login') {
// 如果没有登录且目标路由不是登录页面则跳转到登录页面 // 如果没有登录且目标路由不是登录页面则跳转到登录页面
// 将目标路由和参数传入登录页面，登录成功后直接跳转到目标路由，优化体验 // 将目标路由和参数传入登录页面，登录成功后直接跳转到目标路由，优化体验
next({ name: 'Login', params: { redirect: to.name, ...to.query }, navType: 'replaceAll' }); next({ name: 'Login', params: { redirect: to.name!, tabBar: to?.meta?.tabBar, ...to.query }, navType: 'push' });
} else if (authStore.isLogin && to && to.name === 'Login') { } else if (authStore.isLogin && to && to.name === 'Login') {
// 如果已经登录且目标页面是登录页面则跳转至首页 // 如果已经登录且目标页面是登录页面则跳转至首页
next({ name: 'Home', navType: 'replaceAll' }); next({ name: 'Home', navType: 'replaceAll' });
@ -28,10 +28,13 @@ function createBeforeEachGuard(router: Router) {
function createAfterEachGuard(router: Router) { function createAfterEachGuard(router: Router) {
router.afterEach((to) => { router.afterEach((to) => {
console.log('afterEach', to);
// @ts-ignore
if (to && to?.meta?.ignoreAuth) return;
const authStore = useAuthStore(); const authStore = useAuthStore();
if (!authStore.isLogin && to && to.name !== 'Login') { if (!authStore.isLogin && to && to.name !== 'Login') {
// 如果没有登录且目标路由不是登录页面则跳转到登录页面 // 如果没有登录且目标路由不是登录页面则跳转到登录页面
router.replaceAll({ name: 'Login' }); router.push({ name: 'Login', tabBar: to?.meta?.tabBar, ...to.query });
} else if (authStore.isLogin && to && to.name === 'Login') { } else if (authStore.isLogin && to && to.name === 'Login') {
// 如果已经登录且目标页面是登录页面则跳转至首页 // 如果已经登录且目标页面是登录页面则跳转至首页
router.replaceAll({ name: 'Home' }); router.replaceAll({ name: 'Home' });