diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php index d8248df36..dfc303166 100755 --- a/app/Http/Controllers/Api/DialogController.php +++ b/app/Http/Controllers/Api/DialogController.php @@ -134,7 +134,9 @@ class DialogController extends AbstractController if (str_contains($key, "@")) { $query->where("email", "like", "%{$key}%"); } else { - $query->where("nickname", "like", "%{$key}%")->orWhere("pinyin", "like", "%{$key}%"); + $query->where("nickname", "like", "%{$key}%") + ->orWhere("pinyin", "like", "%{$key}%") + ->orWhere("profession", "like", "%{$key}%"); } })->orderBy('userid') ->take(20 - count($list)) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 9990721fd..2cbc29d44 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -520,7 +520,8 @@ class UsersController extends AbstractController } else { $builder->where(function($query) use ($keys) { $query->where("nickname", "like", "%{$keys['key']}%") - ->orWhere("pinyin", "like", "%{$keys['key']}%"); + ->orWhere("pinyin", "like", "%{$keys['key']}%") + ->orWhere("profession", "like", "%{$keys['key']}%"); }); } } diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue index c6100bfde..f2bd54519 100644 --- a/resources/assets/js/pages/manage/messenger.vue +++ b/resources/assets/js/pages/manage/messenger.vue @@ -114,7 +114,7 @@
{{formatMsgEmojiDesc(dialog.last_msg)}} - {{$A.getMsgSimpleDesc(dialog.last_msg)}} + {{$A.getMsgSimpleDesc(dialog.last_msg) || showProfessionDesc(dialog.dialog_user)}}
@@ -469,8 +469,13 @@ export default { }, contactsList() { + const {contactsKey} = this; const list = []; - this.contactsFilter.some(user => { + this.contactsFilter.some(data => { + const user = $A.cloneJSON(data); + if (contactsKey && $A.strExists(user.profession, contactsKey)) { + user.tags.push(user.profession) + } let az = user.az ? user.az.toUpperCase() : "#"; let item = list.find(item => item.az == az); if (item) { @@ -998,6 +1003,13 @@ export default { return null; }, + showProfessionDesc(dialog_user) { + if (dialog_user) { + return `[${dialog_user.profession}]` + } + return '' + }, + lastMsgReadDone(data) { if ($A.isJson(data)) { const {userid, percentage} = data;