From b6f9a08fee5d847830e851d9f1460868b36e2a7b Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Tue, 9 Jun 2020 19:07:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=88=91=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BB=A5=E5=8F=8A=E8=AF=BE=E7=A8=8B=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E7=AD=89=E5=88=86=E6=8E=92=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Web/Controllers/CourseController.php | 9 ++- app/Http/Web/Controllers/MyController.php | 29 ++++--- app/Http/Web/Controllers/VipController.php | 4 +- app/Http/Web/Services/Index.php | 25 +++++- app/Http/Web/Views/course/list.volt | 12 ++- app/Http/Web/Views/course/order.volt | 6 +- app/Http/Web/Views/course/show.volt | 16 ++-- app/Http/Web/Views/course/teachers.volt | 6 +- app/Http/Web/Views/index/index.volt | 10 ++- app/Http/Web/Views/my/orders.volt | 61 ++++++++++++++ app/Http/Web/Views/my/profile.volt | 2 +- app/Http/Web/Views/partials/macro_course.volt | 1 + app/Http/Web/Views/partials/macro_order.volt | 11 +++ app/Http/Web/Views/teacher/list.volt | 27 ++++--- app/Http/Web/Views/vip/courses.volt | 10 ++- app/Http/Web/Views/vip/index.volt | 28 ++++--- app/Http/Web/Views/vip/users.volt | 27 ++++--- app/Services/Frontend/My/UserUpdate.php | 51 ++++++++++++ public/static/web/css/common.css | 80 ++++++++++--------- 19 files changed, 303 insertions(+), 112 deletions(-) create mode 100644 app/Http/Web/Views/my/orders.volt create mode 100644 app/Http/Web/Views/partials/macro_order.volt create mode 100644 app/Services/Frontend/My/UserUpdate.php 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 %} -
- {% for item in pager.items %} - {{ course_card(item) }} - {% endfor %} +
+
+ {% for item in pager.items %} +
+ {{ course_card(item) }} +
+ {% endfor %} +
{{ partial('partials/pager') }} {% else %} diff --git a/app/Http/Web/Views/course/order.volt b/app/Http/Web/Views/course/order.volt index 14bac086..461b336d 100644 --- a/app/Http/Web/Views/course/order.volt +++ b/app/Http/Web/Views/course/order.volt @@ -15,10 +15,10 @@
赞赏支持
- {% for reward in rewards %} - {% set item_id = [course.id,reward.id]|join('-') %} + {% for option in reward_options %} + {% set item_id = [course.id,option.id]|join('-') %} {% set order_url = url({'for':'web.order.confirm'},{'item_id':item_id,'item_type':'reward'}) %} - {{ reward.title }} + {{ option.title }} {% endfor %}
diff --git a/app/Http/Web/Views/course/show.volt b/app/Http/Web/Views/course/show.volt index 5921b95a..5ec0e504 100644 --- a/app/Http/Web/Views/course/show.volt +++ b/app/Http/Web/Views/course/show.volt @@ -49,16 +49,16 @@ {{ partial('course/chapters') }}
{% if show_tab_packages == 1 %} - {% set package_url = url({'for':'web.course.packages','id':course.id}) %} -
+ {% set packages_url = url({'for':'web.course.packages','id':course.id}) %} +
{% endif %} {% if show_tab_consults == 1 %} - {% set consult_url = url({'for':'web.course.consults','id':course.id}) %} -
+ {% set consults_url = url({'for':'web.course.consults','id':course.id}) %} +
{% endif %} {% if show_tab_reviews == 1 %} - {% set review_url = url({'for':'web.course.reviews','id':course.id}) %} -
+ {% set reviews_url = url({'for':'web.course.reviews','id':course.id}) %} +
{% endif %} @@ -74,8 +74,8 @@ {{ partial('course/order') }} {{ partial('course/teachers') }} {% if show_sidebar_topics %} - {% set topic_url = url({'for':'web.course.topics','id':course.id}) %} - + {% set topics_url = url({'for':'web.course.topics','id':course.id}) %} + {% endif %} {% if show_sidebar_recommended %} {% set recommended_url = url({'for':'web.course.recommended','id':course.id}) %} diff --git a/app/Http/Web/Views/course/teachers.volt b/app/Http/Web/Views/course/teachers.volt index 731ec44c..a3aaa7b7 100644 --- a/app/Http/Web/Views/course/teachers.volt +++ b/app/Http/Web/Views/course/teachers.volt @@ -5,14 +5,14 @@ {% set teacher_url = url({'for':'web.user.show','id':teacher.id}) %}
- {{ teacher.about|e }} + {{ teacher.name }}
-
+
{{ teacher.name }}
{% set title = teacher.title ? teacher.title : '小小教书匠' %} -
{{ title }}
+
{{ title }}
{% endfor %} diff --git a/app/Http/Web/Views/index/index.volt b/app/Http/Web/Views/index/index.volt index b22e3cb8..985f432d 100644 --- a/app/Http/Web/Views/index/index.volt +++ b/app/Http/Web/Views/index/index.volt @@ -17,9 +17,13 @@ {% set class = loop.first ? 'layui-tab-item layui-show' : 'layui-tab-item' %}
- {% for course in category.courses %} - {{ course_card(course) }} - {% endfor %} +
+ {% for course in category.courses %} +
+ {{ course_card(course) }} +
+ {% endfor %} +
{% endfor %} diff --git a/app/Http/Web/Views/my/orders.volt b/app/Http/Web/Views/my/orders.volt new file mode 100644 index 00000000..a16a8b00 --- /dev/null +++ b/app/Http/Web/Views/my/orders.volt @@ -0,0 +1,61 @@ +{% extends 'templates/full.volt' %} + +{% block content %} + + {{ partial('partials/macro_order') }} + + {% set status_types = {'all':'全部订单','pending':'待支付','finished':'已完成','closed':'已关闭','refunded':'已退款'} %} + +
+ 首页 + 我的订单 +
+ +
+
+ {% set status = request.get('status','trim','all') %} + {% for key,val in status_types %} + {% set class = (status == key) ? 'layui-btn layui-btn-sm' : 'none' %} + {% set url = (key == 'all') ? url({'for':'web.my.orders'}) : url({'for':'web.my.orders'},{'status':key}) %} + {{ val }} + {% endfor %} +
+ {% if pager.total_pages > 0 %} + + + + + + + + + + + + + + + + + + {% for item in pager.items %} + + + + + + + + {% endfor %} + +
信息金额时间状态操作
+

