用户注册登录成功之后自动跳转回来源页

web/components/FormLogin.vue

@@ -55,7 +55,7 @@
           >找回密码</nuxt-link
         >
         <nuxt-link
-          to="/register"
+          :to="{ name: 'register', query: { redirect } }"
           title="注册账户"
           class="el-link el-link--default float-right"
           >注册账户</nuxt-link

web/components/FormRegister.vue

@@ -143,7 +143,9 @@
         <nuxt-link to="/findpassword" class="el-link el-link--default"
           >找回密码</nuxt-link
         >
-        <nuxt-link to="/login" class="el-link el-link--default float-right"
+        <nuxt-link
+          :to="{ name: 'login', query: { redirect } }"
+          class="el-link el-link--default float-right"
           >马上登录</nuxt-link
         >
       </el-form-item>

web/layouts/default.vue

@@ -490,11 +490,12 @@ export default {
         this.loopUpdate()
       }, 1000 * 60) // 每分钟更新一次
     },
-    handleDropdown(command) {
+    async handleDropdown(command) {
       console.log('handleDropdown', command)
       switch (command) {
         case 'logout':
-          this.logout()
+          const res = await this.logout()
+          console.log(res)
           location.reload()
           break
         case 'upload':

web/middleware/checkFront.js

@@ -1,5 +1,26 @@
 import { requireLogin } from '~/utils/utils'
-export default function ({ store, route, redirect }) {
+export default function ({ store, route, redirect, from }) {
+  // Every time the route changes (fired on initialization too)
+  // 如果是注册或者登录，则带个redirect参数，用于登录后跳转
+  if (
+    (route.name === 'login' || route.name === 'register') &&
+    !(from.name === 'login' || from.name === 'register')
+  ) {
+    console.log(
+      'checkFront.js: route.name === login or register 1',
+      route.query
+    )
+    if (!route.query.redirect) {
+      route.query.redirect = from.fullPath
+      redirect(route)
+      return
+    }
+    console.log(
+      'checkFront.js: route.name === login or register 2',
+      route.query
+    )
+  }
+
   store.dispatch('user/checkAndRefreshUser')
   const settings = store.getters['setting/settings']
   const user = store.getters['user/user']

web/pages/login.vue

@@ -23,6 +23,7 @@
         </div>
         <form-login
           v-if="!(user.id > 0 && settings.security.is_close)"
+          :redirect="redirect"
         ></form-login>
       </el-card>
     </div>
@@ -51,6 +52,11 @@ export default {
       ],
     }
   },
+  data() {
+    return {
+      redirect: this.$route.query.redirect || '/me',
+    }
+  },
   computed: {
     ...mapGetters('setting', ['settings']),
     ...mapGetters('user', ['user']),

web/pages/register.vue

@@ -14,7 +14,7 @@
         <div slot="header" class="clearfix">
           <span>用户注册</span>
         </div>
-        <form-register></form-register>
+        <form-register :redirect="redirect"></form-register>
       </el-card>
     </div>
   </div>
@@ -26,7 +26,9 @@ export default {
   // 已登录用户，直接跳转到个人中心
   middleware: ['checklogin'],
   data() {
-    return {}
+    return {
+      redirect: this.$route.query.redirect || '/me',
+    }
   },
   head() {
     return {