diff --git a/app/Http/Web/Controllers/CourseController.php b/app/Http/Web/Controllers/CourseController.php index bf8918b9..a49a8e00 100644 --- a/app/Http/Web/Controllers/CourseController.php +++ b/app/Http/Web/Controllers/CourseController.php @@ -14,6 +14,7 @@ use App\Services\Frontend\Course\RelatedList as CourseRelatedListService; use App\Services\Frontend\Course\ReviewList as CourseReviewListService; use App\Services\Frontend\Course\TeacherList as CourseTeacherListService; use App\Services\Frontend\Course\TopicList as CourseTopicListService; +use Phalcon\Mvc\View; /** * @RoutePrefix("/course") @@ -70,6 +71,18 @@ class CourseController extends Controller $packages = $service->handle($id); + $service = new CourseReviewListService(); + + $reviews = $service->handle($id); + + $reviews->items = kg_array_object($reviews->items); + + $service = new CourseConsultListService(); + + $consults = $service->handle($id); + + $consults->items = kg_array_object($consults->items); + $service = new CourseTeacherListService(); $teachers = $service->handle($id); @@ -89,6 +102,8 @@ class CourseController extends Controller $this->view->setVar('course', $course); $this->view->setVar('chapters', $chapters); $this->view->setVar('packages', $packages); + $this->view->setVar('consults', $consults); + $this->view->setVar('reviews', $reviews); $this->view->setVar('teachers', $teachers); $this->view->setVar('topics', $topics); $this->view->setVar('recommended_courses', $recommendedCourses); @@ -130,7 +145,12 @@ class CourseController extends Controller $pager = $service->handle($id); - return $this->jsonPaginate($pager); + $pager->target = $this->request->get('target', 'trim', 'tab-consults'); + + $pager->items = kg_array_object($pager->items); + + $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->setVar('pager', $pager); } /** @@ -142,7 +162,12 @@ class CourseController extends Controller $pager = $service->handle($id); - return $this->jsonPaginate($pager); + $pager->target = $this->request->get('target', 'trim', 'tab-reviews'); + + $pager->items = kg_array_object($pager->items); + + $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->setVar('pager', $pager); } /** diff --git a/app/Http/Web/Views/course/consults.volt b/app/Http/Web/Views/course/consults.volt new file mode 100644 index 00000000..5437eca7 --- /dev/null +++ b/app/Http/Web/Views/course/consults.volt @@ -0,0 +1,22 @@ +{% if pager.total_pages > 0 %} +
+ {% for item in pager.items %} + {% set user_url = url({'for':'web.user.show','id':item.id}) %} +
+
+ + {{ item.user.name }} + +
+
+
{{ item.question }}
+
{{ item.answer }}
+
+ {{ date('Y-m-d H:i',item.create_time) }} +
+
+
+ {% endfor %} +
+ {{ partial('partials/pager_ajax') }} +{% endif %} \ No newline at end of file diff --git a/app/Http/Web/Views/course/list.volt b/app/Http/Web/Views/course/list.volt index 8e382625..900fcbd3 100644 --- a/app/Http/Web/Views/course/list.volt +++ b/app/Http/Web/Views/course/list.volt @@ -3,15 +3,20 @@ {% block content %} {{ partial('partials/macro_course') }} - {{ partial('course/list_filter') }} -
- {% for item in pager.items %} - {{ course_card(item) }} - {% endfor %} -
- - {{ partial('partials/pager') }} + {% if pager.total_pages > 0 %} +
+ {% for item in pager.items %} + {{ course_card(item) }} + {% endfor %} +
+ {{ partial('partials/pager') }} + {% else %} +
+
+
没有检索到相关课程哦
+
+ {% endif %} {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/course/list_filter.volt b/app/Http/Web/Views/course/list_filter.volt index 33756cd9..8df0f506 100644 --- a/app/Http/Web/Views/course/list_filter.volt +++ b/app/Http/Web/Views/course/list_filter.volt @@ -1,9 +1,10 @@ -
+
方向
+ {% set tc_val = request.get('tc','int','all') %} {% for category in top_categories %} - {% set class = request.get('tc','int','all') == category.id ? 'layui-btn layui-btn-xs' : 'none' %} + {% set class = tc_val == category.id ? 'layui-btn layui-btn-xs' : 'none' %} {{ category.name }} {% endfor %}
@@ -12,8 +13,9 @@
分类
+ {% set sc_val = request.get('sc','int','all') %} {% for category in sub_categories %} - {% set class = request.get('sc','int','all') == category.id ? 'layui-btn layui-btn-xs' : 'none' %} + {% set class = sc_val == category.id ? 'layui-btn layui-btn-xs' : 'none' %} {{ category.name }} {% endfor %}
@@ -22,8 +24,9 @@
类型
+ {% set model_val = request.get('model','trim','all') %} {% for model in models %} - {% set class = request.get('model','trim','all') == model.id ? 'layui-btn layui-btn-xs' : 'none' %} + {% set class = model_val == model.id ? 'layui-btn layui-btn-xs' : 'none' %} {{ model.name }} {% endfor %}
@@ -31,8 +34,9 @@
难度
+ {% set level_val = request.get('level','trim','all') %} {% for level in levels %} - {% set class = request.get('level','trim','all') == level.id ? 'layui-btn layui-btn-xs' : 'none' %} + {% set class = level_val == level.id ? 'layui-btn layui-btn-xs' : 'none' %} {{ level.name }} {% endfor %}
@@ -40,8 +44,9 @@
排序
+ {% set sort_val = request.get('sort','trim','score') %} {% for sort in sorts %} - {% set class = request.get('sort','trim','score') == sort.id ? 'layui-btn layui-btn-xs' : 'none' %} + {% set class = sort_val == sort.id ? 'layui-btn layui-btn-xs' : 'none' %} {{ sort.name }} {% endfor %}
diff --git a/app/Http/Web/Views/course/reviews.volt b/app/Http/Web/Views/course/reviews.volt new file mode 100644 index 00000000..59bd45e8 --- /dev/null +++ b/app/Http/Web/Views/course/reviews.volt @@ -0,0 +1,29 @@ +{%- macro star_info(rating) %} + {% set stars = [1,2,3,4,5] %} + {% for val in stars if val <= rating %} + + {% endfor %} +{%- endmacro %} + +{% if pager.total_pages > 0 %} +
+ {% for item in pager.items %} + {% set user_url = url({'for':'web.user.show','id':item.id}) %} +
+
+ + {{ item.user.name }} + +
+
+
{{ star_info(item.rating) }}
+
{{ item.content }}
+
+ {{ date('Y-m-d H:i',item.create_time) }} +
+
+
+ {% endfor %} +
+ {{ partial('partials/pager_ajax') }} +{% endif %} \ 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 0e393370..5f48f29c 100644 --- a/app/Http/Web/Views/course/show.volt +++ b/app/Http/Web/Views/course/show.volt @@ -24,7 +24,7 @@
-
+
  • 详情
  • 目录
    • @@ -42,7 +42,7 @@
    {{ course.details }}
    -
    +
    {% if course.model == 'vod' %} {{ partial('course/chapters_vod') }} {% elseif course.model == 'live' %} @@ -52,13 +52,17 @@ {% endif %}
    {% if show_packages == 1 %} -
    {{ partial('course/packages') }}
    +
    + {{ partial('course/packages') }} +
    {% endif %} {% if show_consults == 1 %} -
    咨询
    + {% set consult_url = url({'for':'web.course.consults','id':course.id}) %} +
    {% endif %} {% if show_reviews == 1 %} -
    评价
    + {% set review_url = url({'for':'web.course.reviews','id':course.id}) %} +
    {% endif %}
@@ -67,19 +71,36 @@ {% if teachers %} {{ partial('course/sidebar_teachers') }} {% endif %} - {% if topics %} {{ partial('course/sidebar_topics') }} {% endif %} - {% if recommended_courses %} {{ partial('course/sidebar_recommended') }} {% endif %} - {% if related_courses %} {{ partial('course/sidebar_related') }} {% endif %}
+{% endblock %} + +{% block inline_js %} + + + {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/index/index.volt b/app/Http/Web/Views/index/index.volt index 4923f48f..748a01d8 100644 --- a/app/Http/Web/Views/index/index.volt +++ b/app/Http/Web/Views/index/index.volt @@ -2,6 +2,8 @@ {% block content %} + {{ partial('partials/macro_course') }} + {%- macro category_courses(courses) %}
    @@ -14,31 +16,9 @@ {% for category in courses %} {% set class = loop.first ? 'layui-tab-item layui-show' : 'layui-tab-item' %}
    -
    +
    {% for course in category.courses %} -
    -
    - - {{ course.title }} - -
    -
    - {{ substr(course.title,0,15) }} -
    -
    - {% if course.market_price > 0 %} - ￥{{ course.market_price }} - 中级 - {{ course.lesson_count }}节课 - {{ course.user_count }}人购买 - {% else %} - 免费 - 中级 - {{ course.lesson_count }}节课 - {{ course.user_count }}人报名 - {% endif %} -
    -
    + {{ course_card(course) }} {% endfor %}
    @@ -47,7 +27,7 @@
    {%- endmacro %} -
    +
    -
    +
    新上课程
    {{ category_courses(new_courses) }}
    -
    +
    免费课程
    {{ category_courses(free_courses) }}
    -
    +
    会员课程
    {{ category_courses(vip_courses) }} diff --git a/app/Http/Web/Views/partials/macro_course.volt b/app/Http/Web/Views/partials/macro_course.volt index eca02472..3194950d 100644 --- a/app/Http/Web/Views/partials/macro_course.volt +++ b/app/Http/Web/Views/partials/macro_course.volt @@ -25,11 +25,11 @@
    - {{ course.title }} + {{ course.title|e }}
    - {{ substr(course.title,0,15) }} + {{ substr(course.title,0,15) }}
    {% if course.market_price > 0 %} @@ -51,11 +51,11 @@ {% set course_url = url({'for':'web.course.show','id':course.id}) %}
    - {{ course.title }} + {{ course.title|e }}
    - {{ substr(course.title,0,15) }} + {{ substr(course.title,0,15) }}
    {% if course.market_price > 0 %} diff --git a/app/Http/Web/Views/partials/pager_ajax.volt b/app/Http/Web/Views/partials/pager_ajax.volt new file mode 100644 index 00000000..4efb9a1c --- /dev/null +++ b/app/Http/Web/Views/partials/pager_ajax.volt @@ -0,0 +1,10 @@ +{% if pager.total_pages > 1 %} +
    +
    + 首页 + 上页 + 下页 + 尾页 +
    +
    +{% endif %} \ No newline at end of file diff --git a/app/Http/Web/Views/search/content_course.volt b/app/Http/Web/Views/search/content_course.volt index ea6e602a..21282edd 100644 --- a/app/Http/Web/Views/search/content_course.volt +++ b/app/Http/Web/Views/search/content_course.volt @@ -1,35 +1,25 @@ -{% if pager.total_pages > 0 %} -
    - {% for item in pager.items %} -
    -
    - - {{ item.title|striptags }} - +
    + {% for item in pager.items %} + {% set course_url = url({'for':'web.course.show','id':item.id}) %} +
    +
    + + {{ item.title|e }} + +
    +
    +
    + {{ item.title }}
    -
    -
    - {{ item.title }} -
    -
    {{ item.summary }}
    -
    - 分类：{{ item.category.name }} - 讲师：{{ item.teacher.name }} - 难度：{{ level_info(item.level) }} - 课时：{{ item.lesson_count }} - 学员：{{ item.user_count }} -
    +
    {{ item.summary }}
    +
    + 分类：{{ item.category.name }} + 讲师：{{ item.teacher.name }} + 难度：{{ level_info(item.level) }} + 课时：{{ item.lesson_count }} + 学员：{{ item.user_count }}
    - {% endfor %} -
    -{% else %} -
    -
    -
    -
    - 没有找到{{ request.get('query') }}相关内容，换个关键字试试吧！ -
    -
    -{% endif %} \ No newline at end of file + {% endfor %} +
    diff --git a/app/Http/Web/Views/search/list.volt b/app/Http/Web/Views/search/list.volt index 1f80134c..69e34c93 100644 --- a/app/Http/Web/Views/search/list.volt +++ b/app/Http/Web/Views/search/list.volt @@ -3,23 +3,31 @@ {% block content %} {% set type = request.get('type','trim','course') %} + {% set query = request.get('query','striptags','') %} {{ partial('partials/macro_course') }}
    首页 搜索 - {{ request.get('query')|striptags }} + {{ query }}
    - {% if type == 'course' %} - {{ partial('search/content_course') }} - {% elseif type == 'other' %} - {{ partial('search/content_other') }} + {% if pager.total_pages > 0 %} + {% if type == 'course' %} + {{ partial('search/content_course') }} + {% elseif type == 'other' %} + {{ partial('search/content_other') }} + {% endif %} + {{ partial('partials/pager') }} + {% else %} +
    +
    +
    没有找到{{ query }}相关内容，换个关键字试试吧！
    +
    {% endif %} - {{ partial('partials/pager') }}
    {{ partial('search/sidebar') }} diff --git a/app/Repos/Course.php b/app/Repos/Course.php index fa207495..59e9a3e4 100644 --- a/app/Repos/Course.php +++ b/app/Repos/Course.php @@ -30,70 +30,64 @@ class Course extends Repository { $builder = $this->modelsManager->createBuilder(); + $builder->from(CourseModel::class); + + $builder->where('1 = 1'); + if (!empty($where['category_id'])) { - $where['category_id'] = is_array($where['category_id']) ? $where['category_id'] : [$where['category_id']]; - $builder->addFrom(CourseModel::class, 'c'); - $builder->join(CourseCategoryModel::class, 'c.id = cc.course_id', 'cc'); - $builder->inWhere('cc.category_id', $where['category_id']); + $where['id'] = $this->getCategoryCourseIds($where['category_id']); } elseif (!empty($where['teacher_id'])) { - $where['teacher_id'] = is_array($where['teacher_id']) ? $where['teacher_id'] : [$where['teacher_id']]; - $builder->addFrom(CourseModel::class, 'c'); - $builder->join(CourseUserModel::class, 'c.id = cu.course_id', 'cu'); - $builder->inWhere('cu.user_id', $where['teacher_id']); - $builder->andWhere('cu.role_type = :role_type:', ['role_type' => CourseUserModel::ROLE_TEACHER]); - } else { - $builder->addFrom(CourseModel::class, 'c'); - $builder->where('1 = 1'); + $where['id'] = $this->getTeacherCourseIds($where['teacher_id']); } if (!empty($where['id'])) { if (is_array($where['id'])) { - $builder->inWhere('c.id', $where['id']); + $builder->inWhere('id', $where['id']); } else { - $builder->andWhere('c.id = :id:', ['id' => $where['id']]); + $builder->andWhere('id = :id:', ['id' => $where['id']]); } } if (!empty($where['title'])) { - $builder->andWhere('c.title LIKE :title:', ['title' => "%{$where['title']}%"]); + $builder->andWhere('title LIKE :title:', ['title' => "%{$where['title']}%"]); } if (!empty($where['model'])) { - $builder->andWhere('c.model = :model:', ['model' => $where['model']]); + $builder->andWhere('model = :model:', ['model' => $where['model']]); } if (!empty($where['level'])) { - $builder->andWhere('c.level = :level:', ['level' => $where['level']]); + $builder->andWhere('level = :level:', ['level' => $where['level']]); } if (isset($where['free'])) { if ($where['free'] == 1) { - $builder->andWhere('c.market_price = 0'); + $builder->andWhere('market_price = 0'); } else { - $builder->andWhere('c.market_price > 0'); + $builder->andWhere('market_price > 0'); } } if (isset($where['published'])) { - $builder->andWhere('c.published = :published:', ['published' => $where['published']]); + $builder->andWhere('published = :published:', ['published' => $where['published']]); } if (isset($where['deleted'])) { - $builder->andWhere('c.deleted = :deleted:', ['deleted' => $where['deleted']]); + $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]); } switch ($sort) { case 'score': - $orderBy = 'c.score DESC'; + $orderBy = 'score DESC'; break; case 'rating': - $orderBy = 'c.rating DESC'; + $orderBy = 'rating DESC'; break; case 'popular': - $orderBy = 'c.user_count DESC'; + $orderBy = 'user_count DESC'; break; default: - $orderBy = 'c.id DESC'; + $orderBy = 'id DESC'; break; } @@ -335,4 +329,34 @@ class Course extends Repository ]); } + protected function getCategoryCourseIds($categoryId) + { + $categoryIds = is_array($categoryId) ? $categoryId : [$categoryId]; + + $repo = new CourseCategory(); + + $rows = $repo->findByCategoryIds($categoryIds); + + if ($rows->count() == 0) { + return []; + } + + return kg_array_column($rows->toArray(), 'course_id'); + } + + protected function getTeacherCourseIds($teacherId) + { + $teacherIds = is_array($teacherId) ? $teacherId : [$teacherId]; + + $repo = new CourseUser(); + + $rows = $repo->findByTeacherIds($teacherIds); + + if ($rows->count() == 0) { + return []; + } + + return kg_array_column($rows->toArray(), 'course_id'); + } + } diff --git a/app/Repos/CourseCategory.php b/app/Repos/CourseCategory.php index 94cefb3f..ff77a411 100644 --- a/app/Repos/CourseCategory.php +++ b/app/Repos/CourseCategory.php @@ -27,7 +27,7 @@ class CourseCategory extends Repository * @param array $categoryIds * @return ResultsetInterface|Resultset|CourseCategoryModel[] */ - public function findByCategoryIds($categoryIds) + public function findByCategoryIds(array $categoryIds) { return CourseCategoryModel::query() ->inWhere('category_id', $categoryIds) @@ -38,7 +38,7 @@ class CourseCategory extends Repository * @param array $courseIds * @return ResultsetInterface|Resultset|CourseCategoryModel[] */ - public function findByCourseIds($courseIds) + public function findByCourseIds(array $courseIds) { return CourseCategoryModel::query() ->inWhere('course_id', $courseIds) diff --git a/app/Repos/CourseUser.php b/app/Repos/CourseUser.php index fdd2073e..88c90f51 100644 --- a/app/Repos/CourseUser.php +++ b/app/Repos/CourseUser.php @@ -5,6 +5,8 @@ namespace App\Repos; use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder; use App\Models\CourseUser as CourseUserModel; use Phalcon\Mvc\Model; +use Phalcon\Mvc\Model\Resultset; +use Phalcon\Mvc\Model\ResultsetInterface; class CourseUser extends Repository { @@ -116,4 +118,18 @@ class CourseUser extends Repository ]); } + /** + * @param array $teacherIds + * @return ResultsetInterface|Resultset|CourseUserModel[] + */ + public function findByTeacherIds(array $teacherIds) + { + $roleType = CourseUserModel::ROLE_TEACHER; + + return CourseUserModel::query() + ->inWhere('user_id', $teacherIds) + ->andWhere('role_type = :role_type:', ['role_type' => $roleType]) + ->execute(); + } + } diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index b55b114a..a8f8c74f 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -118,8 +118,8 @@ body { width: 320px; } -.index-module { - margin-bottom: 15px; +.index-module .layui-tab { + margin-bottom: 0; } .index-module .layui-tab-title { @@ -127,17 +127,17 @@ body { } .index-module .layui-tab-content { - padding: 20px 0; + padding: 20px 0 0 0; } .index-module .header { text-align: center; - font-size: 20px; - line-height: 30px; + font-size: 18px; + padding-bottom: 15px; + border-bottom: 1px solid #f6f6f6; } .index-carousel { - margin-bottom: 30px; text-align: center; } @@ -230,6 +230,7 @@ body { } .query-badge { + padding: 2px 5px; margin-right: 5px; margin-bottom: 5px; } @@ -281,7 +282,6 @@ body { .filter-group { padding-bottom: 5px; - border-bottom: 1px dashed #ccc; height: 40px; line-height: 40px; } @@ -327,12 +327,12 @@ body { margin-right: 5px; } -.course-info-tab { +.course-tab { margin: 0; } -.course-info-tab .layui-tab-content { - padding: 20px 0; +.course-tab .layui-tab-content { + padding: 30px 0; } .lesson-item { @@ -384,6 +384,7 @@ body { width: 180px; font-size: 12px; text-align: center; + overflow: hidden; } .package-info span { @@ -391,6 +392,7 @@ body { } .package-info .title { + padding: 0 10px; margin-bottom: 10px; } @@ -416,22 +418,22 @@ body { } .package-course-list { - width: 580px; + width: 560px; height: 170px; overflow-x: auto; white-space: nowrap; } .package-course-card { - width: 180px; + width: 175px; display: inline-block; - margin-right: 10px; + margin-right: 5px; vertical-align: top; } .package-course-card .cover { - width: 180px; - height: 96px; + width: 175px; + height: 95px; margin-bottom: 10px; } @@ -445,6 +447,59 @@ body { white-space: normal; } +.review-card { + padding-bottom: 10px; + margin-bottom: 10px; + border-bottom: 1px dashed #ccc; +} + +.review-card:last-child { + border-bottom: none; +} + +.review-card .avatar { + float: left; + width: 60px; + height: 60px; + margin-right: 15px; +} + +.review-card .avatar img { + width: 100%; + height: 100%; + border-radius: 60px; +} + +.review-card .info { + float: left; + width: 650px; +} + +.review-card .rating { + margin-bottom: 10px; +} + +.review-card .rating .layui-icon { + color: orange; +} + +.review-card .title { + margin-bottom: 10px; +} + +.review-card .content { + margin-bottom: 10px; + color: #999; + font-size: 12px; + word-wrap: break-word; + white-space: pre-wrap; +} + +.review-card .footer { + color: #999; + font-size: 12px; +} + .sidebar-teacher-card { margin-bottom: 15px; } @@ -476,9 +531,9 @@ body { } .topic-badge { - padding: 5px; - margin-right: 10px; - margin-bottom: 10px; + padding: 2px 5px; + margin-right: 5px; + margin-bottom: 5px; } .sidebar-course-card { diff --git a/public/static/web/js/common.js b/public/static/web/js/common.js index 75ef8f1f..f4d8dd56 100644 --- a/public/static/web/js/common.js +++ b/public/static/web/js/common.js @@ -20,6 +20,16 @@ util.fixbar({ } }); +var helper = {}; + +helper.ajaxPager = function (url, target) { + var index = layer.load(); + $.get(url, function (html) { + $('#' + target).html(html); + layer.close(index); + }); +} + form.on('submit(go)', function (data) { var submit = $(this); submit.attr('disabled', true).addClass('layui-btn-disabled'); @@ -74,6 +84,8 @@ $('.kg-delete').on('click', function () { }); }); -$('.kg-back').on('click', function () { - window.history.back(); +$('body').on('click', '.layui-laypage > a', function () { + var url = $(this).attr('data-url'); + var target = $(this).attr('data-target'); + helper.ajaxPager(url, target); }); \ No newline at end of file