c-my/NEUP-FleaMarket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into bootstrap

Browse Source
This commit is contained in:
LI JIAHAO
2017-06-14 18:02:40 +08:00
parent 0a9d472ebf ec7c7d276d
commit ec92361fbc
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MessageController.php
+2 -2
View File
@@ -123,7 +123,7 @@ class MessageController extends Controller
$contacts = MessageContact::where('user_id', $user_id)
->orderBy('last_contact_time', 'desc')
->with(['contact' => function ($query) {
$query->select('id', 'nickname', 'baned');
$query->select('id', 'nickname', 'baned', 'privilege');
}])
->paginate(10);
return json_encode($contacts);
@@ -136,7 +136,7 @@ class MessageController extends Controller
->where('unread_count', '>', 0)
->orderBy('last_contact_time', 'desc')
->with(['contact' => function ($query) {
$query->select('id', 'nickname', 'baned');
$query->select('id', 'nickname', 'baned', 'privilege');
}])
->get();
return json_encode($contacts);
resources/views/message/message.blade.php
+4 -1
View File
@@ -37,7 +37,10 @@
<td>
<p class="con-name">@{{ contact.contact_id == 0 ? "系统消息" :
(contact.contact.baned == 0 ? contact.contact.nickname :
contact.contact.nickname + '【已封禁】') }}</p>
contact.contact.nickname + '【已封禁】') }}
<img v-if="contact.contact_id != 0 && contact.contact.privilege == 1" src="https://img.shields.io/badge/%E5%85%88%E9%94%8B%E5%B8%82%E5%9C%BA-%E7%AE%A1%E7%90%86%E5%91%98-9300dd.svg">
<img v-if="contact.contact_id != 0 && contact.contact.privilege == 2" src="https://img.shields.io/badge/%E5%85%88%E9%94%8B%E5%B8%82%E5%9C%BA-%E7%AE%A1%E7%90%86%E5%91%98-ee0000.svg">
</p>
</td>
</tr>
<span id="contact-closer" class="badge secondary"