diff --git a/app/Builders/CourseUserList.php b/app/Builders/CourseUserList.php index 66dcb9d1..153dd22c 100644 --- a/app/Builders/CourseUserList.php +++ b/app/Builders/CourseUserList.php @@ -40,7 +40,7 @@ class CourseUserList 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/Controllers/TestController.php b/app/Http/Admin/Controllers/TestController.php index baa12cc4..414c85d5 100644 --- a/app/Http/Admin/Controllers/TestController.php +++ b/app/Http/Admin/Controllers/TestController.php @@ -74,19 +74,20 @@ class TestController extends Controller $pushUrl = $liveService->getPushUrl($streamName); - $codeUrl = $this->url->get( - ['for' => 'web.qrcode_img'], + $qrcode = $this->url->get( + ['for' => 'web.qrcode'], ['text' => urlencode($pushUrl)] ); - $obs = []; - $pos = strrpos($pushUrl, '/'); - $obs['fms_url'] = substr($pushUrl, 0, $pos + 1); - $obs['stream_code'] = substr($pushUrl, $pos + 1); + + $obs = [ + 'fms_url' => substr($pushUrl, 0, $pos + 1), + 'stream_code' => substr($pushUrl, $pos + 1), + ]; $this->view->pick('setting/live_push_test'); - $this->view->setVar('code_url', $codeUrl); + $this->view->setVar('qrcode', $qrcode); $this->view->setVar('obs', $obs); } diff --git a/app/Http/Admin/Services/AlipayTest.php b/app/Http/Admin/Services/AlipayTest.php index 68a98328..cd7bf6d1 100644 --- a/app/Http/Admin/Services/AlipayTest.php +++ b/app/Http/Admin/Services/AlipayTest.php @@ -23,7 +23,7 @@ class AlipayTest extends PayTest if ($code) { $codeUrl = $this->url->get( - ['for' => 'web.qrcode_img'], + ['for' => 'web.qrcode'], ['text' => urlencode($code)] ); } diff --git a/app/Http/Admin/Views/chapter/edit_lesson_live.volt b/app/Http/Admin/Views/chapter/edit_lesson_live.volt index 0f015afb..9d8ebadc 100644 --- a/app/Http/Admin/Views/chapter/edit_lesson_live.volt +++ b/app/Http/Admin/Views/chapter/edit_lesson_live.volt @@ -79,8 +79,7 @@ layer.open({ type: 2, title: '推流测试', - resize: false, - area: ['680px', '380px'], + area: ['680px', '450px'], content: [url, 'no'] }); }); diff --git a/app/Http/Admin/Views/setting/live_push.volt b/app/Http/Admin/Views/setting/live_push.volt index a2ab96b1..9ed1c3f4 100644 --- a/app/Http/Admin/Views/setting/live_push.volt +++ b/app/Http/Admin/Views/setting/live_push.volt @@ -93,8 +93,7 @@ layer.open({ type: 2, title: '推流测试', - resize: false, - area: ['680px', '380px'], + area: ['680px', '450px'], content: [url, 'no'] }); }); diff --git a/app/Http/Admin/Views/setting/live_push_test.volt b/app/Http/Admin/Views/setting/live_push_test.volt index b2e38e48..97a7aa5c 100644 --- a/app/Http/Admin/Views/setting/live_push_test.volt +++ b/app/Http/Admin/Views/setting/live_push_test.volt @@ -1,16 +1,23 @@
+
+ 手机推流 +
+
- -
- 二维码图片 +
+ 二维码图片
+
+ OBS推流 +
+
- +
- +
复制 @@ -18,9 +25,9 @@
- +
- +
复制 diff --git a/app/Http/Web/Controllers/ConsultController.php b/app/Http/Web/Controllers/ConsultController.php index 6c46365c..f40ef5ef 100644 --- a/app/Http/Web/Controllers/ConsultController.php +++ b/app/Http/Web/Controllers/ConsultController.php @@ -6,9 +6,8 @@ use App\Services\Frontend\Consult\ConsultCreate as ConsultCreateService; use App\Services\Frontend\Consult\ConsultDelete as ConsultDeleteService; use App\Services\Frontend\Consult\ConsultInfo as ConsultInfoService; use App\Services\Frontend\Consult\ConsultLike as ConsultLikeService; -use App\Services\Frontend\Consult\ConsultRating as ConsultRatingService; +use App\Services\Frontend\Consult\ConsultReply as ConsultReplyService; use App\Services\Frontend\Consult\ConsultUpdate as ConsultUpdateService; -use Phalcon\Mvc\View; /** * @RoutePrefix("/consult") @@ -21,20 +20,7 @@ class ConsultController extends Controller */ public function addAction() { - $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); - } - /** - * @Get("/{id:[0-9]+}/edit", name="web.consult.edit") - */ - public function editAction($id) - { - $service = new ConsultInfoService(); - - $consult = $service->handle($id); - - $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); - $this->view->setVar('consult', $consult); } /** @@ -46,10 +32,46 @@ class ConsultController extends Controller $consult = $service->handle($id); - $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); $this->view->setVar('consult', $consult); } + /** + * @Get("/{id:[0-9]+}/edit", name="web.consult.edit") + */ + public function editAction($id) + { + $service = new ConsultInfoService(); + + $consult = $service->handle($id); + + $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") */ @@ -61,12 +83,9 @@ class ConsultController extends Controller $service = new ConsultInfoService(); - $consult = $service->handle($consult->id); + $service->handle($consult->id); - $content = [ - 'consult' => $consult, - 'msg' => '提交咨询成功', - ]; + $content = ['msg' => '提交咨询成功']; return $this->jsonSuccess($content); } @@ -78,12 +97,9 @@ class ConsultController extends Controller { $service = new ConsultUpdateService(); - $consult = $service->handle($id); + $service->handle($id); - $content = [ - 'consult' => $consult, - 'msg' => '更新咨询成功', - ]; + $content = ['msg' => '更新咨询成功']; return $this->jsonSuccess($content); } @@ -118,18 +134,4 @@ class ConsultController extends Controller return $this->jsonSuccess($content); } - /** - * @Post("/{id:[0-9]+}/rating", name="web.consult.rating") - */ - public function ratingAction($id) - { - $service = new ConsultRatingService(); - - $service->handle($id); - - $content = ['msg' => '评价成功']; - - return $this->jsonSuccess($content); - } - } diff --git a/app/Http/Web/Controllers/MyController.php b/app/Http/Web/Controllers/MyController.php index 8a5e02da..390f4bc3 100644 --- a/app/Http/Web/Controllers/MyController.php +++ b/app/Http/Web/Controllers/MyController.php @@ -30,14 +30,11 @@ class MyController extends Controller } /** - * @Get("/home", name="web.my.home") + * @Get("/", name="web.my.index") */ - public function homeAction() + public function indexAction() { - $this->response->redirect([ - 'for' => 'web.user.show', - 'id' => $this->authUser->id, - ]); + return $this->dispatcher->forward(['action' => 'courses']); } /** diff --git a/app/Http/Web/Controllers/PublicController.php b/app/Http/Web/Controllers/PublicController.php index c208141e..ff7d3c76 100644 --- a/app/Http/Web/Controllers/PublicController.php +++ b/app/Http/Web/Controllers/PublicController.php @@ -39,9 +39,9 @@ class PublicController extends \Phalcon\Mvc\Controller } /** - * @Get("/qrcode/img", name="web.qrcode_img") + * @Get("/qrcode", name="web.qrcode") */ - public function qrcodeImageAction() + public function qrcodeAction() { $text = $this->request->getQuery('text'); $level = $this->request->getQuery('level', 'int', 0); diff --git a/app/Http/Web/Controllers/TeachingController.php b/app/Http/Web/Controllers/TeachingController.php index 85801343..7db54747 100644 --- a/app/Http/Web/Controllers/TeachingController.php +++ b/app/Http/Web/Controllers/TeachingController.php @@ -3,8 +3,10 @@ namespace App\Http\Web\Controllers; -use App\Services\Frontend\Teaching\ConsultList as TclService; -use App\Services\Frontend\Teaching\LiveList as TllService; +use App\Services\Frontend\Teaching\ConsultList as ConsultListService; +use App\Services\Frontend\Teaching\CourseList as CourseListService; +use App\Services\Frontend\Teaching\LiveList as LiveListService; +use App\Services\Frontend\Teaching\LivePushUrl as LivePushUrlService; /** @@ -13,12 +15,34 @@ use App\Services\Frontend\Teaching\LiveList as TllService; class TeachingController extends Controller { + /** + * @Get("/", name="web.teaching.index") + */ + public function indexAction() + { + $this->dispatcher->forward(['action' => 'courses']); + } + + /** + * @Get("/courses", name="web.teaching.courses") + */ + public function coursesAction() + { + $service = new CourseListService(); + + $pager = $service->handle(); + + $pager->items = kg_array_object($pager->items); + + $this->view->setVar('pager', $pager); + } + /** * @Get("/lives", name="web.teaching.lives") */ public function livesAction() { - $service = new TllService(); + $service = new LiveListService(); $pager = $service->handle(); @@ -32,7 +56,7 @@ class TeachingController extends Controller */ public function consultsAction() { - $service = new TclService(); + $service = new ConsultListService(); $pager = $service->handle(); @@ -41,4 +65,30 @@ class TeachingController extends Controller $this->view->setVar('pager', $pager); } + /** + * @Get("/live/push", name="web.teaching.live_push") + */ + public function livePushAction() + { + $service = new LivePushUrlService(); + + $pushUrl = $service->handle(); + + $qrcode = $this->url->get( + ['for' => 'web.qrcode'], + ['text' => urlencode($pushUrl)] + ); + + $pos = strrpos($pushUrl, '/'); + + $obs = [ + 'fms_url' => substr($pushUrl, 0, $pos + 1), + 'stream_code' => substr($pushUrl, $pos + 1), + ]; + + $this->view->pick('teaching/live_push'); + $this->view->setVar('qrcode', $qrcode); + $this->view->setVar('obs', $obs); + } + } \ No newline at end of file diff --git a/app/Http/Web/Services/Trade.php b/app/Http/Web/Services/Trade.php index 2bf8898e..ef606c61 100644 --- a/app/Http/Web/Services/Trade.php +++ b/app/Http/Web/Services/Trade.php @@ -62,7 +62,7 @@ class Trade extends Service if ($text) { $qrCodeUrl = $this->url->get( - ['for' => 'web.qrcode_img'], + ['for' => 'web.qrcode'], ['text' => urlencode($text)] ); } diff --git a/app/Http/Web/Views/chapter/live.volt b/app/Http/Web/Views/chapter/live.volt index 7cf965b9..c75d9fda 100644 --- a/app/Http/Web/Views/chapter/live.volt +++ b/app/Http/Web/Views/chapter/live.volt @@ -10,7 +10,7 @@ {% set send_msg_url = url({'for':'web.live.send_msg','id':chapter.id}) %} {% set bind_user_url = url({'for':'web.live.bind_user','id':chapter.id}) %} {% set like_url = url({'for':'web.chapter.like','id':chapter.id}) %} - {% set qrcode_url = url({'for':'web.qrcode_img'},{'text':chapter_full_url}) %} + {% set qrcode_url = url({'for':'web.qrcode'},{'text':chapter_full_url}) %}
diff --git a/app/Http/Web/Views/chapter/read.volt b/app/Http/Web/Views/chapter/read.volt index 1e8ac0e3..53b9b346 100644 --- a/app/Http/Web/Views/chapter/read.volt +++ b/app/Http/Web/Views/chapter/read.volt @@ -7,7 +7,7 @@ {% set learning_url = url({'for':'web.chapter.learning','id':chapter.id}) %} {% set like_url = url({'for':'web.chapter.like','id':chapter.id}) %} {% set consult_url = url({'for':'web.consult.add'},{'chapter_id':chapter.id}) %} - {% set qrcode_url = url({'for':'web.qrcode_img'},{'text':chapter_full_url}) %} + {% set qrcode_url = url({'for':'web.qrcode'},{'text':chapter_full_url}) %}
diff --git a/app/Http/Web/Views/chapter/vod.volt b/app/Http/Web/Views/chapter/vod.volt index 443129da..06ca998c 100644 --- a/app/Http/Web/Views/chapter/vod.volt +++ b/app/Http/Web/Views/chapter/vod.volt @@ -7,7 +7,7 @@ {% 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_img'},{'text':chapter_full_url}) %} + {% set qrcode_url = url({'for':'web.qrcode'},{'text':chapter_full_url}) %} {% set consult_url = url({'for':'web.consult.add'},{'chapter_id':chapter.id}) %} {% set liked_class = chapter.me.liked ? 'active' : '' %} diff --git a/app/Http/Web/Views/consult/edit.volt b/app/Http/Web/Views/consult/edit.volt index 9af5ee72..e09eb9c0 100644 --- a/app/Http/Web/Views/consult/edit.volt +++ b/app/Http/Web/Views/consult/edit.volt @@ -14,9 +14,9 @@
{{ consult.chapter.title }}
- +
- +
@@ -30,7 +30,6 @@
-
diff --git a/app/Http/Web/Views/consult/reply.volt b/app/Http/Web/Views/consult/reply.volt new file mode 100644 index 00000000..28606202 --- /dev/null +++ b/app/Http/Web/Views/consult/reply.volt @@ -0,0 +1,34 @@ +{% extends 'templates/layer.volt' %} + +{% block content %} + + {% set update_url = url({'for':'web.consult.reply','id':consult.id}) %} + +
+
+ +
{{ consult.course.title }}
+
+
+ +
{{ consult.chapter.title }}
+
+
+ +
{{ consult.question }}
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +{% 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 c28e1d4c..db231c07 100644 --- a/app/Http/Web/Views/consult/show.volt +++ b/app/Http/Web/Views/consult/show.volt @@ -2,7 +2,6 @@ {% block content %} - {% set rating_url = url({'for':'web.consult.rating','id':consult.id}) %} {% set answer = consult.answer ? consult.answer : '稍安勿燥，请耐心等待回复吧' %}
@@ -22,39 +21,6 @@
{{ answer }}
- {% if consult.answer %} -
- -
- - -
-
-
- {% endif %} -{% 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 18e49063..569975af 100644 --- a/app/Http/Web/Views/course/consults.volt +++ b/app/Http/Web/Views/course/consults.volt @@ -1,5 +1,3 @@ -{{ partial('partials/macro_course') }} - {% if pager.total_pages > 0 %}
{% for item in pager.items %} @@ -13,7 +11,6 @@
-
{{ star_info(item.rating) }}
{{ item.question }}
{{ item.answer }}
diff --git a/app/Http/Web/Views/course/show.volt b/app/Http/Web/Views/course/show.volt index 703081d4..3d5db934 100644 --- a/app/Http/Web/Views/course/show.volt +++ b/app/Http/Web/Views/course/show.volt @@ -8,7 +8,7 @@ {% set favorite_star = course.me.favorited ? 'layui-icon-star-fill' : 'layui-icon-star' %} {% set full_course_url = full_url({'for':'web.course.show','id':course.id}) %} {% set favorite_url = url({'for':'web.course.favorite','id':course.id}) %} - {% set qrcode_url = url({'for':'web.qrcode_img'},{'text':full_course_url}) %} + {% set qrcode_url = url({'for':'web.qrcode'},{'text':full_course_url}) %}
diff --git a/app/Http/Web/Views/my/courses.volt b/app/Http/Web/Views/my/courses.volt index 41176eee..774ef538 100644 --- a/app/Http/Web/Views/my/courses.volt +++ b/app/Http/Web/Views/my/courses.volt @@ -29,6 +29,7 @@ {% for item in pager.items %} {% set course_url = url({'for':'web.course.show','id':item.course.id}) %} {% set review_url = url({'for':'web.review.add'},{'id':item.course.id}) %} + {% set allow_review = item.progress > 30 and item.reviewed == 0 %}

标题：{{ item.course.title }} {{ model_info(item.course.model) }}

@@ -39,7 +40,11 @@

进度：{{ item.progress }}%

- + {% if allow_review %} + + {% else %} + + {% endif %} {% endfor %} diff --git a/app/Http/Web/Views/my/menu.volt b/app/Http/Web/Views/my/menu.volt index 3ea4d110..4b5bc5cc 100644 --- a/app/Http/Web/Views/my/menu.volt +++ b/app/Http/Web/Views/my/menu.volt @@ -14,16 +14,6 @@
{{ auth_user.name }} {{ vip_info(auth_user) }}
-
-
教学中心
-
- -
-
-
课程中心
diff --git a/app/Http/Web/Views/partials/header.volt b/app/Http/Web/Views/partials/header.volt index 02f6b4b1..846b4a01 100644 --- a/app/Http/Web/Views/partials/header.volt +++ b/app/Http/Web/Views/partials/header.volt @@ -30,8 +30,11 @@
  • {{ auth_user.name }}
    -
    我的主页
    -
    个人设置
    +
    我的主页
    + {% if auth_user.edu_role == 2 %} +
    教学中心
    + {% endif %} +
    用户中心
    退出登录
    • diff --git a/app/Http/Web/Views/teaching/consults.volt b/app/Http/Web/Views/teaching/consults.volt new file mode 100644 index 00000000..2a09e226 --- /dev/null +++ b/app/Http/Web/Views/teaching/consults.volt @@ -0,0 +1,69 @@ +{% extends 'templates/main.volt' %} + +{% block content %} + + {% set status_types = {'all':'全部','pending':'待回复','replied':'已回复'} %} + {% set status = request.get('status','trim','all') %} + +
    +
    {{ partial('teaching/menu') }}
    +
    +
    +
    + 用户咨询 + {% for key,value in status_types %} + {% set class = (status == key) ? 'layui-btn layui-btn-xs' : 'none' %} + {% set url = url({'for':'web.teaching.consults'},{'status':key}) %} + {{ value }} + {% endfor %} +
    + {% if pager.total_pages > 0 %} + + + + + + + + + + + + + + + {% for item in pager.items %} + {% set answer = item.answer ? item.answer : '等待回复ing...' %} + {% 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}) %} + + + + + + {% endfor %} + +
    内容时间操作
    +

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

    +

    提问：{{ item.question }}

    +

    回复：{{ answer }}

    +     		{{ date('Y-m-d',item.create_time) }} + + + +
    + {{ partial('partials/pager') }} + {% endif %} +
    +
    +
    + +{% endblock %} + +{% block include_js %} + + {{ js_include('web/js/teaching.js') }} + +{% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/teaching/courses.volt b/app/Http/Web/Views/teaching/courses.volt new file mode 100644 index 00000000..0c3430ff --- /dev/null +++ b/app/Http/Web/Views/teaching/courses.volt @@ -0,0 +1,51 @@ +{% extends 'templates/main.volt' %} + +{% block content %} + + {{ partial('partials/macro_course') }} + +
    +
    {{ partial('teaching/menu') }}
    +
    +
    +
    + 我的课程 +
    + {% if pager.total_pages > 0 %} + + + + + + + + + + + + + + + + + + + {% for item in pager.items %} + {% set course_url = url({'for':'web.course.show','id':item.id}) %} + + + + + + + + {% endfor %} + +
    名称课时学员收藏评分
    {{ item.title }} {{ model_info(item.model) }}{{ item.lesson_count }}{{ item.user_count }}{{ item.favorite_count }}{{ item.rating }}
    + {{ partial('partials/pager') }} + {% endif %} +
    +
    +
    + +{% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/teaching/live_push.volt b/app/Http/Web/Views/teaching/live_push.volt new file mode 100644 index 00000000..ce8b2350 --- /dev/null +++ b/app/Http/Web/Views/teaching/live_push.volt @@ -0,0 +1,44 @@ +{% extends 'templates/layer.volt' %} + +{% block content %} + +
    +
    + 手机推流 +
    +
    +
    +
    二维码图片
    +
    +
    +
    + OBS推流 +
    +
    + +
    + +
    +
    + 复制 +
    +
    +
    + +
    + +
    +
    + 复制 +
    +
    +
    + +{% endblock %} + +{% block include_js %} + + {{ js_include('lib/clipboard.min.js') }} + {{ js_include('web/js/copy.js') }} + +{% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/teaching/lives.volt b/app/Http/Web/Views/teaching/lives.volt new file mode 100644 index 00000000..71b72a7d --- /dev/null +++ b/app/Http/Web/Views/teaching/lives.volt @@ -0,0 +1,63 @@ +{% extends 'templates/main.volt' %} + +{% block content %} + + {{ partial('partials/macro_course') }} + +
    +
    {{ partial('teaching/menu') }}
    +
    +
    +
    + 课程直播 +
    + {% if pager.total_pages > 0 %} + + + + + + + + + + + + + + + {% for item in pager.items %} + {% set course_url = url({'for':'web.course.show','id':item.course.id}) %} + {% set chapter_url = url({'for':'web.chapter.show','id':item.chapter.id}) %} + {% set live_push_url = url({'for':'web.teaching.live_push','id':item.chapter.id}) %} + {% set allow_push = (item.start_time - 1800 < time()) and (time() < item.start_time + 1800) %} + + + + + + {% endfor %} + +
    课程/章节直播时间操作
    +

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

    +

    章节：{{ item.chapter.title }}

    +     		{{ date('m-d',item.start_time) }} {{ date('H:i',item.start_time) }} ~ {{ date('H:i',item.end_time) }} + {% if allow_push %} + + {% else %} + + {% endif %} +
    + {{ partial('partials/pager') }} + {% endif %} +
    +
    +
    + +{% endblock %} + +{% block include_js %} + + {{ js_include('web/js/teaching.js') }} + +{% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/teaching/menu.volt b/app/Http/Web/Views/teaching/menu.volt new file mode 100644 index 00000000..9c3ef0b9 --- /dev/null +++ b/app/Http/Web/Views/teaching/menu.volt @@ -0,0 +1,10 @@ +
    +
    教学中心
    +
    + +
    +
    diff --git a/app/Http/Web/Views/templates/layer.volt b/app/Http/Web/Views/templates/layer.volt index e15ecd90..d9ce80b2 100644 --- a/app/Http/Web/Views/templates/layer.volt +++ b/app/Http/Web/Views/templates/layer.volt @@ -5,6 +5,7 @@ + {{ site_seo.getTitle() }} {{ icon_link('favicon.ico') }} {{ css_link('lib/layui/css/layui.css') }} {{ css_link('web/css/common.css') }} diff --git a/app/Models/Consult.php b/app/Models/Consult.php index bcb55504..389ec65b 100644 --- a/app/Models/Consult.php +++ b/app/Models/Consult.php @@ -56,13 +56,6 @@ class Consult extends Model */ public $answer; - /** - * 评分 - * - * @var int - */ - public $rating; - /** * 赞成数 * @@ -103,7 +96,7 @@ class Consult extends Model * * @var int */ - public $answer_time; + public $reply_time; /** * 创建时间 @@ -145,10 +138,6 @@ class Consult extends Model { $this->update_time = time(); - if (!empty($this->answer) && $this->answer_time == 0) { - $this->answer_time = time(); - } - if ($this->deleted == 1) { $this->published = 0; } diff --git a/app/Repos/Course.php b/app/Repos/Course.php index fb625dfd..4dc5a34a 100644 --- a/app/Repos/Course.php +++ b/app/Repos/Course.php @@ -348,7 +348,7 @@ class Course extends Repository $result = []; - if ($rows->count() == 0) { + if ($rows->count() > 0) { $result = kg_array_column($rows->toArray(), 'course_id'); } diff --git a/app/Services/Frontend/Chapter/ChapterBasicInfoTrait.php b/app/Services/Frontend/Chapter/ChapterBasicInfoTrait.php index eac8456b..883a0ba2 100644 --- a/app/Services/Frontend/Chapter/ChapterBasicInfoTrait.php +++ b/app/Services/Frontend/Chapter/ChapterBasicInfoTrait.php @@ -12,6 +12,8 @@ use WhichBrowser\Parser as BrowserParser; trait ChapterBasicInfoTrait { + use ChapterLiveTrait; + protected function handleBasicInfo(ChapterModel $chapter) { $result = []; @@ -65,7 +67,7 @@ trait ChapterBasicInfoTrait $liveService = new LiveService(); - $stream = "chapter-{$chapter->id}"; + $stream = $this->getLiveStreamName($chapter->id); $format = $browserParser->isType('desktop') ? 'flv' : 'hls'; diff --git a/app/Services/Frontend/Chapter/ChapterInfo.php b/app/Services/Frontend/Chapter/ChapterInfo.php index 23cc4ec4..d34a8938 100644 --- a/app/Services/Frontend/Chapter/ChapterInfo.php +++ b/app/Services/Frontend/Chapter/ChapterInfo.php @@ -115,7 +115,7 @@ class ChapterInfo extends FrontendService $this->incrCourseUserCount($course); - $this->incrUserCourseCount($course); + $this->incrUserCourseCount($user); } protected function handleChapterUser(ChapterModel $chapter, UserModel $user) @@ -162,9 +162,4 @@ class ChapterInfo extends FrontendService $chapter->update(); } - protected function getLiveStreamName($id) - { - return "chapter_{$id}"; - } - } diff --git a/app/Services/Frontend/Chapter/ChapterLiveTrait.php b/app/Services/Frontend/Chapter/ChapterLiveTrait.php new file mode 100644 index 00000000..336d95b1 --- /dev/null +++ b/app/Services/Frontend/Chapter/ChapterLiveTrait.php @@ -0,0 +1,13 @@ +checkOwner($user->id, $consult->user_id); - - $validator->checkIfAllowRate($consult); - - $rating = $validator->checkRating($post['rating']); - - $consult->rating = $rating; + $validator->checkTeacher($consult, $user); + $consult->answer = $validator->checkAnswer($post['answer']); + $consult->reply_time = time(); $consult->update(); return $consult; diff --git a/app/Services/Frontend/Consult/ConsultUpdate.php b/app/Services/Frontend/Consult/ConsultUpdate.php index 81a91eb1..7463af22 100644 --- a/app/Services/Frontend/Consult/ConsultUpdate.php +++ b/app/Services/Frontend/Consult/ConsultUpdate.php @@ -23,13 +23,19 @@ class ConsultUpdate extends FrontendService $validator->checkOwner($user->id, $consult->owner_id); - $validator->checkIfAllowEdit($consult); + $validator->checkConsultEdit($consult); - $question = $validator->checkQuestion($post['question']); + $data = []; - $consult->question = $question; + if (isset($post['question'])) { + $data['question'] = $validator->checkQuestion($post['question']); + } - $consult->update(); + if (isset($post['private'])) { + $data['private'] = $validator->checkPrivateStatus($post['private']); + } + + $consult->update($data); return $consult; } diff --git a/app/Services/Frontend/Course/ConsultList.php b/app/Services/Frontend/Course/ConsultList.php index 53d0ea57..6718caf9 100644 --- a/app/Services/Frontend/Course/ConsultList.php +++ b/app/Services/Frontend/Course/ConsultList.php @@ -58,8 +58,8 @@ class ConsultList extends FrontendService 'id' => $consult['id'], 'question' => $consult['question'], 'answer' => $consult['answer'], - 'rating' => $consult['rating'], 'like_count' => $consult['like_count'], + 'reply_time' => $consult['reply_time'], 'create_time' => $consult['create_time'], 'update_time' => $consult['update_time'], 'owner' => $owner, diff --git a/app/Services/Frontend/Course/CourseList.php b/app/Services/Frontend/Course/CourseList.php index 792a2a9f..2e681fb9 100644 --- a/app/Services/Frontend/Course/CourseList.php +++ b/app/Services/Frontend/Course/CourseList.php @@ -74,6 +74,8 @@ class CourseList extends FrontendService 'level' => $course['level'], 'user_count' => $course['user_count'], 'lesson_count' => $course['lesson_count'], + 'review_count' => $course['review_count'], + 'favorite_count' => $course['favorite_count'], ]; } diff --git a/app/Services/Frontend/My/ConsultList.php b/app/Services/Frontend/My/ConsultList.php index 3c788124..4bf61cc8 100644 --- a/app/Services/Frontend/My/ConsultList.php +++ b/app/Services/Frontend/My/ConsultList.php @@ -18,7 +18,7 @@ class ConsultList extends FrontendService $params = $pagerQuery->getParams(); - $params['user_id'] = $user->id; + $params['owner_id'] = $user->id; $params['published'] = 1; $sort = $pagerQuery->getSort(); @@ -56,8 +56,8 @@ class ConsultList extends FrontendService 'id' => $consult['id'], 'question' => $consult['question'], 'answer' => $consult['answer'], - 'rating' => $consult['rating'], 'like_count' => $consult['like_count'], + 'reply_time' => $consult['reply_time'], 'create_time' => $consult['create_time'], 'update_time' => $consult['update_time'], 'course' => $course, diff --git a/app/Services/Frontend/Search/CourseList.php b/app/Services/Frontend/Search/CourseList.php index 175d8dc2..cdfe4cd9 100644 --- a/app/Services/Frontend/Search/CourseList.php +++ b/app/Services/Frontend/Search/CourseList.php @@ -53,6 +53,8 @@ class CourseList extends FrontendService 'level' => $course['level'], 'user_count' => (int)$course['user_count'], 'lesson_count' => (int)$course['lesson_count'], + 'review_count' => (int)$course['review_count'], + 'favorite_count' => (int)$course['favorite_count'], 'teacher' => json_decode($course['teacher']), 'category' => json_decode($course['category']), ]; diff --git a/app/Services/Frontend/Teaching/ConsultList.php b/app/Services/Frontend/Teaching/ConsultList.php index eed26f6f..fb15f7c6 100644 --- a/app/Services/Frontend/Teaching/ConsultList.php +++ b/app/Services/Frontend/Teaching/ConsultList.php @@ -21,6 +21,7 @@ class ConsultList extends FrontendService $pagerQuery = new PagerQuery(); + $params = $pagerQuery->getParams(); $page = $pagerQuery->getPage(); $limit = $pagerQuery->getLimit(); @@ -30,9 +31,17 @@ class ConsultList extends FrontendService return []; } - $courseIds = kg_array_column($courses->toArray(), 'id'); + $params['status'] = $params['status'] ?? null; - $pager = $this->paginate($courseIds, $page, $limit); + if ($params['status'] == 'pending') { + $params['replied'] = 0; + } elseif ($params['status'] == 'replied') { + $params['replied'] = 1; + } + + $params['course_id'] = kg_array_column($courses->toArray(), 'id'); + + $pager = $this->paginate($params, $page, $limit); return $this->handleConsults($pager); } @@ -63,8 +72,8 @@ class ConsultList extends FrontendService 'id' => $consult['id'], 'question' => $consult['question'], 'answer' => $consult['answer'], - 'rating' => $consult['rating'], 'like_count' => $consult['like_count'], + 'reply_time' => $consult['reply_time'], 'create_time' => $consult['create_time'], 'update_time' => $consult['update_time'], 'course' => $course, @@ -78,13 +87,27 @@ class ConsultList extends FrontendService return $pager; } - protected function paginate($courseIds, $page = 1, $limit = 15) + protected function paginate($where, $page = 1, $limit = 15) { - $builder = $this->modelsManager->createBuilder() - ->from(ConsultModel::class) - ->inWhere('course_id', $courseIds) - ->andWhere('published = 1') - ->orderBy('priority ASC'); + $builder = $this->modelsManager->createBuilder(); + + $builder->from(ConsultModel::class); + + $builder->where('published = 1'); + + if (!empty($where['course_id'])) { + $builder->inWhere('course_id', $where['course_id']); + } + + if (isset($where['replied'])) { + if ($where['replied'] == 1) { + $builder->andWhere('reply_time > 0'); + } else { + $builder->andWhere('reply_time = 0'); + } + } + + $builder->orderBy('id DESC'); $pager = new PagerQueryBuilder([ 'builder' => $builder, diff --git a/app/Services/Frontend/Teaching/CourseList.php b/app/Services/Frontend/Teaching/CourseList.php new file mode 100644 index 00000000..d8c93650 --- /dev/null +++ b/app/Services/Frontend/Teaching/CourseList.php @@ -0,0 +1,84 @@ +getLoginUser(); + + $pagerQuery = new PagerQuery(); + + $page = $pagerQuery->getPage(); + $limit = $pagerQuery->getLimit(); + + $pager = $this->paginate($user->id, $page, $limit); + + return $this->handleCourses($pager); + } + + protected function handleCourses($pager) + { + if ($pager->total_items == 0) { + return $pager; + } + + $items = []; + + $baseUrl = kg_ci_base_url(); + + foreach ($pager->items->toArray() as $course) { + + $course['cover'] = $baseUrl . $course['cover']; + + $items[] = [ + 'id' => $course['id'], + 'title' => $course['title'], + 'cover' => $course['cover'], + 'market_price' => (float)$course['market_price'], + 'vip_price' => (float)$course['vip_price'], + 'rating' => (float)$course['rating'], + 'model' => $course['model'], + 'level' => $course['level'], + 'user_count' => $course['user_count'], + 'lesson_count' => $course['lesson_count'], + 'review_count' => $course['review_count'], + 'favorite_count' => $course['favorite_count'], + ]; + } + + $pager->items = $items; + + return $pager; + } + + protected function paginate($userId, $page = 1, $limit = 15) + { + $builder = $this->modelsManager->createBuilder(); + + $builder->columns('c.*'); + $builder->addFrom(CourseModel::class, 'c'); + $builder->join(CourseUserModel::class, 'c.id = cu.course_id', 'cu'); + $builder->where('cu.user_id = :user_id:', ['user_id' => $userId]); + $builder->andWhere('cu.role_type = :role_type:', ['role_type' => CourseUserModel::ROLE_TEACHER]); + $builder->andWhere('c.published = 1'); + $builder->orderBy('c.id DESC'); + + $pager = new PagerQueryBuilder([ + 'builder' => $builder, + 'page' => $page, + 'limit' => $limit, + ]); + + return $pager->paginate(); + } + +} diff --git a/app/Services/Frontend/Teaching/LiveList.php b/app/Services/Frontend/Teaching/LiveList.php index 34e78b37..9be177cb 100644 --- a/app/Services/Frontend/Teaching/LiveList.php +++ b/app/Services/Frontend/Teaching/LiveList.php @@ -68,12 +68,15 @@ class LiveList extends FrontendService protected function paginate($courseIds, $page = 1, $limit = 15) { + $startTime = strtotime('today'); + $builder = $this->modelsManager->createBuilder() ->columns(['c.id', 'c.title', 'c.course_id', 'cl.start_time', 'cl.end_time']) ->addFrom(ChapterModel::class, 'c') ->join(ChapterLiveModel::class, 'c.id = cl.chapter_id', 'cl') ->inWhere('cl.course_id', $courseIds) - ->orderBy('cl.start_time DESC'); + ->andWhere('cl.start_time > :start_time:', ['start_time' => $startTime]) + ->orderBy('cl.start_time ASC'); $pager = new PagerQueryBuilder([ 'builder' => $builder, diff --git a/app/Services/Frontend/Teaching/LivePushUrl.php b/app/Services/Frontend/Teaching/LivePushUrl.php new file mode 100644 index 00000000..813f4d1e --- /dev/null +++ b/app/Services/Frontend/Teaching/LivePushUrl.php @@ -0,0 +1,29 @@ +request->getQuery('chapter_id'); + + $chapter = $this->checkChapter($chapterId); + + $service = new LiveService(); + + $steamName = $this->getLiveStreamName($chapter->id); + + return $service->getPushUrl($steamName); + } + +} diff --git a/app/Services/Live.php b/app/Services/Live.php index 038ecaa6..e4494e95 100644 --- a/app/Services/Live.php +++ b/app/Services/Live.php @@ -73,6 +73,7 @@ class Live extends Service } catch (TencentCloudSDKException $e) { $this->logger->error('Describe Live Stream State Exception ' . kg_json_encode([ + 'line' => $e->getLine(), 'code' => $e->getErrorCode(), 'message' => $e->getMessage(), 'requestId' => $e->getRequestId(), @@ -118,6 +119,7 @@ class Live extends Service } catch (TencentCloudSDKException $e) { $this->logger->error('Forbid Live Stream Exception ' . kg_json_encode([ + 'line' => $e->getLine(), 'code' => $e->getErrorCode(), 'message' => $e->getMessage(), 'requestId' => $e->getRequestId(), @@ -161,6 +163,7 @@ class Live extends Service } catch (TencentCloudSDKException $e) { $this->logger->error('Resume Live Stream Exception ' . kg_json_encode([ + 'line' => $e->getLine(), 'code' => $e->getErrorCode(), 'message' => $e->getMessage(), 'requestId' => $e->getRequestId(), diff --git a/app/Validators/Consult.php b/app/Validators/Consult.php index e158a30c..28b7f3b9 100644 --- a/app/Validators/Consult.php +++ b/app/Validators/Consult.php @@ -3,9 +3,13 @@ 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; class Consult extends Validator { @@ -71,15 +75,6 @@ class Consult extends Validator return $value; } - public function checkRating($rating) - { - if (!in_array($rating, [1, 2, 3, 4, 5])) { - throw new BadRequestException('consult.invalid_rating'); - } - - return $rating; - } - public function checkPrivateStatus($status) { if (!in_array($status, [0, 1])) { @@ -98,13 +93,26 @@ class Consult extends Validator return $status; } - public function checkIfAllowEdit(ConsultModel $consult) + public function checkTeacher(ConsultModel $consult, UserModel $user) + { + $repo = new CourseUserRepo(); + + $record = $repo->findCourseUser($consult->course_id, $user->id); + + $privOk = $record && $record->role_type == CourseUserModel::ROLE_TEACHER; + + if (!$privOk) { + throw new ForbiddenException('sys.forbidden'); + } + } + + public function checkConsultEdit(ConsultModel $consult) { /** * (1)已回复不允许修改提问 * (2)发表三天以后不能修改提问 */ - $case1 = !empty($consult->answer); + $case1 = $consult->reply_time > 0; $case2 = time() - $consult->create_time > 3 * 86400; if ($case1 || $case2) { @@ -112,26 +120,6 @@ class Consult extends Validator } } - public function checkIfAllowRate(ConsultModel $consult) - { - /** - * 未回复不允许评价 - */ - if (empty($consult->answer)) { - throw new BadRequestException('consult.rate_not_allowed'); - } - - /** - * 已评价，三天后不能更改评价 - */ - $case1 = $consult->rating > 0; - $case2 = time() - $consult->answer_time > 3 * 86400; - - if ($case1 && $case2) { - throw new BadRequestException('consult.rate_not_allowed'); - } - } - public function checkIfDuplicated($question, $chapterId, $userId) { $repo = new ConsultRepo(); diff --git a/config/errors.php b/config/errors.php index 7e5b2d7c..6eac314e 100644 --- a/config/errors.php +++ b/config/errors.php @@ -210,7 +210,6 @@ $error['consult.question_too_long'] = '问题内容太长（多于1000个字符 $error['consult.answer_too_short'] = '回复内容太短（少于15个字符）'; $error['consult.answer_too_long'] = '回复内容太长（多于1000个字符）'; $error['consult.edit_not_allowed'] = '当前不允许修改操作'; -$error['consult.rate_not_allowed'] = '当前不允许评价'; $error['consult.has_liked'] = '你已经点过赞啦'; /** diff --git a/public/static/admin/css/common.css b/public/static/admin/css/common.css index f2f037b2..86059c0c 100644 --- a/public/static/admin/css/common.css +++ b/public/static/admin/css/common.css @@ -159,8 +159,8 @@ img.kg-avatar { } img.kg-qrcode { - width: 140px; - height: 140px; + width: 100px; + height: 100px; border: 3px dashed #ccc; } diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index 0ef80015..ba34b8f4 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -48,6 +48,12 @@ border: 3px dashed #ccc; } +.qrcode-sm img { + width: 100px; + height: 100px; + border: 3px dashed #ccc; +} + .breadcrumb { position: relative; margin-bottom: 20px; diff --git a/public/static/web/js/copy.js b/public/static/web/js/copy.js new file mode 100644 index 00000000..c66d263f --- /dev/null +++ b/public/static/web/js/copy.js @@ -0,0 +1,10 @@ +layui.use(['layer'], function () { + + var layer = layui.layer; + var clipboard = new ClipboardJS('.kg-copy'); + + clipboard.on('success', function (e) { + layer.msg('内容已经复制到剪贴板'); + }); + +}); \ No newline at end of file diff --git a/public/static/web/js/teaching.js b/public/static/web/js/teaching.js new file mode 100644 index 00000000..f6eedafd --- /dev/null +++ b/public/static/web/js/teaching.js @@ -0,0 +1,48 @@ +layui.use(['jquery', 'layer'], function () { + + var $ = layui.jquery; + var layer = layui.layer; + + /** + * 查看咨询 + */ + $('.btn-show-consult').on('click', function () { + var url = $(this).data('url'); + layer.open({ + type: 2, + title: '咨询详情', + content: url, + area: ['720px', '480px'] + }); + }); + + /** + * 回复咨询 + */ + $('.btn-reply-consult').on('click', function () { + var url = $(this).data('url'); + layer.open({ + type: 2, + title: '回复咨询', + content: [url, 'no'], + area: ['720px', '400px'], + cancel: function () { + parent.location.reload(); + } + }); + }); + + /** + * 直播推流 + */ + $('.btn-live-push').on('click', function () { + var url = $(this).data('url'); + layer.open({ + type: 2, + title: '直播推流', + content: [url, 'no'], + area: ['640px', '420px'] + }); + }); + +}); \ No newline at end of file