名称：{{ item.subject }}

+

单号：{{ item.sn }}

+ 		￥{{ item.amount }}{{ date('Y-m-d H:i',item.create_time) }}{{ order_status(item.status) }} + 详情 +
+ {{ partial('partials/pager') }} + {% endif %} +
+ +{% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/my/profile.volt b/app/Http/Web/Views/my/profile.volt index 5774f822..0a51a565 100644 --- a/app/Http/Web/Views/my/profile.volt +++ b/app/Http/Web/Views/my/profile.volt @@ -11,7 +11,7 @@
- +
diff --git a/app/Http/Web/Views/partials/macro_course.volt b/app/Http/Web/Views/partials/macro_course.volt index 43983898..d565d69f 100644 --- a/app/Http/Web/Views/partials/macro_course.volt +++ b/app/Http/Web/Views/partials/macro_course.volt @@ -39,6 +39,7 @@ {% else %} 会员免费 {% endif %} + {{ level_info(course.level) }} {{ course.user_count }}人购买 {% elseif course.market_price > 0 %} ￥{{ course.market_price }} diff --git a/app/Http/Web/Views/partials/macro_order.volt b/app/Http/Web/Views/partials/macro_order.volt new file mode 100644 index 00000000..7f3b31e6 --- /dev/null +++ b/app/Http/Web/Views/partials/macro_order.volt @@ -0,0 +1,11 @@ +{%- macro order_status(value) %} + {% if value == 'pending' %} + 待支付 + {% elseif value == 'finished' %} + 已完成 + {% elseif value == 'closed' %} + 已关闭 + {% elseif value == 'refunded' %} + 已退款 + {% endif %} +{%- endmacro %} diff --git a/app/Http/Web/Views/teacher/list.volt b/app/Http/Web/Views/teacher/list.volt index 92770b82..afcefebe 100644 --- a/app/Http/Web/Views/teacher/list.volt +++ b/app/Http/Web/Views/teacher/list.volt @@ -9,17 +9,24 @@ {% if pager.total_pages > 0 %}
- {% for item in pager.items %} - {% set teacher_title = item.title ? item.title : '小小教书匠' %} - {% set teacher_url = url({'for':'web.teacher.show','id':item.id}) %} -
-
- {{ item.name }} +
+ {% for item in pager.items %} + {% set user_title = item.title ? item.title : '小小教书匠' %} + {% set user_about = item.about ? item.about|e : '这个人很懒，什么都没留下' %} + {% set user_url = url({'for':'web.teacher.show','id':item.id}) %} +
+
+
+ {{ item.name }} +
+
+ {{ item.name }} +
+
{{ user_title }}
+
-
{{ item.name }}
-
{{ teacher_title }}
-
- {% endfor %} + {% endfor %} +
{{ partial('partials/pager') }} {% endif %} diff --git a/app/Http/Web/Views/vip/courses.volt b/app/Http/Web/Views/vip/courses.volt index 4d0fc711..5bd3e409 100644 --- a/app/Http/Web/Views/vip/courses.volt +++ b/app/Http/Web/Views/vip/courses.volt @@ -2,9 +2,13 @@ {% if pager.total_pages > 0 %}
- {% for item in pager.items %} - {{ course_card(item) }} - {% endfor %} +
+ {% for item in pager.items %} +
+ {{ course_card(item) }} +
+ {% endfor %} +
{{ partial('partials/pager_ajax') }} {% endif %} \ No newline at end of file diff --git a/app/Http/Web/Views/vip/index.volt b/app/Http/Web/Views/vip/index.volt index 4ce36a98..6b3040fd 100644 --- a/app/Http/Web/Views/vip/index.volt +++ b/app/Http/Web/Views/vip/index.volt @@ -15,21 +15,25 @@
开通会员
-
- {% for option in vip_option_list %} - {% set order_url = url({'for':'web.order.confirm'},{'item_id':option.id,'item_type':'vip'}) %} -
-
{{ option.title }}
-
￥{{ option.price }}
-
立即开通
-
- {% endfor %} +
+
+ {% for option in vip_options %} + {% set order_url = url({'for':'web.order.confirm'},{'item_id':option.id,'item_type':'vip'}) %} +
+
+
{{ option.title }}
+
￥{{ option.price }}
+
立即开通
+
+
+ {% endfor %} +
- {% set courses_url = url({'for':'web.vip.courses'}) %} - {% set users_url = url({'for':'web.vip.users'}) %} + {% set courses_url = url({'for':'web.vip.courses'},{'limit':12}) %} + {% set users_url = url({'for':'web.vip.users'},{'limit':12}) %} -
+
  • 课程
    • diff --git a/app/Http/Web/Views/vip/users.volt b/app/Http/Web/Views/vip/users.volt index 46512a30..c40bac25 100644 --- a/app/Http/Web/Views/vip/users.volt +++ b/app/Http/Web/Views/vip/users.volt @@ -1,15 +1,24 @@ {% if pager.total_pages > 0 %}
    - {% for item in pager.items %} - {% set user_url = url({'for':'web.user.show','id':item.id}) %} -
    -
    - {{ item.name }} +
    + {% for item in pager.items %} + {% set user_about = item.about ? item.about|e : '这个人很懒，什么都没留下' %} + {% set user_url = url({'for':'web.user.show','id':item.id}) %} +
    +
    +
    + {{ item.name }} +
    +
    + {{ item.name }} +
    +
    + vip +
    +
    -
    {{ item.name }}
    -
    vip
    -
    - {% endfor %} + {% endfor %} +
    {{ partial('partials/pager_ajax') }} {% endif %} diff --git a/app/Services/Frontend/My/UserUpdate.php b/app/Services/Frontend/My/UserUpdate.php new file mode 100644 index 00000000..dfc24719 --- /dev/null +++ b/app/Services/Frontend/My/UserUpdate.php @@ -0,0 +1,51 @@ +request->getPost(); + + $user = $this->getLoginUser(); + + $validator = new UserValidator(); + + $data = []; + + if (!empty($post['name'])) { + $data['name'] = $validator->checkName($post['name']); + if ($data['name'] != $user->name) { + $validator->checkIfNameTaken($data['name']); + } + } + + if (!empty($post['gender'])) { + $data['gender'] = $validator->checkGender($post['gender']); + } + + if (!empty($post['about'])) { + $data['about'] = $validator->checkAbout($post['about']); + } + + $user->update($data); + + $this->rebuildUserCache($user->id); + + return $user; + } + + protected function rebuildUserCache($id) + { + $cache = new UserCache(); + + $cache->rebuild($id); + } + +} diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index 18e52e15..8c75adc3 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -101,6 +101,7 @@ } .pager { + margin-top: 25px; text-align: center; } @@ -142,6 +143,10 @@ border-bottom: 1px solid #f6f6f6; } +.index-course-list .course-card { + box-shadow: 0 1px 2px 1px rgba(0, 0, 0, 0.05); +} + .index-carousel { text-align: center; } @@ -242,20 +247,21 @@ .course-card { float: left; - width: 20%; - height: 200px; + width: 100%; + height: 230px; + background-color: #fff; + border-radius: 2px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05); } .course-card .cover { - width: 210px; - height: 118px; margin-bottom: 10px; overflow: hidden; } .course-card .cover img { - width: 100%; - height: 100%; + width: 270px; + height: 152px; transition: all 0.6s; } @@ -264,15 +270,14 @@ } .course-card .title { - width: 210px; - white-space: nowrap; + padding: 0 5px; margin-bottom: 10px; - overflow: hidden; } .course-card .meta { color: #666; font-size: 12px; + padding: 0 5px; } .course-card .meta span { @@ -686,21 +691,16 @@ .vip-option-card { float: left; - width: 262px; - height: 150px; - padding-top: 30px; - margin-right: 30px; + width: 100%; + height: 170px; background-color: #fff; border-radius: 2px; text-align: center; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05); } -.vip-option-card:last-child { - margin-right: 0; -} - .vip-option-card .title { + margin-top: 25px; margin-bottom: 15px; font-size: 18px; } @@ -989,31 +989,26 @@ color: #666; } -.teach-user-list .user-card { - width: 203px; - margin-bottom: 25px; +.teach-user-list { + margin-bottom: 30px; +} + +.vip-user-list { + margin-bottom: 30px; +} + +.user-card { + float: left; + width: 100%; + height: 220px; + text-align: center; background-color: #fff; border-radius: 2px; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05); } -.vip-user-list { - margin-bottom: 15px; -} - -.vip-user-list .user-card { - width: 195px; -} - -.user-card { - float: left; - height: 210px; - margin-right: 25px; - text-align: center; -} - .user-card .avatar { - margin-top: 20px; + margin-top: 25px; margin-bottom: 15px; } @@ -1094,4 +1089,17 @@ .security-item .action { float: right; +} + +.order-filter { + line-height: 40px; + margin-bottom: 20px; +} + +.order-filter a { + margin-right: 30px; +} + +.kg-table p { + line-height: 1.8em; } \ No newline at end of file