diff --git a/app/Builders/CourseFavoriteList.php b/app/Builders/CourseFavoriteList.php index e58b88b9..9d196641 100644 --- a/app/Builders/CourseFavoriteList.php +++ b/app/Builders/CourseFavoriteList.php @@ -40,7 +40,7 @@ class CourseFavoriteList extends Builder 'id', 'title', 'cover', 'market_price', 'vip_price', 'rating', 'model', 'level', 'attrs', - 'user_count', 'lesson_count', + 'user_count', 'lesson_count', 'review_count', 'favorite_count', ]; $courses = $courseRepo->findByIds($ids, $columns); diff --git a/app/Http/Admin/Services/Course.php b/app/Http/Admin/Services/Course.php index b907e6d1..67996c63 100644 --- a/app/Http/Admin/Services/Course.php +++ b/app/Http/Admin/Services/Course.php @@ -192,34 +192,24 @@ class Course extends Service $this->updateCourseGroup($course); - $this->rebuildCourseIndex($course); - return $course; } public function deleteCourse($id) { $course = $this->findOrFail($id); - $course->deleted = 1; - $course->update(); - $this->rebuildCourseIndex($course); - return $course; } public function restoreCourse($id) { $course = $this->findOrFail($id); - $course->deleted = 0; - $course->update(); - $this->rebuildCourseIndex($course); - return $course; } diff --git a/app/Http/Web/Controllers/ConsultController.php b/app/Http/Web/Controllers/ConsultController.php index f40ef5ef..e156f21c 100644 --- a/app/Http/Web/Controllers/ConsultController.php +++ b/app/Http/Web/Controllers/ConsultController.php @@ -47,31 +47,6 @@ class ConsultController extends Controller $this->view->setVar('consult', $consult); } - /** - * @Route("/{id:[0-9]+}/reply", name="web.consult.reply") - */ - public function replyAction($id) - { - if ($this->request->isPost()) { - - $service = new ConsultReplyService(); - - $service->handle($id); - - $content = ['msg' => '回复咨询成功']; - - return $this->jsonSuccess($content); - - } else { - - $service = new ConsultInfoService(); - - $consult = $service->handle($id); - - $this->view->setVar('consult', $consult); - } - } - /** * @Post("/create", name="web.consult.create") */ @@ -118,6 +93,31 @@ class ConsultController extends Controller return $this->jsonSuccess($content); } + /** + * @Route("/{id:[0-9]+}/reply", name="web.consult.reply") + */ + public function replyAction($id) + { + if ($this->request->isPost()) { + + $service = new ConsultReplyService(); + + $service->handle($id); + + $content = ['msg' => '回复咨询成功']; + + return $this->jsonSuccess($content); + + } else { + + $service = new ConsultInfoService(); + + $consult = $service->handle($id); + + $this->view->setVar('consult', $consult); + } + } + /** * @Post("/{id:[0-9]+}/like", name="web.consult.like") */ diff --git a/app/Http/Web/Views/chapter/vod.volt b/app/Http/Web/Views/chapter/vod.volt index 06ca998c..5d96c0ae 100644 --- a/app/Http/Web/Views/chapter/vod.volt +++ b/app/Http/Web/Views/chapter/vod.volt @@ -5,7 +5,6 @@ {% set chapter_full_url = full_url({'for':'web.chapter.show','id':chapter.id}) %} {% set course_url = url({'for':'web.course.show','id':chapter.course.id}) %} {% set learning_url = url({'for':'web.chapter.learning','id':chapter.id}) %} - {% set danmu_url = url({'for':'web.chapter.danmu','id':chapter.id}) %} {% set like_url = url({'for':'web.chapter.like','id':chapter.id}) %} {% set qrcode_url = url({'for':'web.qrcode'},{'text':chapter_full_url}) %} {% set consult_url = url({'for':'web.consult.add'},{'chapter_id':chapter.id}) %} @@ -31,16 +30,6 @@
-
-
- {% if auth_user.id > 0 %} - - - {% else %} - - {% endif %} - -
@@ -48,58 +37,11 @@
- -
-
@@ -116,8 +58,6 @@ - {{ js_include('lib/jquery.min.js') }} - {{ js_include('lib/jquery.danmu.min.js') }} {{ js_include('web/js/course.share.js') }} {{ js_include('web/js/chapter.action.js') }} {{ js_include('web/js/chapter.vod.player.js') }} diff --git a/app/Http/Web/Views/consult/add.volt b/app/Http/Web/Views/consult/add.volt index 9273044a..0727ef4e 100644 --- a/app/Http/Web/Views/consult/add.volt +++ b/app/Http/Web/Views/consult/add.volt @@ -1,11 +1,11 @@ {% extends 'templates/layer.volt' %} {% block content %} -
+
- +
- +
diff --git a/app/Http/Web/Views/consult/edit.volt b/app/Http/Web/Views/consult/edit.volt index e09eb9c0..f6ef6669 100644 --- a/app/Http/Web/Views/consult/edit.volt +++ b/app/Http/Web/Views/consult/edit.volt @@ -4,7 +4,7 @@ {% set update_url = url({'for':'web.consult.update','id':consult.id}) %} - +
{{ consult.course.title }}
diff --git a/app/Http/Web/Views/consult/reply.volt b/app/Http/Web/Views/consult/reply.volt index 28606202..305751ae 100644 --- a/app/Http/Web/Views/consult/reply.volt +++ b/app/Http/Web/Views/consult/reply.volt @@ -4,7 +4,7 @@ {% set update_url = url({'for':'web.consult.reply','id':consult.id}) %} - +
{{ consult.course.title }}
@@ -31,4 +31,13 @@
+{% endblock %} + +{% block inline_js %} + + + {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/consult/show.volt b/app/Http/Web/Views/consult/show.volt index db231c07..a5948f71 100644 --- a/app/Http/Web/Views/consult/show.volt +++ b/app/Http/Web/Views/consult/show.volt @@ -2,25 +2,38 @@ {% block content %} - {% set answer = consult.answer ? consult.answer : '稍安勿燥，请耐心等待回复吧' %} + {% set consult.answer = consult.answer ? consult.answer : '请耐心等待回复吧' %} -
-
- -
{{ consult.course.title }}
+
+ {% if consult.course.id is defined %} +
+
课程：
+
{{ consult.course.title }}
+
+ {% endif %} + {% if consult.chapter.id is defined %} +
+
章节：
+
{{ consult.chapter.title }}
+
+ {% endif %} +
+
提问：
+
{{ consult.question }}
-
- -
{{ consult.chapter.title }}
+
+
回答：
+
{{ consult.answer }}
-
- -
{{ consult.question }}
-
-
- -
{{ answer }}
-
- +
+ +{% endblock %} + +{% block inline_js %} + + {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/course/consults.volt b/app/Http/Web/Views/course/consults.volt index 569975af..3f7d67ae 100644 --- a/app/Http/Web/Views/course/consults.volt +++ b/app/Http/Web/Views/course/consults.volt @@ -2,20 +2,26 @@
{% for item in pager.items %} {% set item.answer = item.answer ? item.answer : '稍安勿燥，请耐心等待回复吧' %} - {% set owner_url = url({'for':'web.user.show','id':item.id}) %} + {% set owner_url = url({'for':'web.user.show','id':item.owner.id}) %} + {% set consult_url = url({'for':'web.consult.show','id':item.id}) %} {% set like_url = url({'for':'web.consult.like','id':item.id}) %}
- - {{ item.owner.name }} + + {{ item.owner.name }}
-
{{ item.question }}
+
+ + + +
+
{{ item.question }}
{{ item.answer }}
{{ item.create_time|time_ago }} - diff --git a/app/Http/Web/Views/course/pager.volt b/app/Http/Web/Views/course/pager.volt index fb22df96..75a7f5cc 100644 --- a/app/Http/Web/Views/course/pager.volt +++ b/app/Http/Web/Views/course/pager.volt @@ -1,4 +1,4 @@ -{{ partial('partials/macro_course') }} +{{ partial('macros/course') }} {% if pager.total_pages > 0 %}
diff --git a/app/Http/Web/Views/course/recommended.volt b/app/Http/Web/Views/course/recommended.volt index 24379fdb..7ecdda61 100644 --- a/app/Http/Web/Views/course/recommended.volt +++ b/app/Http/Web/Views/course/recommended.volt @@ -1,4 +1,4 @@ -{{ partial('partials/macro_course') }} +{{ partial('macros/course') }} {% if courses %}
diff --git a/app/Http/Web/Views/course/related.volt b/app/Http/Web/Views/course/related.volt index bc10fa6f..240e64de 100644 --- a/app/Http/Web/Views/course/related.volt +++ b/app/Http/Web/Views/course/related.volt @@ -1,4 +1,4 @@ -{{ partial('partials/macro_course') }} +{{ partial('macros/course') }} {% if courses %}
diff --git a/app/Http/Web/Views/course/reviews.volt b/app/Http/Web/Views/course/reviews.volt index e2529a17..9fd73cd8 100644 --- a/app/Http/Web/Views/course/reviews.volt +++ b/app/Http/Web/Views/course/reviews.volt @@ -1,4 +1,4 @@ -{{ partial('partials/macro_course') }} +{{ partial('macros/course') }} {% if pager.total_pages > 0 %}
@@ -7,7 +7,9 @@ {% set like_url = url({'for':'web.review.like','id':item.id}) %}
- {{ item.owner.name }} + + {{ item.owner.name }} +
{{ star_info(item.rating) }}
diff --git a/app/Http/Web/Views/course/show.volt b/app/Http/Web/Views/course/show.volt index 3d5db934..b1fad02b 100644 --- a/app/Http/Web/Views/course/show.volt +++ b/app/Http/Web/Views/course/show.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_course') }} + {{ partial('macros/course') }} {% set favorite_title = course.me.favorited ? '取消收藏' : '收藏' %} {% set favorite_star = course.me.favorited ? 'layui-icon-star-fill' : 'layui-icon-star' %} diff --git a/app/Http/Web/Views/course/show_teacher.volt b/app/Http/Web/Views/course/show_teacher.volt index d9af08a1..04b7befd 100644 --- a/app/Http/Web/Views/course/show_teacher.volt +++ b/app/Http/Web/Views/course/show_teacher.volt @@ -8,7 +8,7 @@ {% set teacher.title = teacher.title ? teacher.title : '小小教书匠' %}
- {{ teacher.name }} + {{ teacher.name }}
diff --git a/app/Http/Web/Views/index/index.volt b/app/Http/Web/Views/index/index.volt index 20784477..020336c1 100644 --- a/app/Http/Web/Views/index/index.volt +++ b/app/Http/Web/Views/index/index.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_course') }} + {{ partial('macros/course') }} {%- macro category_courses(courses) %}
diff --git a/app/Http/Web/Views/partials/macro_course.volt b/app/Http/Web/Views/macros/course.volt similarity index 100% rename from app/Http/Web/Views/partials/macro_course.volt rename to app/Http/Web/Views/macros/course.volt diff --git a/app/Http/Web/Views/partials/macro_order.volt b/app/Http/Web/Views/macros/order.volt similarity index 100% rename from app/Http/Web/Views/partials/macro_order.volt rename to app/Http/Web/Views/macros/order.volt diff --git a/app/Http/Web/Views/partials/macro_refund.volt b/app/Http/Web/Views/macros/refund.volt similarity index 100% rename from app/Http/Web/Views/partials/macro_refund.volt rename to app/Http/Web/Views/macros/refund.volt diff --git a/app/Http/Web/Views/my/consults.volt b/app/Http/Web/Views/my/consults.volt index 174841e3..b58d6a12 100644 --- a/app/Http/Web/Views/my/consults.volt +++ b/app/Http/Web/Views/my/consults.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_course') }} + {{ partial('macros/course') }}
{{ partial('my/menu') }}
diff --git a/app/Http/Web/Views/my/courses.volt b/app/Http/Web/Views/my/courses.volt index 774ef538..d8b2f607 100644 --- a/app/Http/Web/Views/my/courses.volt +++ b/app/Http/Web/Views/my/courses.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_course') }} + {{ partial('macros/course') }}
{{ partial('my/menu') }}
diff --git a/app/Http/Web/Views/my/favorites.volt b/app/Http/Web/Views/my/favorites.volt index 7df3f8ae..c4e8963d 100644 --- a/app/Http/Web/Views/my/favorites.volt +++ b/app/Http/Web/Views/my/favorites.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_course') }} + {{ partial('macros/course') }}
{{ partial('my/menu') }}
@@ -17,12 +17,14 @@ + 课程 - 人气 + 学员 + 收藏 评分 操作 @@ -33,10 +35,11 @@ {% set favorite_url = url({'for':'web.course.favorite','id':item.id}) %} {{ item.title }} {{ model_info(item.model) }} - {{ item.user_count }} - {{ star_info(item.rating) }} + {{ item.user_count }} + {{ item.favorite_count }} + {{ item.rating }} - + {% endfor %} diff --git a/app/Http/Web/Views/my/friends.volt b/app/Http/Web/Views/my/friends.volt index 655caa84..5ab2b7fe 100644 --- a/app/Http/Web/Views/my/friends.volt +++ b/app/Http/Web/Views/my/friends.volt @@ -4,11 +4,11 @@ {%- macro gender_info(value) %} {% if value == 1 %} - 男 + 男 {% elseif value == 2 %} - 女 + 女 {% elseif value == 3 %} - 密 + 密 {% endif %} {%- endmacro %} @@ -47,7 +47,7 @@ {{ item.location }} {{ item.active_time|time_ago }} - + {% endfor %} diff --git a/app/Http/Web/Views/my/groups_joined.volt b/app/Http/Web/Views/my/groups_joined.volt index 55b3a7e5..74f4a1cc 100644 --- a/app/Http/Web/Views/my/groups_joined.volt +++ b/app/Http/Web/Views/my/groups_joined.volt @@ -4,12 +4,12 @@ - + 名称 - 群主 + 组长 成员 操作 @@ -21,9 +21,9 @@ {{ item.name }} {{ type_info(item.type) }} {{ item.owner.name }} - {{ item.user_count }} + {{ item.user_count }} - + {% endfor %} diff --git a/app/Http/Web/Views/my/groups_owned.volt b/app/Http/Web/Views/my/groups_owned.volt index 6037bdc8..bd3de066 100644 --- a/app/Http/Web/Views/my/groups_owned.volt +++ b/app/Http/Web/Views/my/groups_owned.volt @@ -20,8 +20,8 @@ {% set users_url = url({'for':'web.igm.users','id':item.id}) %} {{ item.name }} {{ type_info(item.type) }} - {{ item.user_count }} - {{ item.msg_count }} + {{ item.user_count }} + {{ item.msg_count }} 成员 编辑 diff --git a/app/Http/Web/Views/my/menu.volt b/app/Http/Web/Views/my/menu.volt index 4b5bc5cc..a51004d6 100644 --- a/app/Http/Web/Views/my/menu.volt +++ b/app/Http/Web/Views/my/menu.volt @@ -19,9 +19,9 @@
diff --git a/app/Http/Web/Views/my/orders.volt b/app/Http/Web/Views/my/orders.volt index 6deb8de2..afcd3d55 100644 --- a/app/Http/Web/Views/my/orders.volt +++ b/app/Http/Web/Views/my/orders.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_order') }} + {{ partial('macros/order') }} {% set status_types = {'all':'全部','pending':'待支付','finished':'已完成','closed':'已关闭','refunded':'已退款'} %} {% set status = request.get('status','trim','all') %} diff --git a/app/Http/Web/Views/my/refunds.volt b/app/Http/Web/Views/my/refunds.volt index dca2c730..5529e412 100644 --- a/app/Http/Web/Views/my/refunds.volt +++ b/app/Http/Web/Views/my/refunds.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_refund') }} + {{ partial('macros/refund') }} {% set status_types = {'all':'全部','pending':'待处理','canceled':'已取消','approved':'退款中','finished':'已完成'} %} {% set status = request.get('status','trim','all') %} diff --git a/app/Http/Web/Views/my/reviews.volt b/app/Http/Web/Views/my/reviews.volt index 58bac6c7..86a6760f 100644 --- a/app/Http/Web/Views/my/reviews.volt +++ b/app/Http/Web/Views/my/reviews.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_course') }} + {{ partial('macros/course') }}
{{ partial('my/menu') }}
@@ -33,12 +33,12 @@

