From ac51d239343b45ad3a7ff454487cc31c103c579f Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Mon, 20 Jul 2020 20:08:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Caches/TopicCourseList.php | 61 --------------- app/Caches/UserDailyCounter.php | 2 - app/Http/Admin/Controllers/Controller.php | 3 +- .../Admin/Controllers/SessionController.php | 4 +- app/Http/Api/Controllers/Controller.php | 3 +- app/Http/Html5/Controllers/Controller.php | 3 +- app/Http/Web/Controllers/Controller.php | 3 +- app/Http/Web/Controllers/LayerController.php | 3 +- app/Http/Web/Controllers/PublicController.php | 3 +- app/Http/Web/Services/Im.php | 3 +- app/Http/Web/Services/Order.php | 9 --- app/Http/Web/Views/chapter/breadcrumb.volt | 15 ++++ app/Http/Web/Views/chapter/live.volt | 2 + app/Http/Web/Views/chapter/read.volt | 2 + app/Http/Web/Views/chapter/vod.volt | 9 ++- app/Http/Web/Views/consult/add.volt | 2 +- app/Http/Web/Views/course/consults.volt | 2 +- app/Http/Web/Views/course/show.volt | 5 +- app/Http/Web/Views/course/show_meta.volt | 36 +++++---- app/Http/Web/Views/my/account.volt | 4 +- app/Library/Helper.php | 74 +++++++++---------- app/Providers/Volt.php | 12 +-- app/Repos/Consult.php | 14 ++++ app/Services/Frontend/Chapter/ChapterInfo.php | 50 +++++++------ ...{ChapterBasic.php => ChapterInfoBasic.php} | 2 +- app/Services/Frontend/Chapter/ChapterLike.php | 6 +- .../Frontend/Consult/ConsultCreate.php | 6 +- .../Frontend/Consult/ConsultDelete.php | 3 +- .../Frontend/Consult/ConsultUpdate.php | 3 +- .../{CourseBasic.php => CourseInfoBasic.php} | 2 +- app/Services/Frontend/Course/Favorite.php | 6 +- app/Services/Frontend/My/UserInfo.php | 2 - app/Services/Frontend/Review/ReviewDelete.php | 3 +- app/Services/Frontend/Review/ReviewUpdate.php | 3 +- app/Validators/Chapter.php | 16 ---- app/Validators/Consult.php | 28 ++++++- app/Validators/Course.php | 16 ---- config/errors.php | 7 +- public/static/web/css/common.css | 20 +++-- public/static/web/js/chapter.like.js | 5 +- public/static/web/js/chapter.vod.player.js | 16 +++- public/static/web/js/course.share.js | 26 +------ public/static/web/js/course.show.js | 10 ++- 43 files changed, 245 insertions(+), 259 deletions(-) delete mode 100644 app/Caches/TopicCourseList.php delete mode 100644 app/Http/Web/Services/Order.php create mode 100644 app/Http/Web/Views/chapter/breadcrumb.volt rename app/Services/Frontend/Chapter/{ChapterBasic.php => ChapterInfoBasic.php} (98%) rename app/Services/Frontend/Course/{CourseBasic.php => CourseInfoBasic.php} (96%) diff --git a/app/Caches/TopicCourseList.php b/app/Caches/TopicCourseList.php deleted file mode 100644 index 2b987bf9..00000000 --- a/app/Caches/TopicCourseList.php +++ /dev/null @@ -1,61 +0,0 @@ -lifetime; - } - - public function getKey($id = null) - { - return "topic_course_list:{$id}"; - } - - public function getContent($id = null) - { - $topicRepo = new TopicRepo(); - - $courses = $topicRepo->findCourses($id); - - if ($courses->count() == 0) { - return []; - } - - return $this->handleContent($courses); - } - - /** - * @param CourseModel[] $courses - * @return array - */ - public function handleContent($courses) - { - $result = []; - - foreach ($courses as $course) { - $result[] = [ - 'id' => $course->id, - 'title' => $course->title, - 'cover' => $course->cover, - 'market_price' => $course->market_price, - 'vip_price' => $course->vip_price, - 'model' => $course->model, - 'level' => $course->level, - 'user_count' => $course->user_count, - 'lesson_count' => $course->lesson_count, - ]; - } - - return $result; - } - -} diff --git a/app/Caches/UserDailyCounter.php b/app/Caches/UserDailyCounter.php index 3c2e207e..cbe76277 100644 --- a/app/Caches/UserDailyCounter.php +++ b/app/Caches/UserDailyCounter.php @@ -23,12 +23,10 @@ class UserDailyCounter extends Counter { return [ 'favorite_count' => 0, - 'comment_count' => 0, 'danmu_count' => 0, 'consult_count' => 0, 'order_count' => 0, 'chapter_like_count' => 0, - 'comment_like_count' => 0, 'consult_like_count' => 0, 'review_like_count' => 0, ]; diff --git a/app/Http/Admin/Controllers/Controller.php b/app/Http/Admin/Controllers/Controller.php index a1343a6b..4a940f6d 100644 --- a/app/Http/Admin/Controllers/Controller.php +++ b/app/Http/Admin/Controllers/Controller.php @@ -16,7 +16,8 @@ class Controller extends \Phalcon\Mvc\Controller */ protected $authUser; - use ResponseTrait, SecurityTrait; + use ResponseTrait; + use SecurityTrait; public function beforeExecuteRoute(Dispatcher $dispatcher) { diff --git a/app/Http/Admin/Controllers/SessionController.php b/app/Http/Admin/Controllers/SessionController.php index e3262173..89c85d9f 100644 --- a/app/Http/Admin/Controllers/SessionController.php +++ b/app/Http/Admin/Controllers/SessionController.php @@ -14,7 +14,9 @@ use App\Traits\Security as SecurityTrait; class SessionController extends \Phalcon\Mvc\Controller { - use AuthTrait, ResponseTrait, SecurityTrait; + use AuthTrait; + use ResponseTrait; + use SecurityTrait; /** * @Route("/login", name="admin.login") diff --git a/app/Http/Api/Controllers/Controller.php b/app/Http/Api/Controllers/Controller.php index 061831cc..24ae2d03 100644 --- a/app/Http/Api/Controllers/Controller.php +++ b/app/Http/Api/Controllers/Controller.php @@ -9,7 +9,8 @@ use Phalcon\Mvc\Dispatcher; class Controller extends \Phalcon\Mvc\Controller { - use ResponseTrait, SecurityTrait; + use ResponseTrait; + use SecurityTrait; public function beforeExecuteRoute(Dispatcher $dispatcher) { diff --git a/app/Http/Html5/Controllers/Controller.php b/app/Http/Html5/Controllers/Controller.php index 9314420f..29002ff6 100644 --- a/app/Http/Html5/Controllers/Controller.php +++ b/app/Http/Html5/Controllers/Controller.php @@ -9,7 +9,8 @@ use Phalcon\Mvc\Dispatcher; class Controller extends \Phalcon\Mvc\Controller { - use ResponseTrait, SecurityTrait; + use ResponseTrait; + use SecurityTrait; public function beforeExecuteRoute(Dispatcher $dispatcher) { diff --git a/app/Http/Web/Controllers/Controller.php b/app/Http/Web/Controllers/Controller.php index 273ad118..00b153bc 100644 --- a/app/Http/Web/Controllers/Controller.php +++ b/app/Http/Web/Controllers/Controller.php @@ -34,7 +34,8 @@ class Controller extends \Phalcon\Mvc\Controller */ protected $authUser; - use ResponseTrait, SecurityTrait; + use ResponseTrait; + use SecurityTrait; public function beforeExecuteRoute(Dispatcher $dispatcher) { diff --git a/app/Http/Web/Controllers/LayerController.php b/app/Http/Web/Controllers/LayerController.php index e0568fd9..00a391e1 100644 --- a/app/Http/Web/Controllers/LayerController.php +++ b/app/Http/Web/Controllers/LayerController.php @@ -16,7 +16,8 @@ class LayerController extends \Phalcon\Mvc\Controller */ protected $authUser; - use ResponseTrait, SecurityTrait; + use ResponseTrait; + use SecurityTrait; public function beforeExecuteRoute(Dispatcher $dispatcher) { diff --git a/app/Http/Web/Controllers/PublicController.php b/app/Http/Web/Controllers/PublicController.php index c0622d16..c208141e 100644 --- a/app/Http/Web/Controllers/PublicController.php +++ b/app/Http/Web/Controllers/PublicController.php @@ -14,7 +14,8 @@ use PHPQRCode\QRcode as PHPQRCode; class PublicController extends \Phalcon\Mvc\Controller { - use ResponseTrait, SecurityTrait; + use ResponseTrait; + use SecurityTrait; /** * @Get("/content/img/{id:[0-9]+}", name="web.content_img") diff --git a/app/Http/Web/Services/Im.php b/app/Http/Web/Services/Im.php index 0ef21dae..a129ea2c 100644 --- a/app/Http/Web/Services/Im.php +++ b/app/Http/Web/Services/Im.php @@ -31,7 +31,8 @@ use GatewayClient\Gateway; class Im extends Service { - use ImFriendTrait, ImGroupTrait; + use ImFriendTrait; + use ImGroupTrait; public function init() { diff --git a/app/Http/Web/Services/Order.php b/app/Http/Web/Services/Order.php deleted file mode 100644 index bbaf6c89..00000000 --- a/app/Http/Web/Services/Order.php +++ /dev/null @@ -1,9 +0,0 @@ - + + 返回课程 + {{ chapter.course.title }} + {{ chapter.title }} + + + {{ chapter.user_count }} + + {{ chapter.consult_count }} + + + + + \ No newline at end of file diff --git a/app/Http/Web/Views/chapter/live.volt b/app/Http/Web/Views/chapter/live.volt index a40ee419..c514481f 100644 --- a/app/Http/Web/Views/chapter/live.volt +++ b/app/Http/Web/Views/chapter/live.volt @@ -3,6 +3,7 @@ {% block content %} {% 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 live_chats_url = url({'for':'web.live.chats','id':chapter.id}) %} {% set live_stats_url = url({'for':'web.live.stats','id':chapter.id}) %} @@ -13,6 +14,7 @@
+ 返回课程 {{ chapter.course.title }} {{ chapter.title }} diff --git a/app/Http/Web/Views/chapter/read.volt b/app/Http/Web/Views/chapter/read.volt index 207882dd..0e193ba8 100644 --- a/app/Http/Web/Views/chapter/read.volt +++ b/app/Http/Web/Views/chapter/read.volt @@ -3,12 +3,14 @@ {% block content %} {% 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 like_url = url({'for':'web.chapter.like','id':chapter.id}) %} {% set qrcode_url = url({'for':'web.qrcode_img'},{'text':chapter_full_url}) %}
+ 返回课程 {{ chapter.course.title }} {{ chapter.title }} diff --git a/app/Http/Web/Views/chapter/vod.volt b/app/Http/Web/Views/chapter/vod.volt index 146b0e63..72dac8c1 100644 --- a/app/Http/Web/Views/chapter/vod.volt +++ b/app/Http/Web/Views/chapter/vod.volt @@ -3,21 +3,24 @@ {% block content %} {% 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_img'},{'text':chapter_full_url}) %} {% set consult_url = url({'for':'web.consult.add'},{'chapter_id':chapter.id}) %} + {% set liked_class = chapter.me.liked ? 'active' : '' %}
+ 返回课程 {{ chapter.course.title }} {{ chapter.title }}