diff --git a/src/App.vue b/src/App.vue index 5d6a672..8db99c5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,9 +27,9 @@ export default { created() { const { bus } = WujieVue2; bus.$on('openUserInfo', (event) => { - console.log(event, 3333); - if (event.status === 'open') { + if (event.status) { this.asyncOpenUserInfo(); + bus.$emit('changeUserModal', true) } }) }, @@ -41,8 +41,8 @@ export default { // 4. 需要同步获取数据之后再去调用visible = true // 5. 组件其中isSelfSuppput 字段是自营字段,但同时也是判断是否可以修改字段 // 6. 关闭弹窗的时候把visible 改为false - async asyncOpenUserInfo() { - this.$refs.userInfoModal.visible = true; + asyncOpenUserInfo() { + this.$refs.userInfoModal.showDrawer(); } } } diff --git a/src/api/http.js b/src/api/http.js index f42747c..b7f5110 100644 --- a/src/api/http.js +++ b/src/api/http.js @@ -35,7 +35,7 @@ instance.defaults.withCredentials = true; instance.interceptors.request.use( config => { // 基础请求参数 - const tokenInfo = vm.getSession('CX_CoopTokenInfo'), + const tokenInfo = vm.getSession('CX_Common_UserInfo'), base = {}, postData = {...base, ...config.data }; tokenInfo.access_token && (config.headers[`Authorization`] = `Bearer:${tokenInfo.access_token}`); diff --git a/src/components/userinfo/userInfoModal.vue b/src/components/userinfo/userInfoModal.vue index 82b8b7d..81a48ce 100644 --- a/src/components/userinfo/userInfoModal.vue +++ b/src/components/userinfo/userInfoModal.vue @@ -109,6 +109,7 @@ import AdditionalInformation from "./components/additionalInformation"; import PersonnelCategoryList from "./components/personnelCategory/personnelCategoryList"; import TrainingIntention from "./components/trainingIntention"; import EntrepreneurialIntention from "./components/entrepreneurialIntention"; +import WujieVue2 from "wujie-vue2"; export default { components: { AddModal, @@ -130,7 +131,7 @@ export default { data() { return { visible: false, - isSelfSupport: this.getSession('CX_CoopTokenInfo').isSelfSupport, // //是否为自营用户0:否,1:是 + isSelfSupport: this.getSession('CX_Common_UserInfo').isSelfSupport, // //是否为自营用户0:否,1:是 recordList: null, isRecordEmpty: false, basicInfo: null, @@ -315,6 +316,8 @@ export default { this.visible = true; }, onClose() { + const { bus } = WujieVue2 + bus.$emit('changeUserModal', false) this.visible = false; this.isModalSwitch = false; },