课程：{{ item.course.title }}

-

评价：{{ item.content }}

+

评价：{{ item.content }}

-

内容实用：{{ star_info(item.rating1) }}

-

通俗易懂：{{ star_info(item.rating2) }}

-

逻辑清晰：{{ star_info(item.rating3) }}

+

内容实用：{{ item.rating1 }}

+

通俗易懂：{{ item.rating2 }}

+

逻辑清晰：{{ item.rating3 }}

diff --git a/app/Http/Web/Views/order/confirm.volt b/app/Http/Web/Views/order/confirm.volt index 3450cb56..68e8b24f 100644 --- a/app/Http/Web/Views/order/confirm.volt +++ b/app/Http/Web/Views/order/confirm.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_course') }} + {{ partial('macros/course') }} {%- macro cart_course_card(course, user) %} {% set course_url = url({'for':'web.course.show','id':course.id}) %} diff --git a/app/Http/Web/Views/order/info.volt b/app/Http/Web/Views/order/info.volt index b91d0d81..63c2e2da 100644 --- a/app/Http/Web/Views/order/info.volt +++ b/app/Http/Web/Views/order/info.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_order') }} + {{ partial('macros/order') }} {% set order_pay_url = url({'for':'web.order.pay'},{'sn':order.sn}) %} {% set refund_confirm_url = url({'for':'web.refund.confirm'},{'sn':order.sn}) %} diff --git a/app/Http/Web/Views/refund/info.volt b/app/Http/Web/Views/refund/info.volt index 71055291..ecdb7318 100644 --- a/app/Http/Web/Views/refund/info.volt +++ b/app/Http/Web/Views/refund/info.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_refund') }} + {{ partial('macros/refund') }} {% set cancel_url = url({'for':'web.refund.cancel'}) %} diff --git a/app/Http/Web/Views/search/list.volt b/app/Http/Web/Views/search/list.volt index ca5f5d28..66e427bf 100644 --- a/app/Http/Web/Views/search/list.volt +++ b/app/Http/Web/Views/search/list.volt @@ -5,7 +5,7 @@ {% set type = request.get('type','trim','course') %} {% set query = request.get('query','striptags','') %} - {{ partial('partials/macro_course') }} + {{ partial('macros/course') }}
首页 diff --git a/app/Http/Web/Views/teaching/consults.volt b/app/Http/Web/Views/teaching/consults.volt index 2a09e226..32f05488 100644 --- a/app/Http/Web/Views/teaching/consults.volt +++ b/app/Http/Web/Views/teaching/consults.volt @@ -22,33 +22,34 @@ - + + 内容 + 优先级 时间 操作 {% for item in pager.items %} - {% set answer = item.answer ? item.answer : '等待回复ing...' %} + {% set answer = item.answer ? item.answer : '等待回复中...' %} {% set course_url = url({'for':'web.course.show','id':item.course.id}) %} {% set show_url = url({'for':'web.consult.show','id':item.id}) %} {% set reply_url = url({'for':'web.consult.reply','id':item.id}) %} - {% set delete_url = url({'for':'web.consult.delete','id':item.id}) %}

