diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue index cb2b9bb26a..1d276c522d 100644 --- a/frontend/src/business/App.vue +++ b/frontend/src/business/App.vue @@ -154,7 +154,7 @@ export default { this.isShow = true; }); }, - reloadTopMenus() { + reloadTopMenus(callback) { this.$get("/isLogin").then(response => { if (response.data.success) { this.$setLang(response.data.data.language); @@ -165,11 +165,17 @@ export default { this.$nextTick(() => { this.isShow = true; this.isMenuShow = true; + if (callback) { + callback(); + } }); } else { window.location.href = "/login"; } }).catch(() => { + if (callback) { + callback(); + } window.location.href = "/login"; }); } diff --git a/frontend/src/business/components/common/head/HeaderOrgWs.vue b/frontend/src/business/components/common/head/HeaderOrgWs.vue index 3e568643fd..1d58422622 100644 --- a/frontend/src/business/components/common/head/HeaderOrgWs.vue +++ b/frontend/src/business/components/common/head/HeaderOrgWs.vue @@ -28,10 +28,10 @@ :popper-append-to-body="true" :key="index">