zc

src/api/login.js

@@ -53,14 +53,6 @@ export function getInfo() {
   })
 }
 
-// 退出方法
-export function logout() {
-  return request({
-    url: '/auth/logout',
-    method: 'delete'
-  })
-}
-
 // 获取验证码
 export function getCodeImg() {
   return request({
@@ -85,13 +77,15 @@ export function ssoGetLoginUser() {
     method: 'get'
   })
 }
+//认证登录(调用后跳转认证平台)
 export function getLoginUser() {
   return request({
     url: '/getLoginUser',
     method: 'get'
   })
 }
-export function authSsoLogout() {
+//退出登录
+export function logout() {
   return request({
     url: '/auth/sso/logout',
     method: 'get'

src/views/ssoLogin.vue

@@ -67,10 +67,11 @@
     created() {
       let url = window.location.href
       if (url.indexOf('token') != -1) {
+        console.log('找到了====>')
         setToken(url.split('=')[1])
         this.getInfo();
       } else {
-        console.log('没找到====>')
+        console.log('没找到---->')
         this.ssoGetLoginUser()
       }
       localStorage.setItem('windowHref', window.location.href)
@@ -82,11 +83,11 @@
       getInfo(type) {
         getInfo().then(response => {
           console.log('response', response)
-          localStorage.setItem('userType',response.data.type)
-          localStorage.setItem('userId',response.data.user_id)
-          localStorage.setItem('tenantId',response.data.tenantId)
-          localStorage.setItem('identity',response.data.screen_token);
-          localStorage.setItem('identityType',response.data.screen_type);
+          localStorage.setItem('userType',response.user.userType);
+          localStorage.setItem('userId',response.user.userId);
+          localStorage.setItem('tenantId',response.user.tenantId);
+          localStorage.setItem('identity',response.screen_token);
+          localStorage.setItem('identityType',response.screen_type);
           //等待配置与字段获取到后跳转
           Promise.all([
             this.getLogoInfo(),