diff --git a/app/Builders/ImGroupUserList.php b/app/Builders/ImGroupUserList.php index 0f3e1846..909adbed 100644 --- a/app/Builders/ImGroupUserList.php +++ b/app/Builders/ImGroupUserList.php @@ -36,7 +36,7 @@ class ImGroupUserList extends Builder $userRepo = new UserRepo(); - $columns = ['id', 'name', 'avatar', 'about', 'vip']; + $columns = ['id', 'name', 'avatar', 'title', 'about', 'vip']; $users = $userRepo->findByIds($ids, $columns); diff --git a/app/Caches/ImGroupActiveUserList.php b/app/Caches/ImGroupActiveUserList.php new file mode 100644 index 00000000..82c24f68 --- /dev/null +++ b/app/Caches/ImGroupActiveUserList.php @@ -0,0 +1,82 @@ +lifetime; + } + + public function getKey($id = null) + { + return "im_group_active_user_list:{$id}"; + } + + public function getContent($id = null) + { + $users = $this->findUsers($id); + + if (!$users) return []; + + $result = []; + + foreach ($users as $user) { + $result[] = [ + 'id' => $user->id, + 'name' => $user->name, + 'avatar' => $user->avatar, + 'title' => $user->title, + 'about' => $user->about, + 'vip' => $user->vip, + ]; + } + + return $result; + } + + /** + * @param int $groupId + * @param int $days + * @param int $limit + * @return ResultsetInterface|Resultset|UserModel[] + */ + protected function findUsers($groupId, $days = 7, $limit = 5) + { + $result = []; + + $startTime = strtotime("-{$days} days"); + $endTime = time(); + + $rows = ImGroupMessageModel::query() + ->columns(['sender_id', 'total_count' => 'count(sender_id)']) + ->groupBy('sender_id') + ->orderBy('total_count DESC') + ->where('group_id = :group_id:', ['group_id' => $groupId]) + ->betweenWhere('create_time', $startTime, $endTime) + ->limit($limit) + ->execute(); + + if ($rows->count() > 0) { + + $ids = kg_array_column($rows->toArray(), 'sender_id'); + + $userRepo = new UserRepo(); + + $result = $userRepo->findByIds($ids); + } + + return $result; + } + +} diff --git a/app/Http/Web/Controllers/ImGroupController.php b/app/Http/Web/Controllers/ImGroupController.php index 61c452c5..cc808e77 100644 --- a/app/Http/Web/Controllers/ImGroupController.php +++ b/app/Http/Web/Controllers/ImGroupController.php @@ -54,57 +54,26 @@ class ImGroupController extends Controller { $service = new ImGroupService(); - $group = $service->getGroup($id); - $pager = $service->getGroupUsers($id); - $pager->items = kg_array_object($pager->items); + $pager->target = 'user-list'; - $this->view->setVar('group', $group); + $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); $this->view->setVar('pager', $pager); } /** - * @Get("/{id:[0-9]+}/edit", name="web.im_group.edit") + * @Get("/{id:[0-9]+}/users/active", name="web.im_group.active_users") */ - public function editAction($id) + public function activeUsersAction($id) { $service = new ImGroupService(); - $group = $service->getGroup($id); + $users = $service->getActiveGroupUsers($id); - $this->view->setVar('group', $group); - } - - /** - * @Post("/{id:[0-9]+}/update", name="web.im_group.update") - */ - public function updateAction($id) - { - $service = new ImGroupService(); - - $service->updateGroup($id); - - $content = ['msg' => '更新群组成功']; - - return $this->jsonSuccess($content); - } - - /** - * @Post("/{gid:[0-9]+}/user/{uid:[0-9]+}/delete", name="web.im_group.delete_user") - */ - public function deleteGroupUserAction($gid, $uid) - { - $service = new ImGroupService(); - - $service->deleteGroupUser($gid, $uid); - - $content = [ - 'location' => $this->request->getHTTPReferer(), - 'msg' => '移除用户成功', - ]; - - return $this->jsonSuccess($content); + $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->pick('im_group/active_users'); + $this->view->setVar('users', $users); } } diff --git a/app/Http/Web/Controllers/ImGroupManageController.php b/app/Http/Web/Controllers/ImGroupManageController.php new file mode 100644 index 00000000..12be7023 --- /dev/null +++ b/app/Http/Web/Controllers/ImGroupManageController.php @@ -0,0 +1,73 @@ +getGroup($id); + + $pager = $service->getGroupUsers($id); + + $pager->items = kg_array_object($pager->items); + + $this->view->setVar('group', $group); + $this->view->setVar('pager', $pager); + } + + /** + * @Get("/{id:[0-9]+}/edit", name="web.igm.edit") + */ + public function editAction($id) + { + $service = new ImGroupService(); + + $group = $service->getGroup($id); + + $this->view->setVar('group', $group); + } + + /** + * @Post("/{id:[0-9]+}/update", name="web.igm.update") + */ + public function updateAction($id) + { + $service = new ImGroupService(); + + $service->updateGroup($id); + + $content = ['msg' => '更新群组成功']; + + return $this->jsonSuccess($content); + } + + /** + * @Post("/{gid:[0-9]+}/user/{uid:[0-9]+}/delete", name="web.igm.delete_user") + */ + public function deleteGroupUserAction($gid, $uid) + { + $service = new ImGroupService(); + + $service->deleteGroupUser($gid, $uid); + + $content = [ + 'location' => $this->request->getHTTPReferer(), + 'msg' => '移除用户成功', + ]; + + return $this->jsonSuccess($content); + } + +} diff --git a/app/Http/Web/Services/Im.php b/app/Http/Web/Services/Im.php index 121868b9..bfdfaa33 100644 --- a/app/Http/Web/Services/Im.php +++ b/app/Http/Web/Services/Im.php @@ -371,15 +371,18 @@ class Im extends Service if ($online) { Gateway::sendToUid($to['id'], $content); } else { - $msgCount = $relation->msg_count + 1; - $relation->update(['msg_count' => $msgCount]); + $this->incrFriendUserMsgCount($relation); } } elseif ($to['type'] == 'group') { + $validator = new ImGroupValidator(); + + $group = $validator->checkGroup($to['id']); + $validator = new ImGroupUserValidator(); - $validator->checkGroupUser($to['id'], $user->id); + $validator->checkGroupUser($group->id, $user->id); $messageModel = new ImGroupMessageModel(); @@ -389,6 +392,8 @@ class Im extends Service 'content' => $from['content'], ]); + $this->incrGroupMessageCount($group); + $excludeClientId = null; /** diff --git a/app/Http/Web/Services/ImFriendTrait.php b/app/Http/Web/Services/ImFriendTrait.php index 73f6eb7f..a210b721 100644 --- a/app/Http/Web/Services/ImFriendTrait.php +++ b/app/Http/Web/Services/ImFriendTrait.php @@ -279,4 +279,10 @@ Trait ImFriendTrait } } + protected function incrFriendUserMsgCount(ImFriendUserModel $friendUser) + { + $friendUser->msg_count += 1; + $friendUser->update(); + } + } diff --git a/app/Http/Web/Services/ImGroup.php b/app/Http/Web/Services/ImGroup.php index 0c4aac57..cb55705f 100644 --- a/app/Http/Web/Services/ImGroup.php +++ b/app/Http/Web/Services/ImGroup.php @@ -4,6 +4,7 @@ namespace App\Http\Web\Services; use App\Builders\ImGroupList as ImGroupListBuilder; use App\Builders\ImGroupUserList as ImGroupUserListBuilder; +use App\Caches\ImGroupActiveUserList as ImGroupActiveUserListCache; use App\Library\Paginator\Query as PagerQuery; use App\Models\ImGroup as ImGroupModel; use App\Repos\ImGroup as ImGroupRepo; @@ -34,6 +35,67 @@ class ImGroup extends Service return $this->handleGroups($pager); } + public function getGroup($id) + { + $validator = new ImGroupValidator(); + + $group = $validator->checkGroup($id); + + $userRepo = new UserRepo(); + + $owner = $userRepo->findById($group->owner_id); + + return [ + 'id' => $group->id, + 'type' => $group->type, + 'name' => $group->name, + 'avatar' => $group->avatar, + 'about' => $group->about, + 'user_count' => $group->user_count, + 'msg_count' => $group->msg_count, + 'owner' => [ + 'id' => $owner->id, + 'name' => $owner->name, + 'avatar' => $owner->avatar, + 'title' => $owner->title, + 'about' => $owner->about, + 'vip' => $owner->vip, + ], + ]; + } + + public function getGroupUsers($id) + { + $validator = new ImGroupValidator(); + + $group = $validator->checkGroup($id); + + $pagerQuery = new PagerQuery(); + + $params = $pagerQuery->getParams(); + + $params['group_id'] = $group->id; + + $sort = $pagerQuery->getSort(); + $page = $pagerQuery->getPage(); + $limit = $pagerQuery->getLimit(); + + $repo = new ImGroupUserRepo(); + + $pager = $repo->paginate($params, $sort, $page, $limit); + + return $this->handleGroupUsers($pager); + } + + public function getActiveGroupUsers($id) + { + $cache = new ImGroupActiveUserListCache(); + + $result = $cache->get($id); + + return $result ?: []; + } + public function updateGroup($id) { $post = $this->request->getPost(); @@ -68,54 +130,6 @@ class ImGroup extends Service return $group; } - public function getGroup($id) - { - $validator = new ImGroupValidator(); - - $group = $validator->checkGroup($id); - - $userRepo = new UserRepo(); - - $owner = $userRepo->findById($group->owner_id); - - return [ - 'id' => $group->id, - 'name' => $group->name, - 'about' => $group->about, - 'user_count' => $group->user_count, - 'owner' => [ - 'id' => $owner->id, - 'name' => $owner->name, - 'avatar' => $owner->avatar, - 'title' => $owner->title, - 'about' => $owner->about, - ], - ]; - } - - public function getGroupUsers($id) - { - $validator = new ImGroupValidator(); - - $group = $validator->checkGroup($id); - - $pagerQuery = new PagerQuery(); - - $params = $pagerQuery->getParams(); - - $params['group_id'] = $group->id; - - $sort = $pagerQuery->getSort(); - $page = $pagerQuery->getPage(); - $limit = $pagerQuery->getLimit(); - - $repo = new ImGroupUserRepo(); - - $pager = $repo->paginate($params, $sort, $page, $limit); - - return $this->handleGroupUsers($pager); - } - public function deleteGroupUser($groupId, $userId) { $loginUser = $this->getLoginUser(); @@ -183,6 +197,7 @@ class ImGroup extends Service 'avatar' => $group['avatar'], 'about' => $group['about'], 'user_count' => $group['user_count'], + 'msg_count' => $group['msg_count'], 'owner' => $group['owner'], ]; } diff --git a/app/Http/Web/Services/ImGroupTrait.php b/app/Http/Web/Services/ImGroupTrait.php index 549bbfe2..2ace2d61 100644 --- a/app/Http/Web/Services/ImGroupTrait.php +++ b/app/Http/Web/Services/ImGroupTrait.php @@ -148,7 +148,7 @@ Trait ImGroupTrait { $userRepo = new ImUserRepo(); - $receiver = $userRepo->findById($group->user_id); + $receiver = $userRepo->findById($group->owner_id); $itemType = ImSystemMessageModel::TYPE_GROUP_REQUEST; @@ -314,4 +314,10 @@ Trait ImGroupTrait } } + protected function incrGroupMessageCount(ImGroupModel $group) + { + $group->msg_count += 1; + $group->update(); + } + } diff --git a/app/Http/Web/Views/course/show.volt b/app/Http/Web/Views/course/show.volt index 703081d4..a355589c 100644 --- a/app/Http/Web/Views/course/show.volt +++ b/app/Http/Web/Views/course/show.volt @@ -84,8 +84,12 @@ {% set show_sidebar_related = 1 %}
- {{ partial('course/show_order') }} - {{ partial('course/show_teacher') }} + + {% if show_sidebar_topics %} {% set topics_url = url({'for':'web.course.topics','id':course.id}) %} diff --git a/app/Http/Web/Views/course/show_order.volt b/app/Http/Web/Views/course/show_order.volt index 9bcc857b..62899443 100644 --- a/app/Http/Web/Views/course/show_order.volt +++ b/app/Http/Web/Views/course/show_order.volt @@ -1,7 +1,7 @@ {% if course.me.owned == 0 and course.market_price > 0 %} {% endif %} @@ -13,7 +13,7 @@ {% for reward in rewards %} {% set item_id = [course.id,reward.id]|join('-') %} {% set order_url = url({'for':'web.order.confirm'},{'item_id':item_id,'item_type':'reward'}) %} - {{ reward.title }} + {% endfor %}
diff --git a/app/Http/Web/Views/course/topics.volt b/app/Http/Web/Views/course/topics.volt index 4839d2fc..e2072626 100644 --- a/app/Http/Web/Views/course/topics.volt +++ b/app/Http/Web/Views/course/topics.volt @@ -3,7 +3,8 @@
热门专题
{% for topic in topics %} - {{ topic.title }} + {% set topic_url = url({'for':'web.topic.show','id':topic.id}) %} + {{ topic.title }} {% endfor %}
diff --git a/app/Http/Web/Views/im_group/active_users.volt b/app/Http/Web/Views/im_group/active_users.volt new file mode 100644 index 00000000..4ac5db84 --- /dev/null +++ b/app/Http/Web/Views/im_group/active_users.volt @@ -0,0 +1,22 @@ +{% if users %} +
+
活跃成员
+
+ {% for user in users %} + {% set user_url = url({'for':'web.user.show','id':user.id}) %} + {% set user.title = user.title ? user.title : '暂无头衔' %} + + {% endfor %} +
+
+{% endif %} \ No newline at end of file diff --git a/app/Http/Web/Views/im_group/list.volt b/app/Http/Web/Views/im_group/list.volt index 38024576..e10b53a5 100644 --- a/app/Http/Web/Views/im_group/list.volt +++ b/app/Http/Web/Views/im_group/list.volt @@ -15,6 +15,6 @@ {% block include_js %} - {{ js_include('web/js/group.list.js') }} + {{ js_include('web/js/im_group.list.js') }} {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/im_group/pager.volt b/app/Http/Web/Views/im_group/pager.volt index 4924e053..be67fec9 100644 --- a/app/Http/Web/Views/im_group/pager.volt +++ b/app/Http/Web/Views/im_group/pager.volt @@ -1,8 +1,10 @@ {% if pager.total_pages > 0 %} -
+
{% for item in pager.items %} {% set group_url = url({'for':'web.im_group.show','id':item.id}) %} + {% set owner_url = url({'for':'web.user.show','id':item.owner.id}) %} + {% set item.about = item.about ? item.about : '这家伙真懒,什么都没留下!' %}
{% if item.type == 'course' %} @@ -18,8 +20,12 @@ -
- +
+ 组长:{{ item.owner.name }} +
+
+ 成员:{{ item.user_count }} + 讨论:{{ item.msg_count }}
diff --git a/app/Http/Web/Views/im_group/show.volt b/app/Http/Web/Views/im_group/show.volt index 0e740ebd..44f80323 100644 --- a/app/Http/Web/Views/im_group/show.volt +++ b/app/Http/Web/Views/im_group/show.volt @@ -3,7 +3,9 @@ {% block content %} {% set group.about = group.about ? group.about : '这个家伙真懒,什么都没有留下~' %} + {% set apply_group_url = '' %} {% set users_url = url({'for':'web.im_group.users','id':group.id}) %} + {% set active_users_url = url({'for':'web.im_group.active_users','id':group.id}) %} -
+
-
+
小组介绍
-
-
{{ group.about }}
-
+
{{ group.about }}
-
+
小组成员
-
+
+
- {{ partial('im_group/show_owner') }} - {{ partial('im_group/show_active_users') }} + + +
@@ -38,6 +44,6 @@ {% block include_js %} - {{ js_include('web/js/user.show.js') }} + {{ js_include('web/js/im_group.show.js') }} {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/im_group/show_active_users.volt b/app/Http/Web/Views/im_group/show_active_users.volt deleted file mode 100644 index 3acab784..00000000 --- a/app/Http/Web/Views/im_group/show_active_users.volt +++ /dev/null @@ -1,16 +0,0 @@ -
-
活跃成员
-
- -
-
\ No newline at end of file diff --git a/app/Http/Web/Views/im_group/show_owner.volt b/app/Http/Web/Views/im_group/show_owner.volt index 90c6ee30..1ddb50b8 100644 --- a/app/Http/Web/Views/im_group/show_owner.volt +++ b/app/Http/Web/Views/im_group/show_owner.volt @@ -10,7 +10,7 @@
{{ group.owner.title }}
diff --git a/app/Http/Web/Views/im_group/users.volt b/app/Http/Web/Views/im_group/users.volt index 8ab7fd46..59066188 100644 --- a/app/Http/Web/Views/im_group/users.volt +++ b/app/Http/Web/Views/im_group/users.volt @@ -1,31 +1,26 @@ -{% extends 'templates/layer.volt' %} - -{% block content %} - -
-
-
- {% for item in pager.items %} - {% set delete_url = url({'for':'web.im_group.delete_user','gid':group.id,'uid':item.id}) %} -
-
- {% if item.vip == 1 %} - 会员 - {% endif %} -
- {{ item.name }} -
-
{{ item.name }}
-
- -
-
+
+
+ {% for item in pager.items %} + {% set user_url = url({'for':'web.user.show','id':item.id}) %} +
+
+ {% if item.vip == 1 %} + VIP + {% endif %} + - {% endfor %} + +
+ 添加好友 +
+
-
- {{ partial('partials/pager') }} + {% endfor %}
- -{% endblock %} - +
+{{ partial('partials/pager_ajax') }} \ No newline at end of file diff --git a/app/Http/Web/Views/im_group/edit.volt b/app/Http/Web/Views/im_group_manage/edit.volt similarity index 100% rename from app/Http/Web/Views/im_group/edit.volt rename to app/Http/Web/Views/im_group_manage/edit.volt diff --git a/app/Http/Web/Views/im_group_manage/users.volt b/app/Http/Web/Views/im_group_manage/users.volt new file mode 100644 index 00000000..8ab7fd46 --- /dev/null +++ b/app/Http/Web/Views/im_group_manage/users.volt @@ -0,0 +1,31 @@ +{% extends 'templates/layer.volt' %} + +{% block content %} + +
+
+
+ {% for item in pager.items %} + {% set delete_url = url({'for':'web.im_group.delete_user','gid':group.id,'uid':item.id}) %} +
+
+ {% if item.vip == 1 %} + 会员 + {% endif %} +
+ {{ item.name }} +
+
{{ item.name }}
+
+ +
+
+
+ {% endfor %} +
+
+ {{ partial('partials/pager') }} +
+ +{% endblock %} + diff --git a/app/Http/Web/Views/my/groups_owned.volt b/app/Http/Web/Views/my/groups_owned.volt index f8cc2351..6037bdc8 100644 --- a/app/Http/Web/Views/my/groups_owned.volt +++ b/app/Http/Web/Views/my/groups_owned.volt @@ -9,23 +9,22 @@ 名称 - 群主 成员 + 讨论 操作 {% for item in pager.items %} - {% set owner_url = url({'for':'web.user.show','id':item.owner.id}) %} - {% set edit_url = url({'for':'web.im_group.edit','id':item.id}) %} - {% set users_url = url({'for':'web.im_group.users','id':item.id}) %} + {% set edit_url = url({'for':'web.igm.edit','id':item.id}) %} + {% set users_url = url({'for':'web.igm.users','id':item.id}) %} {{ item.name }} {{ type_info(item.type) }} - {{ item.owner.name }} {{ item.user_count }} + {{ item.msg_count }} - - + 成员 + 编辑 {% endfor %} diff --git a/app/Models/ImGroup.php b/app/Models/ImGroup.php index 191328bf..1acc1792 100644 --- a/app/Models/ImGroup.php +++ b/app/Models/ImGroup.php @@ -84,6 +84,13 @@ class ImGroup extends Model */ public $user_count; + /** + * 消息数 + * + * @var int + */ + public $msg_count; + /** * 创建时间 * diff --git a/app/Repos/ImGroup.php b/app/Repos/ImGroup.php index 11f7dd06..da5d0f92 100644 --- a/app/Repos/ImGroup.php +++ b/app/Repos/ImGroup.php @@ -4,6 +4,7 @@ namespace App\Repos; use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder; use App\Models\ImGroup as ImGroupModel; +use App\Models\ImGroupMessage as ImGroupMessageModel; use App\Models\ImGroupUser as ImGroupUserModel; use App\Models\ImUser as ImUserModel; use Phalcon\Mvc\Model; @@ -103,13 +104,21 @@ class ImGroup extends Repository public function countGroups() { - return (int)ImGroupModel::count(['conditions' => 'deleted = 0']); + return (int)ImGroupModel::count(['conditions' => 'published = 1']); } public function countUsers($groupId) { return (int)ImGroupUserModel::count([ - 'conditions' => 'group_id = :group_id: AND blocked = 0', + 'conditions' => 'group_id = :group_id:', + 'bind' => ['group_id' => $groupId], + ]); + } + + public function countMessages($groupId) + { + return (int)ImGroupMessageModel::count([ + 'conditions' => 'group_id = :group_id: AND published = 1', 'bind' => ['group_id' => $groupId], ]); } diff --git a/app/Repos/ImUser.php b/app/Repos/ImUser.php index 56879c3c..8b802f1f 100644 --- a/app/Repos/ImUser.php +++ b/app/Repos/ImUser.php @@ -111,7 +111,7 @@ class ImUser extends Repository ->addFrom(ImGroupModel::class, 'g') ->join(ImGroupUserModel::class, 'g.id = gu.group_id', 'gu') ->where('gu.user_id = :user_id:', ['user_id' => $userId]) - ->andWhere('g.published = 0') + ->andWhere('g.published = 1') ->getQuery()->execute(); } diff --git a/app/Services/Frontend/My/GroupList.php b/app/Services/Frontend/My/GroupList.php index d7d79996..407da39a 100644 --- a/app/Services/Frontend/My/GroupList.php +++ b/app/Services/Frontend/My/GroupList.php @@ -78,6 +78,7 @@ class GroupList extends FrontendService 'avatar' => $group['avatar'], 'about' => $group['about'], 'user_count' => $group['user_count'], + 'msg_count' => $group['msg_count'], 'owner' => $group['owner'], ]; } diff --git a/public/static/lib/layui/extends/helper.js b/public/static/lib/layui/extends/helper.js index d0dc4f59..fe7d4650 100644 --- a/public/static/lib/layui/extends/helper.js +++ b/public/static/lib/layui/extends/helper.js @@ -1,8 +1,7 @@ -layui.define(['jquery', 'element', 'layer'], function (exports) { +layui.define(['jquery', 'layer'], function (exports) { var MOD_NAME = 'helper'; var $ = layui.jquery; - var element = layui.element; var layer = layui.layer; var helper = {}; @@ -13,7 +12,6 @@ layui.define(['jquery', 'element', 'layer'], function (exports) { $target.html(html); $.get(url, function (html) { $target.html(html); - element.init(); }); }; diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index 54ce807b..3195a773 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -1269,10 +1269,6 @@ body { color: #666; } -.user-list { - margin-bottom: 20px; -} - .user-card { float: left; width: 100%; @@ -1305,9 +1301,21 @@ body { margin-bottom: 15px; } +.user-card .owner { + margin-bottom: 15px; + color: #666; +} + .user-card .title { color: #666; - font-size: 12px; +} + +.user-card .meta { + color: #666; +} + +.user-card .meta span { + margin-right: 5px; } .user-card .action button { @@ -1332,6 +1340,30 @@ body { right: 28px; } +.user-list { + margin-bottom: 20px; +} + +.group-user-list .user-card { + height: 200px; + box-shadow: none; +} + +.group-user-list .user-card .avatar { + margin-top: 15px; +} + +.im-group-list .user-card { + height: 250px; +} + +.group-about { + padding: 15px; + min-height: 65px; + font-size: 12px; + color: #666; +} + .my-sidebar { float: left; width: 220px; @@ -1386,7 +1418,7 @@ body { } .wrap .layui-table { - margin-top: 0; + margin: 0; } .layui-table p { @@ -1639,12 +1671,14 @@ body { position: absolute; top: 10px; right: 10px; + font-size: 12px; } .layim-chat-list li .msg-count { position: absolute; top: 5px; right: 30px; + font-size: 12px; } .layim-chat-status .online { diff --git a/public/static/web/js/group.list.js b/public/static/web/js/im_group.list.js similarity index 100% rename from public/static/web/js/group.list.js rename to public/static/web/js/im_group.list.js diff --git a/public/static/web/js/im_group.show.js b/public/static/web/js/im_group.show.js new file mode 100644 index 00000000..f809cfca --- /dev/null +++ b/public/static/web/js/im_group.show.js @@ -0,0 +1,12 @@ +layui.use(['jquery', 'helper'], function () { + + var $ = layui.jquery; + var helper = layui.helper; + + var $userList = $('#user-list'); + var $activeUserList = $('#active-user-list'); + + helper.ajaxLoadHtml($userList.data('url'), $userList.attr('id')); + helper.ajaxLoadHtml($activeUserList.data('url'), $activeUserList.attr('id')); + +}); \ No newline at end of file