|
@@ -226,8 +226,7 @@
|
|
|
import { ElMessageBox, ElMessage } from 'element-plus';
|
|
import { ElMessageBox, ElMessage } from 'element-plus';
|
|
|
import { useDesignSetting } from '@/hooks/setting/useDesignSetting';
|
|
import { useDesignSetting } from '@/hooks/setting/useDesignSetting';
|
|
|
import { Render, getRender } from '@/components/Render';
|
|
import { Render, getRender } from '@/components/Render';
|
|
|
- import urlJoin from 'url-join';
|
|
|
|
|
- import { getRedirectUrl } from '@/utils/getRedirectUrl';
|
|
|
|
|
|
|
+ import { getLogoutUrl, getRedirectUrl } from '@/utils/getRedirectUrl';
|
|
|
import { useGlobSetting } from '@/hooks/setting';
|
|
import { useGlobSetting } from '@/hooks/setting';
|
|
|
|
|
|
|
|
defineEmits(['update:collapsed']);
|
|
defineEmits(['update:collapsed']);
|
|
@@ -385,7 +384,9 @@
|
|
|
// redirect: route.fullPath,
|
|
// redirect: route.fullPath,
|
|
|
// },
|
|
// },
|
|
|
// });
|
|
// });
|
|
|
- window.location.href = getRedirectUrl();
|
|
|
|
|
|
|
+ const logoutUrl = getLogoutUrl();
|
|
|
|
|
+ console.log('logoutUrl', logoutUrl);
|
|
|
|
|
+ window.location.href = logoutUrl;
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|