diff --git a/src/saas/AppCountryAlbum/Message.vue b/src/saas/AppCountryAlbum/Message.vue index ef9c661d..d1f9dc78 100644 --- a/src/saas/AppCountryAlbum/Message.vue +++ b/src/saas/AppCountryAlbum/Message.vue @@ -54,6 +54,11 @@ JSON.parse(v.content).forEach((item, index) => { msg = msg + `${item.key}:${item.value}人` + (JSON.parse(v.content).length === index + 1 ? '' : ',') }) + } else { + msg = '' + JSON.parse(v.content).forEach((item, index) => { + msg = msg + `${item.key}:${item.value}` + (JSON.parse(v.content).length === index + 1 ? '' : ',') + }) } return { ...v, @@ -69,6 +74,11 @@ JSON.parse(v.content).forEach((item, index) => { msg = msg + `${item.key}:${item.value}人` + (JSON.parse(v.content).length === index + 1 ? '' : ',') }) + } else { + msg = '' + JSON.parse(v.content).forEach((item, index) => { + msg = msg + `${item.key}:${item.value}` + (JSON.parse(v.content).length === index + 1 ? '' : ',') + }) } return { ...v, diff --git a/src/saas/AppCountryAlbum/components/Home.vue b/src/saas/AppCountryAlbum/components/Home.vue index 5983c380..442d3632 100644 --- a/src/saas/AppCountryAlbum/components/Home.vue +++ b/src/saas/AppCountryAlbum/components/Home.vue @@ -36,9 +36,9 @@
最新 - 你于2月14日发布的你于2月14日发布的 + {{ msgInfo.msg || '暂无消息' }}
-

2022-2-14 10:02

+

{{ msgInfo.createTime || '' }}

@@ -138,7 +138,14 @@ getMsgList () { this.$http.post('/api/sysmessage/latestnews').then(res => { if (res.code === 0) { - this.msgInfo = res.data + if (res.data) { + let msg = '' + JSON.parse(res.data.content).forEach((item, index) => { + msg = msg + `${item.key}:${item.value}` + (JSON.parse(res.data.content).length === index + 1 ? '' : ',') + }) + this.msgInfo = res.data + this.msgInfo.msg = msg + } } }) }, @@ -370,7 +377,7 @@ display: flex; align-items: center; justify-content: space-between; - margin-bottom: 40px; + margin-bottom: 26px; .right-top__left { width: 136px; @@ -385,6 +392,10 @@ .right-info { .right-info__news { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; + overflow: hidden; margin-bottom: 12px; span {