diff --git a/public/css/fonts/taskfont.ttf b/public/css/fonts/taskfont.ttf index b715c99e0..d1d5ae244 100644 Binary files a/public/css/fonts/taskfont.ttf and b/public/css/fonts/taskfont.ttf differ diff --git a/public/css/fonts/taskfont.woff b/public/css/fonts/taskfont.woff index 848b5ee9b..76e4325d5 100644 Binary files a/public/css/fonts/taskfont.woff and b/public/css/fonts/taskfont.woff differ diff --git a/public/css/fonts/taskfont.woff2 b/public/css/fonts/taskfont.woff2 index 6968e5ed5..9594c1d60 100644 Binary files a/public/css/fonts/taskfont.woff2 and b/public/css/fonts/taskfont.woff2 differ diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 0654715b4..7bc41ddeb 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -64,9 +64,11 @@ @onScroll="onScroll" class="dialog-scroller overlay-y"> -
+
{{$L('有' + msgNew + '条新消息')}}
@@ -335,11 +337,16 @@ export default { if (id) { this.msgNew = 0; this.topId = -1; - if (this.dialogMsgList.length > 0) { - setTimeout(this.onToBottom, 10); + let cacheTimer = null; + if (this.allMsgList.length > 0) { + cacheTimer = setTimeout(_ => { + this.allMsgs = this.allMsgList; + this.onToBottom(); + }, 1); } const startTime = new Date().getTime(); this.$store.dispatch("getDialogMsgs", id).then(_ => { + cacheTimer && clearTimeout(cacheTimer); setTimeout(this.onToBottom, Math.max(0, 100 - (new Date().getTime() - startTime))); }).catch(_ => {}); } diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index dd01e7813..0bc090837 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -27,7 +27,10 @@
{{item.task_my_complete}}/{{item.task_my_num}}