diff --git a/app/Models/WebSocketDialogMsg.php b/app/Models/WebSocketDialogMsg.php index 54617d4ef..8235a375b 100644 --- a/app/Models/WebSocketDialogMsg.php +++ b/app/Models/WebSocketDialogMsg.php @@ -307,7 +307,7 @@ class WebSocketDialogMsg extends AbstractModel public function toggleTodoMsg($sender, $userids = []) { if (in_array($this->type, ['tag', 'todo', 'notice'])) { - return Base::retError('此消息不支持社待办'); + return Base::retError('此消息不支持设待办'); } if ($this->todo && $this->todo != $sender) { return Base::retError('仅支持设此待办人员【' . User::userid2nickname($this->todo) . '】取消'); diff --git a/resources/assets/js/pages/manage/components/DialogModal.vue b/resources/assets/js/pages/manage/components/DialogModal.vue index 300b43ac5..db17b658d 100644 --- a/resources/assets/js/pages/manage/components/DialogModal.vue +++ b/resources/assets/js/pages/manage/components/DialogModal.vue @@ -4,13 +4,11 @@ :mask="false" :mask-closable="false" :footer-hide="true" - :transition-names="['', '']" + :transition-names="[transition, '']" :beforeClose="onBeforeClose" class-name="dialog-modal" fullscreen> - - - + @@ -56,7 +54,6 @@ export default { data() { return { timer: null, - visible: false, transition: $A.isIos() ? 'mobile-dialog' : '' } }, @@ -64,24 +61,11 @@ export default { computed: { ...mapState(['dialogId']), - show() { + visible() { return this.dialogId > 0 && this.windowSmall } }, - watch: { - show(v) { - this.timer && clearTimeout(this.timer); - if (v) { - this.visible = true; - } else { - this.timer = setTimeout(_ => { - this.visible = false; - }, 300); - } - } - }, - methods: { onBeforeClose() { return new Promise(_ => { diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index cff0768ae..e38413c0a 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -1649,3 +1649,18 @@ } } } + +@media (max-width: 768px) and (min-width: 390px){ + .dialog-wrapper-operate { + .operate-action { + width: 376px; + } + .operate-emoji { + width: 376px; + + > li { + width: 46px; + } + } + } +}