Merge branch 'master' into debug

src/main.js

@@ -204,7 +204,14 @@ router.beforeEach(async(to, from, next) => {
 
   let auth = localStorage.getItem("auth") || false;
   if(!auth && (storage.getCookie('ai_user')||storage.getCookie('ai_token'))) {
-    transferLoginByCookie();
+
+    let timeNow = new Date().getTime();
+    if(storage.getCookie('expire') && Number(storage.getCookie('expire')) > timeNow) {
+      transferLoginByCookie();
+    }else {
+      window.location.href = location.origin+'/home/'
+    }
+
     return
   }
 

src/views/Login.vue

@@ -83,19 +83,8 @@ import OrdinaryModel from "./login_manage/OrdinaryModel.vue";
 export default {
     components: { OrdinaryModel, ForgetPassModel },
     beforeRouteEnter(to, from, next){
-        // console.log(to, from);
-        if(to.query.HZ == 1){
-            next();
-        }else{
-            let publicConfigs = JSON.parse(localStorage.getItem('publicConfigs')) || {}
-            // 有的话需要跳转至客户的页面
-            let loginUrl=publicConfigs.LoginUrl
-            if(loginUrl){
-                window.location.replace(loginUrl)
-            }else{
-                next();
-            }
-        }
+        window.location.href = location.origin+'/home/'
+        return
     },
     computed: {
         lang() {
@@ -223,12 +212,12 @@ export default {
         };
     },
     created() {
-        this.keyupSubmit(); //回车登录
-        this.getPhoneCode();//获取手机号区号
-        this.getRecordInfo();//获取备案信息
+        // this.keyupSubmit(); //回车登录
+        // this.getPhoneCode();//获取手机号区号
+        // this.getRecordInfo();//获取备案信息
     },
     mounted(){
-        this.getRememberedInfo()
+        // this.getRememberedInfo()
     },
     methods: {
         keyupSubmit() {