浏览代码

兼容localStorage.userInfo = undefined的情况

seyason 2 年之前
父节点
当前提交
247ce6ad54

+ 6 - 7
fhKeeper/formulahousekeeper/timesheet_h5/src/views/index/index.vue

@@ -50,7 +50,7 @@
                 this.user = JSON.parse(localStorage.userInfo)
                 // 是否为钉钉同步
                 this.isSyncData = this.user.timeType.syncDingding || this.user.timeType.syncFanwei;
-            }
+            } 
         },
         mounted() {
             //有错误信息,优先跳转到登录页面去
@@ -84,22 +84,21 @@
                 }
             } else {
                 //其他情况,刷新用户信息
-                if (localStorage.userInfo != null) {
+                if (localStorage.userInfo != null && localStorage.userInfo != 'undefined') {
                     that.user = JSON.parse(localStorage.userInfo);
                     that.getAccountInfo(that.user.id);
+                } else{
+                    //无用户信息,跳到登录页面去
+                    this.$router.push("/login");
                 }
             }
             if (this.user) {
                 let userss = this.user;
-                if(userss.companyId == '3454') {
-                    alert(`isMobFirstLogin = ${userss.isMobFirstLogin} $ userss.createTime = ${userss.createTime[0]} $ userss.roleName = ${userss.roleName}`)
-                }
                 if(userss.isMobFirstLogin == 1 && userss.createTime[0] > '2022' && userss.roleName == '超级管理员') {
                     // 第一次登陆显示
                     this.previewPicture()
                 }
-            }
-            
+            } 
         },
         components: {
             Footer

+ 3 - 0
fhKeeper/formulahousekeeper/timesheet_h5/src/views/login/index.vue

@@ -220,6 +220,7 @@
             }
         },
         created() {
+            if (localStorage.userInfo == 'undefined') localStorage.removeItem('userInfo');
             if (localStorage.userInfo != null) {
                 this.$router.push("/index").catch(err => { console.log(err, '错误4')});
             }
@@ -273,6 +274,7 @@
                         
                     } else {
                         //检查环境,如果是钉钉有$CORPID$
+                        
                         var key = '?corpid=';
                         var jumpkey = '&jumpto=';
                         var url = location.href;
@@ -284,6 +286,7 @@
                             }else{
                                 corpId = url.substring(url.indexOf(key)+key.length,url.indexOf('#'));
                             }
+                            alert('钉钉登录==='+corpId);
                             this.isDingding = true
                             dd.ready(function() {
                                 dd.runtime.permission.requestAuthCode({