Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

2022-07-27 10:36:32 +08:00
parent d57890c0a9 cf99b2730a
commit aa6579d040
6 changed files with 22 additions and 25 deletions
--- 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, "<br>")
+          this.info = {...res.data, content, files};
          this.searchMeetinguser()
        }
      });