diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php
index 3ab0081ed..59ccb00eb 100644
--- a/app/Models/WebSocketDialog.php
+++ b/app/Models/WebSocketDialog.php
@@ -84,6 +84,7 @@ class WebSocketDialog extends AbstractModel
$this->top_at = $this->top_at ?? $dialogUserFun('top_at');
$this->user_at = $this->user_at ?? $dialogUserFun('updated_at');
$this->user_ms = WebSocketDialogUser::userMs($this->user_at);
+ $this->quick_msg = [];
//
if (isset($this->search_msg_id)) {
// 最后消息 (搜索预览消息)
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index a79e1a4cb..84ff9d44f 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -164,11 +164,18 @@
@on-progress="chatFile('progress', $event)"
@on-success="chatFile('success', $event)"
@on-error="chatFile('error', $event)"/>
-
-
{{$L('待办')}}:
+
+
@@ -723,6 +730,14 @@ export default {
return array
},
+ quickMsg() {
+ return this.dialogData.quick_msg || []
+ },
+
+ quickShow() {
+ return this.quickMsg.length > 0 && this.windowScrollY === 0 && this.replyId === 0
+ },
+
todoList() {
if (!this.dialogData.todo_num) {
return []
@@ -2355,7 +2370,7 @@ export default {
userids: [],
msg_id: this.operateItem.id,
my_id: this.userId,
- you_id: youId != this.userId ? youId : 0,
+ you_id: youId != this.userId && !this.dialogData.bot ? youId : 0,
}
if (this.operateItem.todo) {
$A.modalConfirm({
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index baeea6bff..ad244e4ce 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -1187,12 +1187,12 @@
overflow: hidden;
}
- .chat-todo {
+ .chat-bottom-menu {
display: flex;
align-items: center;
padding: 8px 0;
- .todo-label {
+ .bottom-menu-label {
flex-shrink: 0;
padding-right: 8px;
}
@@ -1216,7 +1216,7 @@
display: flex;
align-items: center;
- .todo-desc {
+ .bottom-menu-desc {
max-width: 150px;
overflow: hidden;
text-overflow: ellipsis;