diff --git a/.env.production b/.env.production index 800702e..ab3a2a0 100644 --- a/.env.production +++ b/.env.production @@ -16,5 +16,5 @@ VUE_APP_CAS_SERVER_UNITE = 'http://10.194.188.69/cas' VUE_APP_AICEPS_URL = 'http://10.201.62.87:6891/gz-aiceps-manage' # 年报服务地址 无需写/aiceps-service-web 如和aiccs同域名同端口部署则置空 -VUE_APP_AICEPS_SERVICE_URL = 'http://219.148.175.144:56666' +VUE_APP_AICEPS_SERVICE_URL = '' diff --git a/src/layout/components/Sidebar/Item.vue b/src/layout/components/Sidebar/Item.vue index 8909f57..83de5fe 100644 --- a/src/layout/components/Sidebar/Item.vue +++ b/src/layout/components/Sidebar/Item.vue @@ -47,7 +47,14 @@ export default { // vnodes.push({(title)}) // } // } - vnodes.push({(title)}) + vnodes.push(h( + 'span', // 标签名 + { + slot: 'title', // slot 属性 + attrs: { title: title } // 动态绑定 title 属性(等价于 :title="title") + }, + title // 标签内容(等价于 {title}) + )) return vnodes } } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 60b43c9..30b9f7c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -92,13 +92,13 @@ const actions = { // user logout logout({ commit, state }) { return new Promise((resolve, reject) => { - logout().then(() => { + logout().catch(error => { + reject(error) + }).finally(() => { commit('SET_ROLES', []) removeToken() resetRouter() resolve() - }).catch(error => { - reject(error) }) }) },