diff --git a/core/apps/AppMenuManager/list.vue b/core/apps/AppMenuManager/list.vue index 4ef7ec7c..2455b9b9 100644 --- a/core/apps/AppMenuManager/list.vue +++ b/core/apps/AppMenuManager/list.vue @@ -62,6 +62,9 @@ + :tableData="info.attendees" + :colConfigs="colConfigs" + style="margin-top: 12px;" + :isShowPagination="false"> v === '1' ? '已签到' : '未签到' }, + {prop: 'signInStatus', align: 'center', label: '签到', formart: v => v === '1' ? '已签到' : '未签到'}, { slot: 'option', } @@ -249,11 +249,9 @@ export default { params: {id} }).then(res => { if (res?.data) { - this.info = { - ...res.data, - content: this.formatContent(res.data.content || ""), - files: res.data.files || [] - }; + let {files = [], content} = res.data + content = content.replace(/(\r\n)|(\n)/g, "
") + this.info = {...res.data, content, files}; this.searchMeetinguser() } }); diff --git a/project/sass/apps/AppConference/detail.vue b/project/sass/apps/AppConference/detail.vue index be792755..8ae85a22 100644 --- a/project/sass/apps/AppConference/detail.vue +++ b/project/sass/apps/AppConference/detail.vue @@ -255,11 +255,9 @@ export default { params: {id} }).then(res => { if (res?.data) { - this.info = { - ...res.data, - content: this.formatContent(res.data.content || ""), - files: res.data.files || [] - }; + let {files = [], content} = res.data + content = content.replace(/(\r\n)|(\n)/g, "
") + this.info = {...res.data, content, files}; this.searchMeetinguser() } });