diff --git a/packages/wxwork/AppMassNotification/AppMassNotification.vue b/packages/wxwork/AppMassNotification/AppMassNotification.vue index 4e3b37ed..9cc7d628 100644 --- a/packages/wxwork/AppMassNotification/AppMassNotification.vue +++ b/packages/wxwork/AppMassNotification/AppMassNotification.vue @@ -1,7 +1,7 @@ @@ -25,22 +25,18 @@ export default { include: [], } }, + computed: { + currentPage() { + const {hash} = this.$route + return hash == "#add" ? Add : List + }, + }, methods: { onChange(data) { if (data.type === "Add") { - this.component = "Add"; - this.params = data.params; - } - - if (data.type === "List") { - this.component = "List"; - this.params = data.params; - - this.$nextTick(() => { - if (data.isRefresh) { - this.$refs.component.getTableData(); - } - }); + this.$router.push({hash: "#add", query: data.params}) + } else { + this.$router.push({}) } }, }, diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue index 1d24ba30..637f0b94 100644 --- a/packages/wxwork/AppMassNotification/components/Add.vue +++ b/packages/wxwork/AppMassNotification/components/Add.vue @@ -1,6 +1,6 @@ --> - + @@ -131,6 +132,7 @@ export default { .List { height: 100%; background: #f3f4f5; + .count { cursor: pointer; color: #2266FF; @@ -142,68 +144,69 @@ export default { } } - img, video { - width: 40px; - height: 40px; - margin-right: 10px; - object-fit: cover; + +img, video { + width: 40px; + height: 40px; + margin-right: 10px; + object-fit: cover; +} + +.message-info { + padding: 8px; + min-height: 116px; + + h2 { + color: #222222; + font-weight: 500; + font-size: 14px; } - .message-info { - padding: 8px; - min-height: 116px; + .message-info__wrapper { + display: flex; + align-items: center; + width: 368px; + height: 60px; + padding: 10px; + background: #FFFFFF; + border-radius: 2px; + border: 1px solid #D0D4DC; - h2 { + .message-info__wrapper--right { + flex: 1; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + h3 { + width: 100%; color: #222222; - font-weight: 500; font-size: 14px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-weight: normal; } - .message-info__wrapper { - display: flex; - align-items: center; - width: 368px; - height: 60px; - padding: 10px; - background: #FFFFFF; - border-radius: 2px; - border: 1px solid #D0D4DC; + img, video { + width: 40px; + height: 40px; + margin-right: 10px; + object-fit: cover; + } - .message-info__wrapper--right { - flex: 1; - overflow: hidden; - text-overflow:ellipsis; - white-space: nowrap; - } - - h3 { - width: 100%; - color: #222222; - font-size: 14px; - overflow: hidden; - text-overflow:ellipsis; - white-space: nowrap; - font-weight: normal; - } - - img, video { - width: 40px; - height: 40px; - margin-right: 10px; - object-fit: cover; - } - - p { - margin-top: 6px; - font-size: 14px; - color: #888888; - } + p { + margin-top: 6px; + font-size: 14px; + color: #888888; } } +} - .row-content { - white-space: nowrap; - overflow: hidden; - text-overflow:ellipsis; - } - \ No newline at end of file +.row-content { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +