From f2e862e9aed284d57d6f03a39c148653dbf9bbb3 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Wed, 8 Jul 2020 20:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9B=BE=E6=96=87=E9=83=A8?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Web/Controllers/PageController.php | 2 +- app/Http/Web/Views/chapter/show_live.volt | 4 +- app/Http/Web/Views/chapter/show_read.volt | 35 +++++ app/Http/Web/Views/chapter/show_vod.volt | 4 +- app/Http/Web/Views/help/index.volt | 19 ++- app/Http/Web/Views/help/show.volt | 14 ++ app/Http/Web/Views/page/show.volt | 11 +- app/Http/Web/Views/topic/show.volt | 6 +- app/Models/ChapterRead.php | 7 + app/Repos/Help.php | 42 +----- public/static/web/css/common.css | 139 ++++++-------------- public/static/web/js/live.player.js | 2 +- public/static/web/js/read.js | 51 +++++++ public/static/web/js/vod.player.js | 4 +- 14 files changed, 180 insertions(+), 160 deletions(-) create mode 100644 app/Http/Web/Views/help/show.volt create mode 100644 public/static/web/js/read.js diff --git a/app/Http/Web/Controllers/PageController.php b/app/Http/Web/Controllers/PageController.php index 57070d65..09289115 100644 --- a/app/Http/Web/Controllers/PageController.php +++ b/app/Http/Web/Controllers/PageController.php @@ -2,7 +2,7 @@ namespace App\Http\Web\Controllers; -use App\Services\Frontend\Page\HelpInfo as PageInfoService; +use App\Services\Frontend\Page\PageInfo as PageInfoService; /** * @RoutePrefix("/page") diff --git a/app/Http/Web/Views/chapter/show_live.volt b/app/Http/Web/Views/chapter/show_live.volt index 116e214a..0a5a42f2 100644 --- a/app/Http/Web/Views/chapter/show_live.volt +++ b/app/Http/Web/Views/chapter/show_live.volt @@ -17,9 +17,7 @@
-
-
-
+
diff --git a/app/Http/Web/Views/chapter/show_read.volt b/app/Http/Web/Views/chapter/show_read.volt index e69de29b..44f3c39a 100644 --- a/app/Http/Web/Views/chapter/show_read.volt +++ b/app/Http/Web/Views/chapter/show_read.volt @@ -0,0 +1,35 @@ +{% extends 'templates/full.volt' %} + +{% block content %} + + {% set learning_url = url({'for':'web.chapter.learning','id':chapter.id}) %} + +
+ + {{ chapter.course.title }} + {{ chapter.title }} + +
+ +
+
+
{{ chapter.content }}
+
+
+ {{ partial('chapter/menu') }} +
+
+ +
+ + + +
+ +{% endblock %} + +{% block include_js %} + + {{ js_include('web/js/read.js') }} + +{% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/chapter/show_vod.volt b/app/Http/Web/Views/chapter/show_vod.volt index 63e4b31f..dd111449 100644 --- a/app/Http/Web/Views/chapter/show_vod.volt +++ b/app/Http/Web/Views/chapter/show_vod.volt @@ -2,7 +2,6 @@ {% block content %} - {% set course_url = url({'for':'web.course.show','id':chapter.course.id}) %} {% set learning_url = url({'for':'web.chapter.learning','id':chapter.id}) %}
@@ -14,8 +13,7 @@
-
-
+
{{ partial('chapter/menu') }} diff --git a/app/Http/Web/Views/help/index.volt b/app/Http/Web/Views/help/index.volt index eec8c6c6..e6d3ecbd 100644 --- a/app/Http/Web/Views/help/index.volt +++ b/app/Http/Web/Views/help/index.volt @@ -2,13 +2,20 @@ {% block content %} -
- {% for help in helps %} -
-

{{ help.title }}

-
{{ help.content }}
+
+
+ 帮助中心 +
+
+ {% for help in helps %} +
+

{{ help.title }}

+
{{ help.content }}
+
+ {% endfor %} +
- {% endfor %} +
{% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/help/show.volt b/app/Http/Web/Views/help/show.volt new file mode 100644 index 00000000..3f6ef447 --- /dev/null +++ b/app/Http/Web/Views/help/show.volt @@ -0,0 +1,14 @@ +{% extends 'templates/full.volt' %} + +{% block content %} + +
+
+ {{ help.title }} +
+ {{ help.content }} +
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/page/show.volt b/app/Http/Web/Views/page/show.volt index cbee24d8..7bcb99f0 100644 --- a/app/Http/Web/Views/page/show.volt +++ b/app/Http/Web/Views/page/show.volt @@ -2,8 +2,13 @@ {% block content %} -

{{ page.title }}

- -
{{ page.content }}
+
+
+ {{ page.title }} +
+ {{ page.content }} +
+
+
{% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/topic/show.volt b/app/Http/Web/Views/topic/show.volt index 11c2f8e6..0e0eb7af 100644 --- a/app/Http/Web/Views/topic/show.volt +++ b/app/Http/Web/Views/topic/show.volt @@ -4,8 +4,10 @@ {% set courses_url = url({'for':'web.topic.courses','id':topic.id}) %} -
-

{{ topic.title }}

+
+
+ {{ topic.title }} +
diff --git a/app/Models/ChapterRead.php b/app/Models/ChapterRead.php index ec3a6d7c..5d4e13c9 100644 --- a/app/Models/ChapterRead.php +++ b/app/Models/ChapterRead.php @@ -68,6 +68,13 @@ class ChapterRead extends Model public function beforeCreate() { $this->create_time = time(); + + /** + * text类型不能填充默认值 + */ + if (empty($this->content)) { + $this->content = ''; + } } public function beforeUpdate() diff --git a/app/Repos/Help.php b/app/Repos/Help.php index 30f95968..12218481 100644 --- a/app/Repos/Help.php +++ b/app/Repos/Help.php @@ -2,7 +2,6 @@ namespace App\Repos; -use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder; use App\Models\Help as HelpModel; use Phalcon\Mvc\Model; use Phalcon\Mvc\Model\Resultset; @@ -11,43 +10,6 @@ use Phalcon\Mvc\Model\ResultsetInterface; class Help extends Repository { - public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15) - { - $builder = $this->modelsManager->createBuilder(); - - $builder->from(HelpModel::class); - - $builder->where('1 = 1'); - - if (!empty($where['title'])) { - $builder->andWhere('title LIKE :title:', ['title' => "%{$where['title']}%"]); - } - - if (isset($where['published'])) { - $builder->andWhere('published = :published:', ['published' => $where['published']]); - } - - if (isset($where['deleted'])) { - $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]); - } - - switch ($sort) { - default: - $orderBy = 'id DESC'; - break; - } - - $builder->orderBy($orderBy); - - $pager = new PagerQueryBuilder([ - 'builder' => $builder, - 'page' => $page, - 'limit' => $limit, - ]); - - return $pager->paginate(); - } - /** * @param int $id * @return HelpModel|Model|bool @@ -80,6 +42,10 @@ class Help extends Repository $query->where('1 = 1'); + if (!empty($where['title'])) { + $query->andWhere('title LIKE :title:', ['title' => "%{$where['title']}%"]); + } + if (isset($where['published'])) { $query->andWhere('published = :published:', ['published' => $where['published']]); } diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index 847c7c16..84b76b3c 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -4,22 +4,6 @@ display: none; } -.sidebar-chapter-list::-webkit-scrollbar { - background-color: #fff; - width: 5px; - height: 15px; -} - -.sidebar-chapter-list::-webkit-scrollbar-thumb { - border-radius: 5px; - background: #393D49; -} - -.sidebar-chapter-list::-webkit-scrollbar-track { - border: 0; - background-color: #fff; -} - .full { background-color: #f2f2f2; } @@ -79,10 +63,6 @@ width: 320px; } -.layui-badge, .layui-badge-rim { - padding-bottom: 1px; -} - .layui-fixbar { bottom: 60px; } @@ -98,7 +78,7 @@ #main { margin-top: 80px; - margin-bottom: 40px; + margin-bottom: 30px; min-height: 550px; } @@ -284,32 +264,37 @@ margin-bottom: 5px; } -.page-title { - padding-bottom: 10px; - margin-bottom: 20px; - border-bottom: 1px solid #d3d3d3; - text-align: center; - color: #666; +.page-info { + padding: 20px 50px; + min-height: 500px; } -.page-content { - min-height: 450px; - color: #666; +.page-info .page-content { +} + +.page-info .help-content { + min-height: 50px; +} + +.page-info .layui-field-title legend { + margin: 0 10px 10px 0; + padding: 0 10px; + text-align: center; } .topic-info { - margin-bottom: 20px; + padding-top: 10px; + margin-bottom: 40px; } -.topic-info .title { +.topic-info .layui-field-title { + border-color: #d2d2d2; +} + +.topic-info .layui-field-title legend { text-align: center; } -.topic-info .summary { - padding: 15px 0; - color: #666; -} - .course-list { margin-bottom: 20px; } @@ -750,8 +735,17 @@ margin-right: 10px; } +.sidebar-chapter-list::-webkit-scrollbar { + width: 5px; +} + +.sidebar-chapter-list::-webkit-scrollbar-thumb { + border-radius: 10px; + background: rgba(0, 0, 0, 0.1); +} + .sidebar-chapter-list { - max-height: 500px; + height: 405px; overflow-y: auto; } @@ -779,7 +773,12 @@ color: gray; } -.live-player { +.read-info { + min-height: 428px; + margin-bottom: 0; +} + +.player { width: 760px; height: 428px; } @@ -857,68 +856,6 @@ margin-right: 10px; } -.chapter-bg { - background-color: #f2f2f2; -} - -.chapter-main { - top: 0; - left: 0; - right: 0; - bottom: 0; - position: absolute; -} - -.chapter-main .header { - height: 50px; - line-height: 50px; - color: rgba(255, 255, 255, 0.7); - background-color: #393D49; -} - -.chapter-main .header a { - color: rgba(255, 255, 255, 0.7); -} - -.chapter-main .header .back { - float: left; - margin-left: 5px; -} - -.chapter-main .header .stats { - float: left; - margin-left: 50px; - margin-right: 150px; -} - -.chapter-main .header .action { - float: right; - margin-right: 150px; -} - -.chapter-main .content { -} - -.chapter-sidebar { - top: 0; - right: 0; - bottom: 0; - width: 0; - position: absolute; - background-color: white; -} - -.chapter-sidebar-btn { - top: 15px; - right: 15px; - position: absolute; - cursor: pointer; -} - -.chapter-sidebar-btn .switch-icon { - color: rgba(255, 255, 255, 0.7); -} - .vip-header { font-size: 18px; text-align: center; diff --git a/public/static/web/js/live.player.js b/public/static/web/js/live.player.js index 6a73eba6..29ae0ed4 100644 --- a/public/static/web/js/live.player.js +++ b/public/static/web/js/live.player.js @@ -4,7 +4,7 @@ layui.use(['jquery', 'helper'], function () { var helper = layui.helper; var interval = null; - var intervalTime = 5000; + var intervalTime = 15000; var position = 0; var userId = window.koogua.user.id; var chapterId = $('input[name="chapter.id"]').val(); diff --git a/public/static/web/js/read.js b/public/static/web/js/read.js new file mode 100644 index 00000000..a7934a95 --- /dev/null +++ b/public/static/web/js/read.js @@ -0,0 +1,51 @@ +layui.use(['jquery', 'helper'], function () { + + var $ = layui.jquery; + var helper = layui.helper; + + var interval = null; + var intervalTime = 15000; + var userId = window.koogua.user.id; + var chapterId = $('input[name="chapter.id"]').val(); + var planId = $('input[name="chapter.plan_id"]').val(); + var learningUrl = $('input[name="chapter.learning_url"]').val(); + var requestId = helper.getRequestId(); + + if (userId !== '0' && planId !== '0') { + start(); + document.addEventListener('visibilitychange', function () { + if (document.visibilityState === 'hidden') { + stop(); + } else if (document.visibilityState === 'visible') { + start(); + } + }); + } + + function start() { + if (interval != null) { + clearInterval(interval); + interval = null; + } + interval = setInterval(learning, intervalTime); + } + + function stop() { + clearInterval(interval); + interval = null; + } + + function learning() { + $.ajax({ + type: 'POST', + url: learningUrl, + data: { + request_id: requestId, + chapter_id: chapterId, + plan_id: planId, + interval: intervalTime, + } + }); + } + +}); \ No newline at end of file diff --git a/public/static/web/js/vod.player.js b/public/static/web/js/vod.player.js index f37afbfa..a5b33c3a 100644 --- a/public/static/web/js/vod.player.js +++ b/public/static/web/js/vod.player.js @@ -4,7 +4,7 @@ layui.use(['jquery', 'helper'], function () { var helper = layui.helper; var interval = null; - var intervalTime = 5000; + var intervalTime = 15000; var position = 0; var userId = window.koogua.user.id; var chapterId = $('input[name="chapter.id"]').val(); @@ -16,7 +16,7 @@ layui.use(['jquery', 'helper'], function () { var options = { autoplay: false, width: 760, - height: 450 + height: 428 }; if (playUrls.od) {