Merge branch 'dev-登录返回旧业面' into dev-烟台中转登录2

# Conflicts:
#	src/views/pages/login.vue

src/views/pages/login.vue

@@ -154,6 +154,16 @@ export default {
   },
 
   methods: {
+    // 登陆后跳转逻辑
+    skipAfterLogin() {
+      let href = localStorage.getItem("thePageAtExit");
+      if (href) {
+        localStorage.removeItem("thePageAtExit");
+        location.href = href;
+      } else {
+        this.$router.replace({ name: "index" });
+      }
+    },
     // 获取公钥
     getPubKey() {
       this.$http
@@ -227,7 +237,7 @@ export default {
           localStorage.setItem("userType", "work");
           localStorage.setItem("showHeader", "0");
           localStorage.setItem("token", res.data.token);
-          this.$router.replace({ name: "index" });
+          this.skipAfterLogin();
         })
         .catch(() => {});
       // epmet-ext9.elinkservice.cn/platform-admin
@@ -257,7 +267,7 @@ export default {
           localStorage.setItem("userType", "work");
 
           localStorage.setItem("token", res.data.token);
-          this.$router.replace({ name: "index" });
+          this.skipAfterLogin();
         })
         .catch(() => {
           this.endLoading();