diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index c7864cb..eb8bb9b 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -116,7 +116,9 @@ export default { toggleSideBar() { this.$store.dispatch('app/toggleSideBar') }, - changeTenant(){ + changeTenant(tenantId){ + console.log(tenantId) + this.$store.dispatch('setTenantId', tenantId) this.$tab.closeAllPage() this.$router.push("/") }, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 6b7f3c4..34552ce 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -68,7 +68,6 @@ const user = { } commit('SET_ID', user.userId) commit('SET_NAME', user.userName) - commit('SET_TENANT_ID', user.tenantId) commit('SET_AVATAR', avatar) resolve(res) }).catch(error => { @@ -99,6 +98,9 @@ const user = { removeToken() resolve() }) + }, + setTenantId({ commit }, tenantId) { + commit('SET_TENANT_ID', tenantId) } } } diff --git a/src/utils/request.js b/src/utils/request.js index 850685c..b44a225 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -31,6 +31,8 @@ service.interceptors.request.use(config => { if (getToken() && !isToken) { config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 } + config.headers['tenantId'] = store.getters.tenantId + config.headers['userId'] = store.getters.userId // get请求映射params参数 if (config.method === 'get' && config.params) { let url = config.url + '?' + tansParams(config.params);