课程：{{ item.course.title }}

提问：{{ item.question }}

回复：{{ answer }}

+ {{ item.priority }} {{ date('Y-m-d',item.create_time) }} - {% endfor %} diff --git a/app/Http/Web/Views/teaching/courses.volt b/app/Http/Web/Views/teaching/courses.volt index 0c3430ff..8a50e624 100644 --- a/app/Http/Web/Views/teaching/courses.volt +++ b/app/Http/Web/Views/teaching/courses.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_course') }} + {{ partial('macros/course') }}
{{ partial('teaching/menu') }}
@@ -34,10 +34,10 @@ {% set course_url = url({'for':'web.course.show','id':item.id}) %} {{ item.title }} {{ model_info(item.model) }} - {{ item.lesson_count }} - {{ item.user_count }} - {{ item.favorite_count }} - {{ item.rating }} + {{ item.lesson_count }} + {{ item.user_count }} + {{ item.favorite_count }} + {{ item.rating }} {% endfor %} diff --git a/app/Http/Web/Views/teaching/lives.volt b/app/Http/Web/Views/teaching/lives.volt index 71b72a7d..a7226517 100644 --- a/app/Http/Web/Views/teaching/lives.volt +++ b/app/Http/Web/Views/teaching/lives.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_course') }} + {{ partial('macros/course') }}
{{ partial('teaching/menu') }}
diff --git a/app/Http/Web/Views/topic/courses.volt b/app/Http/Web/Views/topic/courses.volt index 5bd3e409..7478412f 100644 --- a/app/Http/Web/Views/topic/courses.volt +++ b/app/Http/Web/Views/topic/courses.volt @@ -1,4 +1,4 @@ -{{ partial('partials/macro_course') }} +{{ partial('macros/course') }} {% if pager.total_pages > 0 %}
diff --git a/app/Http/Web/Views/user/courses.volt b/app/Http/Web/Views/user/courses.volt index 484a9141..5d70a1cb 100644 --- a/app/Http/Web/Views/user/courses.volt +++ b/app/Http/Web/Views/user/courses.volt @@ -1,4 +1,4 @@ -{{ partial('partials/macro_course') }} +{{ partial('macros/course') }} {% if pager.total_pages > 0 %}
diff --git a/app/Http/Web/Views/user/favorites.volt b/app/Http/Web/Views/user/favorites.volt index 5bd3e409..7478412f 100644 --- a/app/Http/Web/Views/user/favorites.volt +++ b/app/Http/Web/Views/user/favorites.volt @@ -1,4 +1,4 @@ -{{ partial('partials/macro_course') }} +{{ partial('macros/course') }} {% if pager.total_pages > 0 %}
diff --git a/app/Http/Web/Views/user/show.volt b/app/Http/Web/Views/user/show.volt index 8eec0222..474bb9f6 100644 --- a/app/Http/Web/Views/user/show.volt +++ b/app/Http/Web/Views/user/show.volt @@ -2,7 +2,7 @@ {% block content %} - {{ partial('partials/macro_course') }} + {{ partial('macros/course') }} {% set vip_flag = user.vip ? '' : '' %} diff --git a/app/Http/Web/Views/vip/courses.volt b/app/Http/Web/Views/vip/courses.volt index 5bd3e409..7478412f 100644 --- a/app/Http/Web/Views/vip/courses.volt +++ b/app/Http/Web/Views/vip/courses.volt @@ -1,4 +1,4 @@ -{{ partial('partials/macro_course') }} +{{ partial('macros/course') }} {% if pager.total_pages > 0 %}
diff --git a/app/Models/Course.php b/app/Models/Course.php index c2bbc496..4b656137 100644 --- a/app/Models/Course.php +++ b/app/Models/Course.php @@ -3,6 +3,7 @@ namespace App\Models; use App\Caches\MaxCourseId as MaxCourseIdCache; +use App\Services\Syncer\CourseIndex as CourseIndexSyncer; use Phalcon\Mvc\Model\Behavior\SoftDelete; use Phalcon\Text; @@ -304,6 +305,13 @@ class Course extends Model $cache->rebuild(); } + public function afterUpdate() + { + $syncer = new CourseIndexSyncer(); + + $syncer->addItem($this->id); + } + public function afterFetch() { $this->market_price = (float)$this->market_price; diff --git a/app/Services/Frontend/Consult/ConsultInfo.php b/app/Services/Frontend/Consult/ConsultInfo.php index 31b68ac7..3f889a04 100644 --- a/app/Services/Frontend/Consult/ConsultInfo.php +++ b/app/Services/Frontend/Consult/ConsultInfo.php @@ -32,35 +32,44 @@ class ConsultInfo extends FrontendService 'like_count' => $consult->like_count, 'create_time' => $consult->create_time, 'update_time' => $consult->update_time, + 'course' => new \stdClass(), + 'chapter' => new \stdClass(), + 'owner' => new \stdClass(), ]; $courseRepo = new CourseRepo(); $course = $courseRepo->findById($consult->course_id); - $result['course'] = [ - 'id' => $course->id, - 'title' => $course->title, - ]; + if ($course) { + $result['course'] = [ + 'id' => $course->id, + 'title' => $course->title, + ]; + } $chapterRepo = new ChapterRepo(); $chapter = $chapterRepo->findById($consult->chapter_id); - $result['chapter'] = [ - 'id' => $chapter->id, - 'title' => $chapter->title, - ]; + if ($chapter) { + $result['chapter'] = [ + 'id' => $chapter->id, + 'title' => $chapter->title, + ]; + } $userRepo = new UserRepo(); $owner = $userRepo->findById($consult->owner_id); - $result['owner'] = [ - 'id' => $owner->id, - 'name' => $owner->name, - 'avatar' => $owner->avatar, - ]; + if ($owner) { + $result['owner'] = [ + 'id' => $owner->id, + 'name' => $owner->name, + 'avatar' => $owner->avatar, + ]; + } return $result; } diff --git a/app/Services/Frontend/Consult/ConsultReply.php b/app/Services/Frontend/Consult/ConsultReply.php index 27bcb74d..7a90e0c5 100644 --- a/app/Services/Frontend/Consult/ConsultReply.php +++ b/app/Services/Frontend/Consult/ConsultReply.php @@ -23,9 +23,12 @@ class ConsultReply extends FrontendService $validator->checkTeacher($consult, $user); - $consult->answer = $validator->checkAnswer($post['answer']); - $consult->reply_time = time(); - $consult->update(); + $answer = $validator->checkAnswer($post['answer']); + + $consult->update([ + 'answer' => $answer, + 'reply_time' => time(), + ]); return $consult; } diff --git a/app/Services/Frontend/My/ConsultList.php b/app/Services/Frontend/My/ConsultList.php index 4bf61cc8..705c4847 100644 --- a/app/Services/Frontend/My/ConsultList.php +++ b/app/Services/Frontend/My/ConsultList.php @@ -56,6 +56,7 @@ class ConsultList extends FrontendService 'id' => $consult['id'], 'question' => $consult['question'], 'answer' => $consult['answer'], + 'priority' => $consult['priority'], 'like_count' => $consult['like_count'], 'reply_time' => $consult['reply_time'], 'create_time' => $consult['create_time'], diff --git a/app/Services/Frontend/Teaching/ConsultList.php b/app/Services/Frontend/Teaching/ConsultList.php index fb15f7c6..b270033f 100644 --- a/app/Services/Frontend/Teaching/ConsultList.php +++ b/app/Services/Frontend/Teaching/ConsultList.php @@ -72,6 +72,7 @@ class ConsultList extends FrontendService 'id' => $consult['id'], 'question' => $consult['question'], 'answer' => $consult['answer'], + 'priority' => $consult['priority'], 'like_count' => $consult['like_count'], 'reply_time' => $consult['reply_time'], 'create_time' => $consult['create_time'], @@ -107,7 +108,7 @@ class ConsultList extends FrontendService } } - $builder->orderBy('id DESC'); + $builder->orderBy('priority ASC,id DESC'); $pager = new PagerQueryBuilder([ 'builder' => $builder, diff --git a/app/Validators/Consult.php b/app/Validators/Consult.php index 28b7f3b9..a24226db 100644 --- a/app/Validators/Consult.php +++ b/app/Validators/Consult.php @@ -5,11 +5,10 @@ namespace App\Validators; use App\Exceptions\BadRequest as BadRequestException; use App\Exceptions\Forbidden as ForbiddenException; use App\Models\Consult as ConsultModel; -use App\Models\CourseUser as CourseUserModel; use App\Models\User as UserModel; use App\Repos\Consult as ConsultRepo; use App\Repos\ConsultLike as ConsultLikeRepo; -use App\Repos\CourseUser as CourseUserRepo; +use App\Repos\Course as CourseRepo; class Consult extends Validator { @@ -95,13 +94,18 @@ class Consult extends Validator public function checkTeacher(ConsultModel $consult, UserModel $user) { - $repo = new CourseUserRepo(); + $repo = new CourseRepo(); - $record = $repo->findCourseUser($consult->course_id, $user->id); + $teachers = $repo->findTeachers($consult->course_id); - $privOk = $record && $record->role_type == CourseUserModel::ROLE_TEACHER; + $isTeacher = false; - if (!$privOk) { + if ($teachers->count() > 0) { + $teacherIds = kg_array_column($teachers->toArray(), 'id'); + $isTeacher = in_array($user->id, $teacherIds); + } + + if (!$isTeacher) { throw new ForbiddenException('sys.forbidden'); } } diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index ba34b8f4..1238d288 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -73,6 +73,7 @@ } .pager { + margin-top: 20px; text-align: center; } @@ -239,10 +240,6 @@ body { padding: 0 5px; } -.search-course-list { - margin-bottom: 30px; -} - .search-course-card { padding-bottom: 15px; margin-bottom: 15px; @@ -270,7 +267,6 @@ body { .search-course-card .info { float: left; width: 500px; - color: #666; } .search-course-card .title { @@ -283,8 +279,13 @@ body { line-height: 1.5em; max-height: 4.5em; font-size: 12px; - word-wrap: break-word; + color: #666; overflow: hidden; + overflow-wrap: break-word; +} + +.search-course-card .meta { + color: #666; } .search-course-card .meta span { @@ -679,7 +680,7 @@ body { width: 650px; } -.review-card .rating { +.review-card .rating, .review-card .more { position: absolute; top: 0; right: 0; @@ -691,6 +692,11 @@ body { font-size: 12px; } +.review-card .more { + color: #666; + cursor: pointer; +} + .review-card .title { margin-bottom: 10px; } @@ -702,8 +708,11 @@ body { .review-card .content { margin-bottom: 15px; - word-wrap: break-word; + line-height: 1.5em; + max-height: 6em; + overflow-wrap: break-word; white-space: pre-wrap; + overflow: hidden; color: #666; } @@ -877,30 +886,6 @@ body { margin-bottom: 0; } -.danmu-form { - position: relative; - left: 180px; - bottom: 38px; - width: 420px; - z-index: 999; - display: none; -} - -.danmu-form .icon-danmu-set { - margin-right: 5px; - color: white; -} - -.danmu-form .layui-input { - width: 380px; - height: 28px; - display: inline; - line-height: 28px; - font-size: 12px; - color: white; - background-color: rgba(255, 255, 255, 0.1); -} - .chat-wrap .layui-card-header { text-align: center; } @@ -1445,26 +1430,64 @@ body { } .consult-table .question { - width: 400px; + width: 450px; } .consult-table .answer { - width: 400px; + width: 450px; } .review-table .title { - width: 350px; + width: 400px; } .review-table .content { - width: 350px; - color: #999; + width: 400px; + color: #666; } .review-form .layui-rate { padding-top: 6px; } +.consult-form .layui-form-label { + width: 50px; + padding: 9px 0; +} + +.consult-form .layui-input-block { + margin-left: 70px; +} + +.consult-form .layui-form-mid { + float: none; + margin-left: 70px; +} + +.consult-info .item { + clear: both; + margin-bottom: 15px; +} + +.consult-info .item .label { + float: left; + width: 50px; + height: 32px; + text-align: right; +} + +.consult-info .item .title { + float: left; + width: 600px; +} + +.consult-info .item .content { + float: left; + width: 600px; + color: #666; + word-wrap: break-word; +} + .security-item { padding: 15px; line-height: 50px; diff --git a/public/static/web/js/chapter.vod.player.js b/public/static/web/js/chapter.vod.player.js index 6ab8a2ba..de8fa6f7 100644 --- a/public/static/web/js/chapter.vod.player.js +++ b/public/static/web/js/chapter.vod.player.js @@ -1,8 +1,6 @@ -layui.use(['jquery', 'form', 'layer', 'helper'], function () { +layui.use(['jquery', 'helper'], function () { var $ = layui.jquery; - var form = layui.form; - var layer = layui.layer; var helper = layui.helper; var interval = null; @@ -13,30 +11,27 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () { var planId = $('input[name="chapter.plan_id"]').val(); var lastPosition = $('input[name="chapter.position"]').val(); var learningUrl = $('input[name="chapter.learning_url"]').val(); - var danmuListUrl = $('input[name="chapter.danmu_url"]').val(); var playUrls = JSON.parse($('input[name="chapter.play_urls"]').val()); - var $danmuText = $('input[name="danmu.text"]'); - var $danmuForm = $('.danmu-form'); - var playerOptions = { + var options = { autoplay: false, width: 760, height: 428 }; if (playUrls.od) { - playerOptions.m3u8 = playUrls.od.url; + options.m3u8 = playUrls.od.url; } if (playUrls.hd) { - playerOptions.m3u8_hd = playUrls.hd.url; + options.m3u8_hd = playUrls.hd.url; } if (playUrls.sd) { - playerOptions.m3u8_sd = playUrls.sd.url; + options.m3u8_sd = playUrls.sd.url; } - playerOptions.listener = function (msg) { + options.listener = function (msg) { if (msg.type === 'play') { play(); } else if (msg.type === 'pause') { @@ -46,7 +41,7 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () { } }; - var player = new TcPlayer('player', playerOptions); + var player = new TcPlayer('player', options); var position = parseInt(lastPosition); @@ -57,91 +52,6 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () { player.currentTime(position); } - $('.icon-danmu-set').on('click', function () { - layer.open({ - type: 1, - title: '弹幕设置', - area: '600px', - shadeClose: true, - content: $('#my-danmu-set') - }); - }); - - var dt = null; - - /** - * 控制弹幕表单的可见性 - */ - $('#player').hover(function () { - clearTimeout(dt); - $danmuForm.show(); - }, function () { - dt = setTimeout(function () { - $danmuForm.hide(); - }, 2500); - }); - - /** - * 文本框获得焦点后清理dt，不然对输入有干扰 - */ - $danmuText.focus(function () { - clearTimeout(dt); - }); - - /** - * @todo 弹幕层和播放器控制层css有抵触，待解决 - */ - - $('#danmu').danmu({ - left: 20, - top: 20, - width: 760, - height: 380 - }); - - initDanmu(); - - form.on('switch(danmu.status)', function (data) { - if (data.elem.checked) { - $('#danmu').danmu('setOpacity', 1); - } else { - $('#danmu').danmu('setOpacity', 0); - } - }); - - form.on('radio(danmu.opacity)', function (data) { - $('#danmu').danmu('setOpacity', parseFloat(data.value)); - }); - - form.on('submit(danmu.send)', function (data) { - var setFormData = form.val('danmu.form.set'); - var formData = form.val('danmu.form'); - $.ajax({ - type: 'POST', - url: data.form.action, - data: { - text: formData['danmu.text'], - color: setFormData['danmu.color'], - size: setFormData['danmu.size'], - position: setFormData['danmu.position'], - time: player.currentTime(), - chapter_id: chapterId - }, - success: function (res) { - $('#danmu').danmu('addDanmu', { - text: res.danmu.text, - color: res.danmu.color, - size: res.danmu.size, - time: (res.danmu.time + 1) * 10, //十分之一秒 - position: res.danmu.position, - isnew: 1 - }); - $danmuText.val(''); - } - }); - return false; - }); - function clearLearningInterval() { if (interval != null) { clearInterval(interval); @@ -154,19 +64,11 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () { } function play() { - startDanmu(); clearLearningInterval(); setLearningInterval(); } function pause() { - /** - * 视频结束也会触发暂停事件，此时弹幕可能尚未结束 - * 时间差区分暂停是手动还是结束触发 - */ - if (player.currentTime() < player.duration() - 5) { - pauseDanmu(); - } clearLearningInterval(); } @@ -191,35 +93,4 @@ layui.use(['jquery', 'form', 'layer', 'helper'], function () { } } - function startDanmu() { - $('#danmu').danmu('danmuResume'); - } - - function pauseDanmu() { - $('#danmu').danmu('danmuPause'); - } - - /** - * 一次性获取弹幕，待改进为根据时间轴区间获取 - */ - function initDanmu() { - $.ajax({ - type: 'GET', - url: danmuListUrl, - success: function (res) { - var items = []; - layui.each(res.items, function (index, item) { - items.push({ - text: item.text, - color: item.color, - size: item.size, - time: (item.time + 1) * 10, - position: item.position - }); - }); - $('#danmu').danmu('addDanmu', items); - } - }); - } - }); \ No newline at end of file diff --git a/public/static/web/js/course.show.js b/public/static/web/js/course.show.js index 8b3ad15a..19c7f639 100644 --- a/public/static/web/js/course.show.js +++ b/public/static/web/js/course.show.js @@ -72,6 +72,19 @@ layui.use(['jquery', 'layer', 'helper'], function () { }); }); + /** + * 咨询详情 + */ + $('body').on('click', '.consult-details', function () { + var url = $(this).data('url'); + layer.open({ + type: 2, + title: '咨询详情', + content: [url, 'no'], + area: ['720px', '320px'] + }); + }); + /** * 点赞（咨询|评价） */ diff --git a/public/static/web/js/my.js b/public/static/web/js/my.js index b8b9fbdc..11c4bce2 100644 --- a/public/static/web/js/my.js +++ b/public/static/web/js/my.js @@ -12,8 +12,8 @@ layui.use(['jquery', 'layer', 'helper'], function () { layer.open({ type: 2, title: '咨询详情', - content: url, - area: ['720px', '480px'] + content: [url, 'no'], + area: ['720px', '320px'] }); }); diff --git a/public/static/web/js/teaching.js b/public/static/web/js/teaching.js index f6eedafd..77cd2075 100644 --- a/public/static/web/js/teaching.js +++ b/public/static/web/js/teaching.js @@ -11,8 +11,8 @@ layui.use(['jquery', 'layer'], function () { layer.open({ type: 2, title: '咨询详情', - content: url, - area: ['720px', '480px'] + content: [url, 'no'], + area: ['720px', '320px'] }); }); @@ -25,7 +25,7 @@ layui.use(['jquery', 'layer'], function () { type: 2, title: '回复咨询', content: [url, 'no'], - area: ['720px', '400px'], + area: ['720px', '300px'], cancel: function () { parent.location.reload(); }