Pre Merge pull request !13 from weisheng/master

package.json

@@ -85,7 +85,7 @@
         "prettier": "^2.8.8",
         "sass": "^1.62.1",
         "typescript": "^5.0.4",
-        "uni-mini-router": "^0.0.9",
+        "uni-mini-router": "^0.0.11",
         "uni-read-pages-vite": "^0.0.6",
         "unocss": "^0.51.12",
         "unocss-preset-weapp": "^0.6.1",

src/pages/login/index.vue

@@ -28,7 +28,8 @@ const submit = (e: any) => {
         setTimeout(() => {
             if (unref(pageQuery)?.redirect) {
                 // 如果有存在redirect(重定向)参数，登录成功后直接跳转
-                router.replace({ name: unref(pageQuery).redirect, params: omit(unref(pageQuery), ['redirect']) });
+                // 这里replace方法无法跳转tabbar页面故改为replaceAll
+                router.replaceAll({ name: unref(pageQuery).redirect, params: omit(unref(pageQuery), ['redirect']) });
             } else {
                 // 不存在则回到首页
                 router.replaceAll({ name: 'Home' });
@@ -61,26 +62,32 @@ const submit = (e: any) => {
 .container {
     margin: 0 auto;
     width: 80%;
+
     .title {
         padding: 320rpx 0 32rpx 0;
         text-align: center;
     }
+
     .form-wrap {
         padding: 20rpx 24rpx;
         box-shadow: 16rpx 16rpx 30rpx #e5e7eb;
+
         .form {
             .form-item {
                 display: flex;
                 height: 88rpx;
                 border-bottom: 2rpx solid #dbeafe;
                 align-items: center;
+
                 .form-label {
                     min-width: 96rpx;
                 }
+
                 .form-element {
                     flex-grow: 1;
                 }
             }
+
             .submit-btn {
                 margin-top: 44rpx;
                 border: 4rpx solid #bfdbfe;
@@ -88,6 +95,7 @@ const submit = (e: any) => {
                 border-radius: 8rpx;
                 font-size: 28rpx;
                 color: #ffffff;
+
                 :hover {
                     background-color: #3b82f6;
                 }

src/router/guard.ts

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