From c9828565642bd79582ef0b25b5fc71fd0357eeb8 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Fri, 31 Jul 2020 19:37:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E7=BB=84=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Caches/ImNewGroupList.php | 1 + app/Http/Admin/Services/Course.php | 11 +++ app/Http/Web/Controllers/CourseController.php | 2 + .../Web/Controllers/ImGroupController.php | 21 +++++ app/Http/Web/Controllers/SearchController.php | 2 + .../Web/Controllers/TeacherController.php | 10 ++- app/Http/Web/Controllers/TopicController.php | 5 +- app/Http/Web/Controllers/UserController.php | 2 + app/Http/Web/Controllers/VipController.php | 2 + app/Http/Web/Services/Im.php | 1 + app/Http/Web/Services/ImGroup.php | 80 ++++++++++++++++++- app/Http/Web/Views/chapter/breadcrumb.volt | 15 ---- app/Http/Web/Views/course/show.volt | 4 +- app/Http/Web/Views/course/show_teacher.volt | 8 +- app/Http/Web/Views/im/find_groups.volt | 15 +++- app/Http/Web/Views/im/find_users.volt | 4 +- app/Http/Web/Views/im_group/edit.volt | 3 +- app/Http/Web/Views/im_group/list.volt | 20 +++++ app/Http/Web/Views/im_group/pager.volt | 30 +++++++ app/Http/Web/Views/im_group/show.volt | 43 ++++++++++ .../Web/Views/im_group/show_active_users.volt | 16 ++++ app/Http/Web/Views/im_group/show_owner.volt | 19 +++++ app/Http/Web/Views/teacher/list.volt | 2 +- .../topic/{ajax_courses.volt => courses.volt} | 0 app/Http/Web/Views/vip/users.volt | 7 +- app/Repos/Course.php | 13 +++ public/static/web/css/common.css | 46 ++++++----- public/static/web/js/group.list.js | 9 +++ public/static/web/js/teacher.list.js | 1 - 29 files changed, 333 insertions(+), 59 deletions(-) delete mode 100644 app/Http/Web/Views/chapter/breadcrumb.volt create mode 100644 app/Http/Web/Views/im_group/list.volt create mode 100644 app/Http/Web/Views/im_group/pager.volt create mode 100644 app/Http/Web/Views/im_group/show.volt create mode 100644 app/Http/Web/Views/im_group/show_active_users.volt create mode 100644 app/Http/Web/Views/im_group/show_owner.volt rename app/Http/Web/Views/topic/{ajax_courses.volt => courses.volt} (100%) create mode 100644 public/static/web/js/group.list.js diff --git a/app/Caches/ImNewGroupList.php b/app/Caches/ImNewGroupList.php index c127d0da..ff819b97 100644 --- a/app/Caches/ImNewGroupList.php +++ b/app/Caches/ImNewGroupList.php @@ -45,6 +45,7 @@ class ImNewGroupList extends Cache foreach ($groups as $group) { $result[] = [ 'id' => $group->id, + 'type' => $group->type, 'name' => $group->name, 'avatar' => $group->avatar, 'about' => $group->about, diff --git a/app/Http/Admin/Services/Course.php b/app/Http/Admin/Services/Course.php index 04ea4b02..b907e6d1 100644 --- a/app/Http/Admin/Services/Course.php +++ b/app/Http/Admin/Services/Course.php @@ -190,6 +190,8 @@ class Course extends Service $course->update($data); + $this->updateCourseGroup($course); + $this->rebuildCourseIndex($course); return $course; @@ -365,6 +367,15 @@ class Course extends Service return $validator->checkCourse($id); } + protected function updateCourseGroup(CourseModel $course) + { + $courseRepo = new CourseRepo(); + + $imGroup = $courseRepo->findImGroup($course->id); + + $imGroup->update(['name' => $course->title]); + } + protected function rebuildCourseCache(CourseModel $course) { $cache = new CourseCache(); diff --git a/app/Http/Web/Controllers/CourseController.php b/app/Http/Web/Controllers/CourseController.php index ba96a028..1d6f1dd7 100644 --- a/app/Http/Web/Controllers/CourseController.php +++ b/app/Http/Web/Controllers/CourseController.php @@ -38,6 +38,8 @@ class CourseController extends Controller $sorts = $service->handleSorts(); $params = $service->getParams(); + $this->siteSeo->prependTitle('课程'); + $this->view->setVar('top_categories', $topCategories); $this->view->setVar('sub_categories', $subCategories); $this->view->setVar('models', $models); diff --git a/app/Http/Web/Controllers/ImGroupController.php b/app/Http/Web/Controllers/ImGroupController.php index 10fe63a7..61c452c5 100644 --- a/app/Http/Web/Controllers/ImGroupController.php +++ b/app/Http/Web/Controllers/ImGroupController.php @@ -3,6 +3,7 @@ namespace App\Http\Web\Controllers; use App\Http\Web\Services\ImGroup as ImGroupService; +use Phalcon\Mvc\View; /** * @RoutePrefix("/im/group") @@ -15,7 +16,23 @@ class ImGroupController extends Controller */ public function listAction() { + $this->siteSeo->prependTitle('群组'); + } + /** + * @Get("/pager", name="web.im_group.pager") + */ + public function pagerAction() + { + $service = new ImGroupService(); + + $pager = $service->getGroups(); + $pager->items = kg_array_object($pager->items); + $pager->target = 'group-list'; + + $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->pick('im_group/pager'); + $this->view->setVar('pager', $pager); } /** @@ -23,7 +40,11 @@ class ImGroupController extends Controller */ public function showAction($id) { + $service = new ImGroupService(); + $group = $service->getGroup($id); + + $this->view->setVar('group', $group); } /** diff --git a/app/Http/Web/Controllers/SearchController.php b/app/Http/Web/Controllers/SearchController.php index 22a34bed..21491c21 100644 --- a/app/Http/Web/Controllers/SearchController.php +++ b/app/Http/Web/Controllers/SearchController.php @@ -26,6 +26,8 @@ class SearchController extends Controller return $this->response->redirect(['for' => 'web.course.list']); } + $this->siteSeo->prependTitle([$query, '搜索']); + $service = new CourseHotQueryService(); $hotQueries = $service->handle(); diff --git a/app/Http/Web/Controllers/TeacherController.php b/app/Http/Web/Controllers/TeacherController.php index e443084c..a6cd9b3a 100644 --- a/app/Http/Web/Controllers/TeacherController.php +++ b/app/Http/Web/Controllers/TeacherController.php @@ -16,7 +16,7 @@ class TeacherController extends Controller */ public function listAction() { - + $this->siteSeo->prependTitle('教师'); } /** @@ -38,9 +38,13 @@ class TeacherController extends Controller /** * @Get("/{id:[0-9]+}", name="web.teacher.show") */ - public function showAction() + public function showAction($id) { - + return $this->dispatcher->forward([ + 'controller' => 'user', + 'action' => 'show', + 'params' => ['id' => $id], + ]); } } diff --git a/app/Http/Web/Controllers/TopicController.php b/app/Http/Web/Controllers/TopicController.php index 413488e9..255f64e4 100644 --- a/app/Http/Web/Controllers/TopicController.php +++ b/app/Http/Web/Controllers/TopicController.php @@ -21,6 +21,9 @@ class TopicController extends Controller $topic = $service->handle($id); + $this->siteSeo->prependTitle($topic['title']); + $this->siteSeo->setDescription($topic['summary']); + $this->view->setVar('topic', $topic); } @@ -36,7 +39,7 @@ class TopicController extends Controller $pager->target = 'course-list'; $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); - $this->view->pick('topic/ajax_courses'); + $this->view->pick('topic/courses'); $this->view->setVar('pager', $pager); } diff --git a/app/Http/Web/Controllers/UserController.php b/app/Http/Web/Controllers/UserController.php index ff83d8d7..7c783dbb 100644 --- a/app/Http/Web/Controllers/UserController.php +++ b/app/Http/Web/Controllers/UserController.php @@ -24,6 +24,8 @@ class UserController extends Controller $user = $service->handle($id); + $this->siteSeo->prependTitle("{$user['name']}的个人主页"); + $this->view->setVar('user', $user); } diff --git a/app/Http/Web/Controllers/VipController.php b/app/Http/Web/Controllers/VipController.php index 187d00ca..dba5cb7f 100644 --- a/app/Http/Web/Controllers/VipController.php +++ b/app/Http/Web/Controllers/VipController.php @@ -22,6 +22,8 @@ class VipController extends Controller $vipOptions = $service->handle(); + $this->siteSeo->prependTitle('会员'); + $this->view->setVar('vip_options', $vipOptions); } diff --git a/app/Http/Web/Services/Im.php b/app/Http/Web/Services/Im.php index 93f4904c..121868b9 100644 --- a/app/Http/Web/Services/Im.php +++ b/app/Http/Web/Services/Im.php @@ -682,6 +682,7 @@ class Im extends Service $group['avatar'] = $baseUrl . $group['avatar']; $items[] = [ 'id' => $group['id'], + 'type' => $group['type'], 'name' => $group['name'], 'avatar' => $group['avatar'], 'about' => $group['about'], diff --git a/app/Http/Web/Services/ImGroup.php b/app/Http/Web/Services/ImGroup.php index f5ad239e..0c4aac57 100644 --- a/app/Http/Web/Services/ImGroup.php +++ b/app/Http/Web/Services/ImGroup.php @@ -2,9 +2,13 @@ namespace App\Http\Web\Services; +use App\Builders\ImGroupList as ImGroupListBuilder; use App\Builders\ImGroupUserList as ImGroupUserListBuilder; use App\Library\Paginator\Query as PagerQuery; +use App\Models\ImGroup as ImGroupModel; +use App\Repos\ImGroup as ImGroupRepo; use App\Repos\ImGroupUser as ImGroupUserRepo; +use App\Repos\User as UserRepo; use App\Validators\ImGroup as ImGroupValidator; use App\Validators\ImGroupUser as ImGroupUserValidator; @@ -13,7 +17,21 @@ class ImGroup extends Service public function getGroups() { + $pagerQuery = new PagerQuery(); + $params = $pagerQuery->getParams(); + + $params['published'] = 1; + + $sort = $pagerQuery->getSort(); + $page = $pagerQuery->getPage(); + $limit = $pagerQuery->getLimit(); + + $groupRepo = new ImGroupRepo(); + + $pager = $groupRepo->paginate($params, $sort, $page, $limit); + + return $this->handleGroups($pager); } public function updateGroup($id) @@ -30,7 +48,10 @@ class ImGroup extends Service $data = []; - if (!empty($post['name'])) { + /** + * 课程群组不允许改名 + */ + if (!empty($post['name']) && $group->type == ImGroupModel::TYPE_CHAT) { $data['name'] = $validator->checkName($post['name']); } @@ -51,7 +72,25 @@ class ImGroup extends Service { $validator = new ImGroupValidator(); - return $validator->checkGroup($id); + $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) @@ -116,4 +155,41 @@ class ImGroup extends Service return $pager; } + protected function handleGroups($pager) + { + if ($pager->total_items == 0) { + return $pager; + } + + $builder = new ImGroupListBuilder(); + + $groups = $pager->items->toArray(); + + $users = $builder->getUsers($groups); + + $baseUrl = kg_ci_base_url(); + + $items = []; + + foreach ($groups as $group) { + + $group['avatar'] = $baseUrl . $group['avatar']; + $group['owner'] = $users[$group['owner_id']] ?? new \stdClass(); + + $items[] = [ + 'id' => $group['id'], + 'type' => $group['type'], + 'name' => $group['name'], + 'avatar' => $group['avatar'], + 'about' => $group['about'], + 'user_count' => $group['user_count'], + 'owner' => $group['owner'], + ]; + } + + $pager->items = $items; + + return $pager; + } + } diff --git a/app/Http/Web/Views/chapter/breadcrumb.volt b/app/Http/Web/Views/chapter/breadcrumb.volt deleted file mode 100644 index 40243c39..00000000 --- a/app/Http/Web/Views/chapter/breadcrumb.volt +++ /dev/null @@ -1,15 +0,0 @@ -
- - 返回课程 - {{ chapter.course.title }} - {{ chapter.title }} - - -
\ No newline at end of file diff --git a/app/Http/Web/Views/course/show.volt b/app/Http/Web/Views/course/show.volt index 14b98c15..703081d4 100644 --- a/app/Http/Web/Views/course/show.volt +++ b/app/Http/Web/Views/course/show.volt @@ -18,12 +18,12 @@ {% endfor %} {{ course.title }} -
+
+ {{ partial('course/show_meta') }} diff --git a/app/Http/Web/Views/course/show_teacher.volt b/app/Http/Web/Views/course/show_teacher.volt index 78d281e3..e1c9523d 100644 --- a/app/Http/Web/Views/course/show_teacher.volt +++ b/app/Http/Web/Views/course/show_teacher.volt @@ -4,16 +4,16 @@
{% for teacher in course.teachers %} {% set teacher_url = url({'for':'web.user.show','id':teacher.id}) %} -
+ {% set teacher.title = teacher.title ? teacher.title : '小小教书匠' %} +
- {{ teacher.name }} + {{ teacher.name }}
{{ teacher.name }}
- {% set title = teacher.title ? teacher.title : '小小教书匠' %} -
{{ title }}
+
{{ teacher.title }}
{% endfor %} diff --git a/app/Http/Web/Views/im/find_groups.volt b/app/Http/Web/Views/im/find_groups.volt index cc3cf84d..57915bca 100644 --- a/app/Http/Web/Views/im/find_groups.volt +++ b/app/Http/Web/Views/im/find_groups.volt @@ -3,13 +3,20 @@
{% for item in pager.items %}
-
+
+ {% if item.type == 'course' %} + 课 + {% elseif item.type == 'chat' %} + 聊 + {% endif %}
- {{ item.name }} + + {{ item.name }} +
-
{{ item.name }}
+
{{ item.name }}
- 加入群组 + 申请加入
diff --git a/app/Http/Web/Views/im/find_users.volt b/app/Http/Web/Views/im/find_users.volt index 2f259411..cce64ea3 100644 --- a/app/Http/Web/Views/im/find_users.volt +++ b/app/Http/Web/Views/im/find_users.volt @@ -5,14 +5,14 @@
{% if item.vip == 1 %} - VIP + VIP {% endif %}
{{ item.name }}
{{ item.name }}
- + 申请好友
diff --git a/app/Http/Web/Views/im_group/edit.volt b/app/Http/Web/Views/im_group/edit.volt index 901ad162..55cc16e1 100644 --- a/app/Http/Web/Views/im_group/edit.volt +++ b/app/Http/Web/Views/im_group/edit.volt @@ -3,6 +3,7 @@ {% block content %} {% set update_url = url({'for':'web.im_group.update','id':group.id}) %} + {% set name_readonly = group.type == 'course' ? 'readonly="readonly"' : '' %}
@@ -18,7 +19,7 @@
- +
diff --git a/app/Http/Web/Views/im_group/list.volt b/app/Http/Web/Views/im_group/list.volt new file mode 100644 index 00000000..38024576 --- /dev/null +++ b/app/Http/Web/Views/im_group/list.volt @@ -0,0 +1,20 @@ +{% extends 'templates/main.volt' %} + +{% block content %} + + {% set pager_url = url({'for':'web.im_group.pager'}) %} + +
+ 首页 + 群组 +
+ +
+ +{% endblock %} + +{% block include_js %} + + {{ js_include('web/js/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 new file mode 100644 index 00000000..4924e053 --- /dev/null +++ b/app/Http/Web/Views/im_group/pager.volt @@ -0,0 +1,30 @@ +{% if pager.total_pages > 0 %} +
+
+ {% for item in pager.items %} + {% set group_url = url({'for':'web.im_group.show','id':item.id}) %} +
+
+ {% if item.type == 'course' %} + 课 + {% elseif item.type == 'chat' %} + 聊 + {% endif %} +
+ + {{ item.name }} + +
+
+ {{ item.name }} +
+
+ +
+
+
+ {% endfor %} +
+
+ {{ partial('partials/pager_ajax') }} +{% endif %} \ No newline at end of file diff --git a/app/Http/Web/Views/im_group/show.volt b/app/Http/Web/Views/im_group/show.volt new file mode 100644 index 00000000..0e740ebd --- /dev/null +++ b/app/Http/Web/Views/im_group/show.volt @@ -0,0 +1,43 @@ +{% extends 'templates/main.volt' %} + +{% block content %} + + {% set group.about = group.about ? group.about : '这个家伙真懒，什么都没有留下~' %} + {% set users_url = url({'for':'web.im_group.users','id':group.id}) %} + +
+ + 首页 + 群组 + {{ group.name }} + +
+ +
+
+
+
小组介绍
+
+
{{ group.about }}
+
+
+
+
小组成员
+
+
+
+
+
+
+ {{ partial('im_group/show_owner') }} + {{ partial('im_group/show_active_users') }} +
+
+ +{% endblock %} + +{% block include_js %} + + {{ js_include('web/js/user.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 new file mode 100644 index 00000000..3acab784 --- /dev/null +++ b/app/Http/Web/Views/im_group/show_active_users.volt @@ -0,0 +1,16 @@ +
+
活跃成员
+
+
+
+ +
+
+
+ 小明 +
+
社科
+
+
+
+
\ 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 new file mode 100644 index 00000000..90c6ee30 --- /dev/null +++ b/app/Http/Web/Views/im_group/show_owner.volt @@ -0,0 +1,19 @@ +{% set owner_url = url({'for':'web.user.show','id':group.owner.id}) %} +{% set group.owner.title = group.owner.title ? group.owner.title : '暂无头衔' %} + +
+
小组组长
+
+
+
+ {{ group.owner.name }} +
+
+
+ {{ group.owner.name }} +
+
{{ group.owner.title }}
+
+
+
+
\ No newline at end of file diff --git a/app/Http/Web/Views/teacher/list.volt b/app/Http/Web/Views/teacher/list.volt index 61fef5da..80d0e2c1 100644 --- a/app/Http/Web/Views/teacher/list.volt +++ b/app/Http/Web/Views/teacher/list.volt @@ -6,7 +6,7 @@
首页 - 名师 + 教师
diff --git a/app/Http/Web/Views/topic/ajax_courses.volt b/app/Http/Web/Views/topic/courses.volt similarity index 100% rename from app/Http/Web/Views/topic/ajax_courses.volt rename to app/Http/Web/Views/topic/courses.volt diff --git a/app/Http/Web/Views/vip/users.volt b/app/Http/Web/Views/vip/users.volt index 44f4512e..fdadbe02 100644 --- a/app/Http/Web/Views/vip/users.volt +++ b/app/Http/Web/Views/vip/users.volt @@ -1,5 +1,5 @@ {% if pager.total_pages > 0 %} -
+
{% for item in pager.items %} {% set user_about = item.about ? item.about : '这个人很懒，什么都没留下' %} @@ -7,7 +7,7 @@
{% if item.vip == 1 %} - VIP + VIP {% endif %}
@@ -17,9 +17,6 @@
{{ item.name }}
-
- -
{% endfor %} diff --git a/app/Repos/Course.php b/app/Repos/Course.php index 38229e97..fb625dfd 100644 --- a/app/Repos/Course.php +++ b/app/Repos/Course.php @@ -14,6 +14,7 @@ use App\Models\CoursePackage as CoursePackageModel; use App\Models\CourseRating as CourseRatingModel; use App\Models\CourseRelated as CourseRelatedModel; use App\Models\CourseUser as CourseUserModel; +use App\Models\ImGroup as ImGroupModel; use App\Models\Package as PackageModel; use App\Models\Review as ReviewModel; use App\Models\User as UserModel; @@ -144,6 +145,18 @@ class Course extends Repository ]); } + /** + * @param int $courseId + * @return ImGroupModel|Model|bool + */ + public function findImGroup($courseId) + { + return ImGroupModel::findFirst([ + 'conditions' => 'course_id = :course_id:', + 'bind' => ['course_id' => $courseId], + ]); + } + /** * @param int $courseId * @return ResultsetInterface|Resultset|UserModel[] diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index b0990dd9..54ce807b 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -265,12 +265,10 @@ body { float: left; width: 500px; color: #666; - font-size: 12px; } .search-course-card .title { margin-bottom: 10px; - font-size: 14px; white-space: nowrap; } @@ -278,6 +276,7 @@ body { margin-bottom: 10px; line-height: 1.5em; max-height: 4.5em; + font-size: 12px; word-wrap: break-word; overflow: hidden; } @@ -990,6 +989,10 @@ body { color: red; } +.vip-user-list .user-card { + height: 180px; +} + .cart-course-card { padding-bottom: 10px; margin-bottom: 10px; @@ -1316,15 +1319,17 @@ body { .user-card .vip { position: absolute; - top: 8px; - right: 8px; - padding: 1px 3px; - border-radius: 2px; - text-align: center; - font-size: 10px; - line-height: 1.5em; - background-color: orange; - color: white; + top: 10px; + right: 10px; + height: 16px; + line-height: 16px; + padding: 0 3px; +} + +.user-card .type { + position: absolute; + top: 18px; + right: 28px; } .my-sidebar { @@ -1555,16 +1560,21 @@ body { } .im-user-list .vip { - top: 5px; - right: 5px; + top: 8px; + right: 8px; + height: 14px; + line-height: 14px; font-size: 10px; } -.im-user-list .action button { - padding: 0 5px; - height: 20px; - line-height: 20px; - font-size: 12px; +.im-user-list .type { + top: 10px; + right: 10px; + padding: 0 3px; +} + +.im-user-list .action .layui-badge-rim { + cursor: pointer; } .im-user-list .layui-btn + .layui-btn { diff --git a/public/static/web/js/group.list.js b/public/static/web/js/group.list.js new file mode 100644 index 00000000..da11f20d --- /dev/null +++ b/public/static/web/js/group.list.js @@ -0,0 +1,9 @@ +layui.use(['jquery', 'helper'], function () { + + var $ = layui.jquery; + var helper = layui.helper; + var $groupList = $('#group-list'); + + helper.ajaxLoadHtml($groupList.data('url'), $groupList.attr('id')); + +}); \ No newline at end of file diff --git a/public/static/web/js/teacher.list.js b/public/static/web/js/teacher.list.js index 28cbe43c..acc5f9bd 100644 --- a/public/static/web/js/teacher.list.js +++ b/public/static/web/js/teacher.list.js @@ -2,7 +2,6 @@ layui.use(['jquery', 'helper'], function () { var $ = layui.jquery; var helper = layui.helper; - var $teacherList = $('#teacher-list'); helper.ajaxLoadHtml($teacherList.data('url'), $teacherList.attr('id'));