Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov-zhengwu-yantai

src/utils/index.js

@@ -43,8 +43,10 @@ export function getDictLabel(dictType, dictValue) {
  * 清除登录信息
  */
 export function clearLoginInfo() {
+  console.log('==========clearLoginInfo')
   store.commit("resetStore");
   localStorage.removeItem("token");
+  localStorage.setItem('thePageAtExit', location.href);
   window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] = false;
 }
 
@@ -164,7 +166,11 @@ export function computedCard(idCard) {
   if (sex % 2 === 0)
     sex = "0"; // 性别代码 1代表男，0代表女，暂时不涉及其他类型性别
   else sex = "1";
-  return { age, sex, birth };
+  return {
+    age,
+    sex,
+    birth
+  };
 }
 // 将数组分成小块数组的集合
 export function spliceIntoChunks(arr, chunkSize) {

src/views/pages/yantai-login-transit-sdt.vue

@@ -43,7 +43,7 @@ export default {
   methods: {
     //根据社区id获取小区列表
     async login(client_code) {
-      const url = "/auth/thirdlogin/sso-govlogin-yantai-sdt/" + client_code;
+      const url = "/auth/thirdlogin/sso-govlogin-sdt/" + client_code;
 
       let params = {};
 

src/views/pages/yantai-login-transit.vue

@@ -55,7 +55,13 @@ export default {
         localStorage.setItem("userType", "work");
         localStorage.setItem("loginType", "sso");
         localStorage.setItem("token", data.token);
-        this.$router.replace({ name: "index" });
+        let href = localStorage.getItem("thePageAtExit");
+        if (href) {
+          localStorage.removeItem("thePageAtExit");
+          location.href = href;
+        } else {
+          this.$router.replace({ name: "index" });
+        }
       } else {
         this.status = "failed";
       }