代码提交

frontend/saas-portal-web/src/components/conenter/home.vue

@@ -41,7 +41,7 @@
           </ul>
         </div>
         </div>
-        
+
     </div>
 
     <iframe hidden :src="setTokenPage"></iframe>
@@ -339,10 +339,10 @@
       }
     },
     created(){
-      var uid = this.getCookie('uid');
+     var uid = this.hasCookie('uid');
       if(uid){
         this.$ajax({
-          url: '/api/auth/info',
+          url: this.$url.sso+'/api/auth/info',
           method: 'get',
           async:false,
           withCredentials:true
@@ -352,6 +352,7 @@
           account.companies = account.companies || []
           session.account = account
           Session.set(session);
+          this.account = Session.getAccount();
         })
         .catch(err=>{
           console.log("请求失败",err)
@@ -379,20 +380,20 @@
       }
     },
     methods: {
-        getCookie(cookieName){  
-          var cookieValue="";  
-          if (document.cookie && document.cookie != '') {   
-              var cookies = document.cookie.split(';');  
-              for (var i = 0; i < cookies.length; i++) {   
-                  var cookie = cookies[i];  
-                  if (cookie.substring(0, cookieName.length + 2).trim() == cookieName.trim() + "=") {  
-                        cookieValue = cookie.substring(cookieName.length + 2, cookie.length);   
-                        break;  
-                  }  
-              }  
-          }   
-          return cookieValue;  
-      }, 
+        hasCookie(cookieName){
+          var hasUid=false;
+          if (document.cookie && document.cookie != '') {
+              var cookies = document.cookie.split(';');
+              for (var i = 0; i < cookies.length; i++) {
+                  var cookie = cookies[i];
+                  if (cookie.substring(0, cookieName.length+1).trim() == cookieName.trim() + "=") {
+                        hasUid=true;
+                        break;
+                  }
+              }
+          }
+          return hasUid;
+      },
       tab(i){
         this.Nowindex = i;
       },
@@ -418,7 +419,7 @@
               // 跳转应用页面
               window.location.href = me.$url.web
             }
-           } 
+           }
           }, false)
           frame.postMessage(JSON.stringify(session), '*')
         })
@@ -438,7 +439,8 @@
         const frame = window.frames[window.frames.length - 1]
         frame.postMessage('', '*')
         Session.remove()
-        this.$router.go(0); 
+        window.location.href=this.$url.sso+'/logquit?appId=sp&returnURL='+window.location.host
+        //this.$router.go(0);
       },
       // 关闭窗口
       closeModal() {
@@ -495,7 +497,7 @@
                 // console.log("请求失败",err)
             })
           }
-        } 
+        }
       },
     }
   }