diff --git a/app/Http/Web/Controllers/CourseController.php b/app/Http/Web/Controllers/CourseController.php index c10150fc..1376ff67 100644 --- a/app/Http/Web/Controllers/CourseController.php +++ b/app/Http/Web/Controllers/CourseController.php @@ -12,8 +12,8 @@ use App\Services\Frontend\Course\PackageList as CoursePackageListService; use App\Services\Frontend\Course\RecommendedList as CourseRecommendedListService; use App\Services\Frontend\Course\RelatedList as CourseRelatedListService; use App\Services\Frontend\Course\ReviewList as CourseReviewListService; +use App\Services\Frontend\Course\TeacherList as CourseTeacherListService; use App\Services\Frontend\Course\TopicList as CourseTopicListService; -use App\Services\Frontend\Course\UserList as CourseTeacherListService; use App\Services\Frontend\Reward\OptionList as RewardOptionList; use Phalcon\Mvc\View; @@ -28,9 +28,12 @@ class CourseController extends Controller */ public function listAction() { + $_REQUEST['limit'] = 12; + $service = new CourseListService(); $pager = $service->handle(); + $pager->items = kg_array_object($pager->items); $service = new CourseQueryService(); @@ -73,12 +76,12 @@ class CourseController extends Controller $service = new RewardOptionList(); - $rewards = $service->handle(); + $rewardOptions = $service->handle(); $this->view->setVar('course', $course); $this->view->setVar('chapters', $chapters); $this->view->setVar('teachers', $teachers); - $this->view->setVar('rewards', $rewards); + $this->view->setVar('reward_options', $rewardOptions); } /** diff --git a/app/Http/Web/Controllers/MyController.php b/app/Http/Web/Controllers/MyController.php index a681bfab..2331ef7b 100644 --- a/app/Http/Web/Controllers/MyController.php +++ b/app/Http/Web/Controllers/MyController.php @@ -8,6 +8,7 @@ use App\Services\Frontend\My\OrderList as MyOrderListService; use App\Services\Frontend\My\RefundList as MyRefundListService; use App\Services\Frontend\My\ReviewList as MyReviewListService; use App\Services\Frontend\My\UserInfo as UserInfoService; +use App\Services\Frontend\My\UserUpdate as UserUpdateService; /** * @RoutePrefix("/my") @@ -50,18 +51,6 @@ class MyController extends Controller $this->view->setVar('account', $account); } - /** - * @Post("/profile/update", name="web.my.update_profile") - */ - public function updateProfileAction() - { - $service = new UserInfoService(); - - $user = $service->handle(); - - $this->view->setVar('user', $user); - } - /** * @Get("/consults", name="web.my.consults") */ @@ -95,6 +84,8 @@ class MyController extends Controller $pager = $service->handle(); + $pager->items = kg_array_object($pager->items); + $this->view->setVar('pager', $pager); } @@ -110,4 +101,18 @@ class MyController extends Controller $this->view->setVar('pager', $pager); } + /** + * @Post("/profile/update", name="web.my.update_profile") + */ + public function updateProfileAction() + { + $service = new UserUpdateService(); + + $service->handle(); + + $content = ['msg' => '更新资料成功']; + + return $this->jsonSuccess($content); + } + } diff --git a/app/Http/Web/Controllers/VipController.php b/app/Http/Web/Controllers/VipController.php index c24a9ad4..5a67306e 100644 --- a/app/Http/Web/Controllers/VipController.php +++ b/app/Http/Web/Controllers/VipController.php @@ -20,9 +20,9 @@ class VipController extends Controller { $service = new VipOptionListService(); - $vipOptionList = $service->handle(); + $vipOptions = $service->handle(); - $this->view->setVar('vip_option_list', $vipOptionList); + $this->view->setVar('vip_options', $vipOptions); } /** diff --git a/app/Http/Web/Services/Index.php b/app/Http/Web/Services/Index.php index bb5f9511..4af8979f 100644 --- a/app/Http/Web/Services/Index.php +++ b/app/Http/Web/Services/Index.php @@ -62,21 +62,40 @@ class Index extends Service { $cache = new IndexNewCourseListCache(); - return $cache->get(); + $courses = $cache->get(); + + return $this->handleCategoryCourses($courses); } public function getFreeCourses() { $cache = new IndexFreeCourseListCache(); - return $cache->get(); + $courses = $cache->get(); + + return $this->handleCategoryCourses($courses); } public function getVipCourses() { $cache = new IndexVipCourseListCache(); - return $cache->get(); + $courses = $cache->get(); + + return $this->handleCategoryCourses($courses); + } + + protected function handleCategoryCourses($items, $limit = 8) + { + if (count($items) == 0) { + return []; + } + + foreach ($items as &$item) { + $item['courses'] = array_slice($item['courses'], 0, $limit); + } + + return $items; } } diff --git a/app/Http/Web/Views/course/list.volt b/app/Http/Web/Views/course/list.volt index 9700ebd6..44fc2b88 100644 --- a/app/Http/Web/Views/course/list.volt +++ b/app/Http/Web/Views/course/list.volt @@ -6,10 +6,14 @@ {{ partial('course/list_filter') }} {% if pager.total_pages > 0 %} -