Merge branch 'bug_mk' into feature

src/router/index.js

@@ -982,6 +982,7 @@ router.beforeEach((to, from, next) => {
         });
         return next({
           name: "login",
+          query: { redirect: to.fullPath } 
         });
       }
       window.SITE_CONFIG["menuShujuList"] = res.data;
@@ -995,6 +996,7 @@ router.beforeEach((to, from, next) => {
       console.log(err);
       next({
         name: "login",
+        query: { redirect: to.fullPath } 
       });
     });
   http
@@ -1011,6 +1013,7 @@ router.beforeEach((to, from, next) => {
         });
         return next({
           name: "login",
+          query: { redirect: to.fullPath } 
         });
       }
       window.SITE_CONFIG["menuList"] = res.data
@@ -1028,6 +1031,7 @@ router.beforeEach((to, from, next) => {
       console.log(err);
       next({
         name: "login",
+        query: { redirect: to.fullPath } 
       });
     });
 });

src/views/dataBoard/overview/familyPortrait/index.vue

@@ -20,7 +20,7 @@ export default {
     return {
       breadcrumbList: [
         {
-          path: "/dataBoard/overview/index",
+          path: "/dataBoard/renfang/index",
           name: "概览",
         },
         {

src/views/pages/login.vue

@@ -173,7 +173,8 @@ export default {
         location.href = href;
       } else {
         localStorage.removeItem("thePageAtExit");
-        this.$router.replace({ name: "main" });
+        const redirect = this.$route.query.redirect || '/'
+        this.$router.replace(redirect);
       }
     },
     // 获取公钥