From 014941db55c4b2a04e766e97d3c3220834dad8a9 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Mon, 4 Jan 2021 19:49:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=A1=B5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=AF=BE=E7=A8=8B=E5=92=A8=E8=AF=A2=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E8=BF=87=E6=9C=9F=E7=9B=B4=E6=92=AD=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=B4=AD=E4=B9=B0=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=92=A8=E8=AF=A2=E8=AF=A6=E6=83=85=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Home/Views/consult/add.volt | 1 + app/Http/Home/Views/consult/show.volt | 10 +++++----- app/Http/Home/Views/course/show.volt | 6 +++++- app/Http/Home/Views/course/show_order.volt | 10 +++++++--- public/static/home/css/common.css | 2 -- public/static/home/js/course.show.js | 15 +++++++++++++++ 6 files changed, 33 insertions(+), 11 deletions(-) diff --git a/app/Http/Home/Views/consult/add.volt b/app/Http/Home/Views/consult/add.volt index 17b792ee..6e1f5706 100644 --- a/app/Http/Home/Views/consult/add.volt +++ b/app/Http/Home/Views/consult/add.volt @@ -21,6 +21,7 @@ + diff --git a/app/Http/Home/Views/consult/show.volt b/app/Http/Home/Views/consult/show.volt index 76a730b9..b9b6d0d5 100644 --- a/app/Http/Home/Views/consult/show.volt +++ b/app/Http/Home/Views/consult/show.volt @@ -4,24 +4,24 @@ {% set consult.answer = consult.answer ? consult.answer : '请耐心等待回复吧' %} -
+
{% if consult.course.id is defined %} -
+
课程：
{{ consult.course.title }}
{% endif %} {% if consult.chapter.id is defined %} -
+
章节：
{{ consult.chapter.title }}
{% endif %} -
+
咨询：
{{ consult.question }}
-
+
回复：
{{ consult.answer }}
diff --git a/app/Http/Home/Views/course/show.volt b/app/Http/Home/Views/course/show.volt index 6f24937c..c229a53b 100644 --- a/app/Http/Home/Views/course/show.volt +++ b/app/Http/Home/Views/course/show.volt @@ -4,10 +4,11 @@ {{ partial('macros/course') }} - {% set favorite_title = course.me.favorited ? '取消收藏' : '收藏' %} + {% set favorite_title = course.me.favorited ? '取消收藏' : '收藏课程' %} {% set favorite_star = course.me.favorited ? 'layui-icon-star-fill' : 'layui-icon-star' %} {% set full_course_url = full_url({'for':'home.course.show','id':course.id}) %} {% set favorite_url = url({'for':'home.course.favorite','id':course.id}) %} + {% set consult_url = url({'for':'home.consult.add'},{'course_id':course.id}) %} {% set qrcode_url = url({'for':'home.qrcode'},{'text':full_course_url}) %}
@@ -18,6 +19,9 @@
+
+
+ +
+ +
+
+
+
+ +
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+
@@ -120,10 +146,11 @@ diff --git a/app/Http/Home/Controllers/ErrorController.php b/app/Http/Home/Controllers/ErrorController.php index a0155342..dfa6f7e1 100644 --- a/app/Http/Home/Controllers/ErrorController.php +++ b/app/Http/Home/Controllers/ErrorController.php @@ -2,6 +2,8 @@ namespace App\Http\Home\Controllers; +use App\Models\User as UserModel; +use App\Services\Auth\Home as HomeAuth; use App\Services\Service as AppService; use App\Traits\Response as ResponseTrait; @@ -11,8 +13,27 @@ use App\Traits\Response as ResponseTrait; class ErrorController extends \Phalcon\Mvc\Controller { + /** + * @var array + */ + protected $siteInfo; + + /** + * @var UserModel + */ + protected $authUser; + use ResponseTrait; + public function initialize() + { + $this->siteInfo = $this->getSiteInfo(); + $this->authUser = $this->getAuthUser(); + + $this->view->setVar('site_info', $this->siteInfo); + $this->view->setVar('auth_user', $this->authUser); + } + /** * @Get("/400", name="home.error.400") */ @@ -82,4 +103,21 @@ class ErrorController extends \Phalcon\Mvc\Controller $this->view->setVar('message', $siteInfo['closed_tips']); } + protected function getSiteInfo() + { + $appService = new AppService(); + + return $appService->getSettings('site'); + } + + protected function getAuthUser() + { + /** + * @var HomeAuth $auth + */ + $auth = $this->getDI()->get('auth'); + + return $auth->getCurrentUser(); + } + } diff --git a/app/Http/Home/Controllers/LayerController.php b/app/Http/Home/Controllers/LayerController.php index 2d15d84b..7a57aacf 100644 --- a/app/Http/Home/Controllers/LayerController.php +++ b/app/Http/Home/Controllers/LayerController.php @@ -4,6 +4,7 @@ namespace App\Http\Home\Controllers; use App\Models\User as UserModel; use App\Services\Auth\Home as HomeAuth; +use App\Services\Service as AppService; use App\Traits\Response as ResponseTrait; use App\Traits\Security as SecurityTrait; use Phalcon\Mvc\Dispatcher; @@ -11,6 +12,11 @@ use Phalcon\Mvc\Dispatcher; class LayerController extends \Phalcon\Mvc\Controller { + /** + * @var array + */ + protected $siteInfo; + /** * @var UserModel */ @@ -33,11 +39,20 @@ class LayerController extends \Phalcon\Mvc\Controller public function initialize() { + $this->siteInfo = $this->getSiteInfo(); $this->authUser = $this->getAuthUser(); + $this->view->setVar('site_info', $this->siteInfo); $this->view->setVar('auth_user', $this->authUser); } + protected function getSiteInfo() + { + $appService = new AppService(); + + return $appService->getSettings('site'); + } + protected function getAuthUser() { /** diff --git a/app/Http/Home/Views/partials/header.volt b/app/Http/Home/Views/partials/header.volt index fbb2232b..8300003c 100644 --- a/app/Http/Home/Views/partials/header.volt +++ b/app/Http/Home/Views/partials/header.volt @@ -1,4 +1,10 @@ - +