From ea8f2732fd3c7c0e3144947255ec22ad5ad63c74 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Sat, 30 May 2020 19:51:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E5=89=8D=E7=AB=AF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Web/Controllers/CourseController.php | 98 ++++++------------- app/Http/Web/Controllers/OrderController.php | 4 +- app/Http/Web/Views/course/chapters.volt | 65 ++++++++++++ app/Http/Web/Views/course/chapters_live.volt | 33 ------- app/Http/Web/Views/course/chapters_read.volt | 31 ------ app/Http/Web/Views/course/chapters_vod.volt | 32 ------ app/Http/Web/Views/course/meta.volt | 49 +++++++--- app/Http/Web/Views/course/order.volt | 26 +++++ app/Http/Web/Views/course/packages.volt | 2 +- ...ebar_recommended.volt => recommended.volt} | 6 +- .../{sidebar_related.volt => related.volt} | 4 +- app/Http/Web/Views/course/reviews.volt | 7 +- app/Http/Web/Views/course/show.volt | 94 ++++++++++-------- .../{sidebar_teachers.volt => teachers.volt} | 10 +- .../{sidebar_topics.volt => topics.volt} | 0 app/Http/Web/Views/order/confirm.volt | 54 ++++++++++ app/Services/Frontend/Course/CourseInfo.php | 6 +- app/Services/Frontend/Reward/OptionList.php | 34 +++++++ app/Traits/Auth.php | 4 + public/static/web/css/common.css | 82 ++++++++++++++-- public/static/web/js/common.js | 11 ++- storage/cache/annotations/.gitignore | 2 - 22 files changed, 408 insertions(+), 246 deletions(-) create mode 100644 app/Http/Web/Views/course/chapters.volt delete mode 100644 app/Http/Web/Views/course/chapters_live.volt delete mode 100644 app/Http/Web/Views/course/chapters_read.volt delete mode 100644 app/Http/Web/Views/course/chapters_vod.volt create mode 100644 app/Http/Web/Views/course/order.volt rename app/Http/Web/Views/course/{sidebar_recommended.volt => recommended.volt} (60%) rename app/Http/Web/Views/course/{sidebar_related.volt => related.volt} (69%) rename app/Http/Web/Views/course/{sidebar_teachers.volt => teachers.volt} (52%) rename app/Http/Web/Views/course/{sidebar_topics.volt => topics.volt} (100%) create mode 100644 app/Http/Web/Views/order/confirm.volt create mode 100644 app/Services/Frontend/Reward/OptionList.php delete mode 100644 storage/cache/annotations/.gitignore diff --git a/app/Http/Web/Controllers/CourseController.php b/app/Http/Web/Controllers/CourseController.php index a49a8e00..bc35e100 100644 --- a/app/Http/Web/Controllers/CourseController.php +++ b/app/Http/Web/Controllers/CourseController.php @@ -14,6 +14,7 @@ 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\Reward\OptionList as RewardOptionList; use Phalcon\Mvc\View; /** @@ -61,66 +62,24 @@ class CourseController extends Controller $service = new CourseQueryService(); - $categoryPaths = $service->handleCategoryPaths($course['category_id']); + $course['category_paths'] = $service->handleCategoryPaths($course['category_id']); $service = new CourseChapterListService(); $chapters = $service->handle($id); - $service = new CoursePackageListService(); - - $packages = $service->handle($id); - - $service = new CourseReviewListService(); - - $reviews = $service->handle($id); - - $reviews->items = kg_array_object($reviews->items); - - $service = new CourseConsultListService(); - - $consults = $service->handle($id); - - $consults->items = kg_array_object($consults->items); - $service = new CourseTeacherListService(); $teachers = $service->handle($id); - $service = new CourseTopicListService(); + $service = new RewardOptionList(); - $topics = $service->handle($id); - - $service = new CourseRecommendedListService(); - - $recommendedCourses = $service->handle($id); - - $service = new CourseRelatedListService(); - - $relatedCourses = $service->handle($id); + $rewardOptions = $service->handle(); $this->view->setVar('course', $course); $this->view->setVar('chapters', $chapters); - $this->view->setVar('packages', $packages); - $this->view->setVar('consults', $consults); - $this->view->setVar('reviews', $reviews); $this->view->setVar('teachers', $teachers); - $this->view->setVar('topics', $topics); - $this->view->setVar('recommended_courses', $recommendedCourses); - $this->view->setVar('related_courses', $relatedCourses); - $this->view->setVar('category_paths', $categoryPaths); - } - - /** - * @Get("/{id:[0-9]+}/chapters", name="web.course.chapters") - */ - public function chaptersAction($id) - { - $service = new CourseChapterListService(); - - $chapters = $service->handle($id); - - return $this->jsonSuccess(['chapters' => $chapters]); + $this->view->setVar('reward_options', $rewardOptions); } /** @@ -132,22 +91,23 @@ class CourseController extends Controller $packages = $service->handle($id); - return $this->jsonSuccess(['packages' => $packages]); + $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->setVar('packages', $packages); } - /** * @Get("/{id:[0-9]+}/consults", name="web.course.consults") */ public function consultsAction($id) { + $target = $this->request->get('target', 'trim', 'tab-consults'); + $service = new CourseConsultListService(); $pager = $service->handle($id); - $pager->target = $this->request->get('target', 'trim', 'tab-consults'); - $pager->items = kg_array_object($pager->items); + $pager->target = $target; $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); $this->view->setVar('pager', $pager); @@ -158,30 +118,19 @@ class CourseController extends Controller */ public function reviewsAction($id) { + $target = $this->request->get('target', 'trim', 'tab-reviews'); + $service = new CourseReviewListService(); $pager = $service->handle($id); - $pager->target = $this->request->get('target', 'trim', 'tab-reviews'); - $pager->items = kg_array_object($pager->items); + $pager->target = $target; $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); $this->view->setVar('pager', $pager); } - /** - * @Get("/{id:[0-9]+}/teachers", name="web.course.teachers") - */ - public function teachersAction($id) - { - $service = new CourseTeacherListService(); - - $teachers = $service->handle($id); - - return $this->jsonSuccess(['teachers' => $teachers]); - } - /** * @Get("/{id:[0-9]+}/recommended", name="web.course.recommended") */ @@ -191,7 +140,8 @@ class CourseController extends Controller $courses = $service->handle($id); - return $this->jsonSuccess(['courses' => $courses]); + $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->setVar('courses', $courses); } /** @@ -203,7 +153,8 @@ class CourseController extends Controller $courses = $service->handle($id); - return $this->jsonSuccess(['courses' => $courses]); + $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->setVar('courses', $courses); } /** @@ -215,7 +166,20 @@ class CourseController extends Controller $topics = $service->handle($id); - return $this->jsonSuccess(['topics' => $topics]); + $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->setVar('topics', $topics); + } + + /** + * @Get("/{id:[0-9]+}/reward", name="web.course.reward") + */ + public function rewardAction($id) + { + $service = new RewardOptionList(); + + $options = $service->handle(); + + $this->view->setVar('options', $options); } /** diff --git a/app/Http/Web/Controllers/OrderController.php b/app/Http/Web/Controllers/OrderController.php index 0549c921..0cc2d93f 100644 --- a/app/Http/Web/Controllers/OrderController.php +++ b/app/Http/Web/Controllers/OrderController.php @@ -23,9 +23,9 @@ class OrderController extends Controller $service = new OrderConfirmService(); - $info = $service->handle($itemId, $itemType); + $confirm = $service->handle($itemId, $itemType); - $this->view->setVar('info', $info); + $this->view->setVar('confirm', $confirm); } /** diff --git a/app/Http/Web/Views/course/chapters.volt b/app/Http/Web/Views/course/chapters.volt new file mode 100644 index 00000000..b2543859 --- /dev/null +++ b/app/Http/Web/Views/course/chapters.volt @@ -0,0 +1,65 @@ +{%- macro vod_lesson_info(lesson) %} + {% set url = lesson.me.owned ? url({'for':'web.chapter.show','id':lesson.id}) : 'javascript:' %} + + + {{ lesson.title }} + {% if lesson.free == 1 %} + 免费 + {% endif %} + {% if lesson.me.duration > 0 %} + + {% endif %} + {{ lesson.attrs.duration|total_duration }} + +{%- endmacro %} + +{%- macro live_lesson_info(lesson) %} + {% set url = lesson.me.owned ? url({'for':'web.chapter.show','id':lesson.id}) : 'javascript:' %} + {% set over_flag = lesson.attrs.end_time < time() ? '已结束' : '' %} + + + {{ lesson.title }} + {% if lesson.free == 1 %} + 免费 + {% endif %} + {% if lesson.me.duration > 0 %} + + {% endif %} + {{ date('m月d日',lesson.attrs.start_time) }} {{ date('H:i',lesson.attrs.start_time) }}~{{ date('H:i',lesson.attrs.end_time) }} {{ over_flag }} + +{%- endmacro %} + +{%- macro read_lesson_info(lesson) %} + {% set url = lesson.me.owned ? url({'for':'web.chapter.show','id':lesson.id}) : 'javascript:' %} + + + {{ lesson.title|e }} + {% if lesson.free == 1 %} + 免费 + {% endif %} + {% if lesson.me.duration > 0 %} + + {% endif %} + +{%- endmacro %} + +
+ {% for chapter in chapters %} +
+

{{ chapter.title }}

+
+
    + {% for lesson in chapter.children %} + {% if course.model == 'vod' %} +
  • {{ vod_lesson_info(lesson) }}
    • + {% elseif course.model == 'live' %} +
  • {{ live_lesson_info(lesson) }}
    • + {% elseif course.model == 'read' %} +
  • {{ read_lesson_info(lesson) }}
    • + {% endif %} + {% endfor %} +
+
+
+ {% endfor %} +
\ No newline at end of file diff --git a/app/Http/Web/Views/course/chapters_live.volt b/app/Http/Web/Views/course/chapters_live.volt deleted file mode 100644 index b6e619c5..00000000 --- a/app/Http/Web/Views/course/chapters_live.volt +++ /dev/null @@ -1,33 +0,0 @@ -{%- macro live_lesson_info(lesson) %} - - {% set url = lesson.me.owned ? url({'for':'web.chapter.show','id':lesson.id}) : 'javascript:' %} - {% set over_flag = lesson.attrs.end_time < time() ? '已结束' : '' %} - - - - {{ lesson.title }} - {% if lesson.free == 1 %} - 免费 - {% endif %} - {% if lesson.me.duration > 0 %} - - {% endif %} - {{ date('m月d日',lesson.attrs.start_time) }} {{ date('H:i',lesson.attrs.start_time) }}~{{ date('H:i',lesson.attrs.end_time) }} {{ over_flag }} - - -{%- endmacro %} - -
- {% for chapter in chapters %} -
-

{{ chapter.title }}

-
-
    - {% for lesson in chapter.children %} -
  • {{ live_lesson_info(lesson) }}
    • - {% endfor %} -
-
-
- {% endfor %} -
\ No newline at end of file diff --git a/app/Http/Web/Views/course/chapters_read.volt b/app/Http/Web/Views/course/chapters_read.volt deleted file mode 100644 index 72640f68..00000000 --- a/app/Http/Web/Views/course/chapters_read.volt +++ /dev/null @@ -1,31 +0,0 @@ -{%- macro read_lesson_info(lesson) %} - - {% set url = lesson.me.owned ? url({'for':'web.chapter.show','id':lesson.id}) : 'javascript:' %} - - - - {{ lesson.title|e }} - {% if lesson.free == 1 %} - 免费 - {% endif %} - {% if lesson.me.duration > 0 %} - - {% endif %} - - -{%- endmacro %} - -
- {% for chapter in chapters %} -
-

{{ chapter.title|e }}

-
-
    - {% for lesson in chapter.children %} -
  • {{ read_lesson_info(lesson) }}
    • - {% endfor %} -
-
-
- {% endfor %} -
\ No newline at end of file diff --git a/app/Http/Web/Views/course/chapters_vod.volt b/app/Http/Web/Views/course/chapters_vod.volt deleted file mode 100644 index 1191f4e9..00000000 --- a/app/Http/Web/Views/course/chapters_vod.volt +++ /dev/null @@ -1,32 +0,0 @@ -{%- macro vod_lesson_info(lesson) %} - - {% set url = lesson.me.owned ? url({'for':'web.chapter.show','id':lesson.id}) : 'javascript:' %} - - - - {{ lesson.title }} - {% if lesson.free == 1 %} - 免费 - {% endif %} - {% if lesson.me.duration > 0 %} - - {% endif %} - {{ lesson.attrs.duration|total_duration }} - - -{%- endmacro %} - -
- {% for chapter in chapters %} -
-

{{ chapter.title }}

-
-
    - {% for lesson in chapter.children %} -
  • {{ vod_lesson_info(lesson) }}
    • - {% endfor %} -
-
-
- {% endfor %} -
\ No newline at end of file diff --git a/app/Http/Web/Views/course/meta.volt b/app/Http/Web/Views/course/meta.volt index 204cce3e..1f0c6171 100644 --- a/app/Http/Web/Views/course/meta.volt +++ b/app/Http/Web/Views/course/meta.volt @@ -1,20 +1,43 @@
- {{ course.summary|e }} + {{ course.title|e }}
-

课程时长：{{ course.attrs.duration|total_duration }}

-

- 学习期限：{{ course.study_expiry }}个月 - 退款期限：{{ course.refund_expiry }}天 + {% if course.model == 'vod' %} +

课程时长 {{ course.attrs.duration|total_duration }}

+ {% elseif course.model == 'live' %} +

直播时间 {{ course.attrs.start_date }} ~ {{ course.attrs.end_date }}

+ {% endif %} + {% if course.market_price > 0 %} +

+ 学习期限 {{ course.study_expiry }}个月 + 退款期限 {{ course.refund_expiry }}天 +

+ {% endif %} +

+ {% if course.market_price > 0 %} + 市场价格 ￥{{ course.market_price }} + {% else %} + 市场价格 免费 + {% endif %} + {% if course.vip_price > 0 %} + 会员价格 ￥{{ course.vip_price }} + {% else %} + 会员价格 免费 + {% endif %}

-

- 市场价格：￥{{ course.market_price }} - 会员价格：￥{{ course.vip_price }} -

-

- {{ course.user_count }}次学习 - {{ course.review_count }}次评价 - {{ course.favorite_count }}次收藏 +

+ 难度 {{ level_info(course.level) }} + 课时 {{ course.lesson_count }} + 学员 {{ course.user_count }} + 收藏 {{ course.favorite_count }} + 评分 {{ course.rating }}

+
\ No newline at end of file diff --git a/app/Http/Web/Views/course/order.volt b/app/Http/Web/Views/course/order.volt new file mode 100644 index 00000000..62e9f62b --- /dev/null +++ b/app/Http/Web/Views/course/order.volt @@ -0,0 +1,26 @@ +{% if course.me.owned == 0 and course.market_price > 0 %} +
+
+ {% set order_url = url({'for':'web.order.confirm'},{'item_id':course.id,'item_type':'course'}) %} + 立即购买 +
+
+ 课程咨询 +
+
+{% endif %} + +{% if course.market_price == 0 %} +
+
赞赏支持
+
+
+ {% 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'}) %} + {{ option.title }} + {% endfor %} +
+
+
+{% endif %} \ No newline at end of file diff --git a/app/Http/Web/Views/course/packages.volt b/app/Http/Web/Views/course/packages.volt index 69453e37..320df573 100644 --- a/app/Http/Web/Views/course/packages.volt +++ b/app/Http/Web/Views/course/packages.volt @@ -13,7 +13,7 @@ 会员价 ￥{{ package.vip_price }}
- 立即购买 + 立即购买
diff --git a/app/Http/Web/Views/course/sidebar_recommended.volt b/app/Http/Web/Views/course/recommended.volt similarity index 60% rename from app/Http/Web/Views/course/sidebar_recommended.volt rename to app/Http/Web/Views/course/recommended.volt index 6504d0af..fd2289cb 100644 --- a/app/Http/Web/Views/course/sidebar_recommended.volt +++ b/app/Http/Web/Views/course/recommended.volt @@ -1,7 +1,9 @@ -
+{{ partial('partials/macro_course') }} + +
推荐课程
- {% for course in recommended_courses %} + {% for course in courses %} {{ sidebar_course_card(course) }} {% endfor %}
diff --git a/app/Http/Web/Views/course/sidebar_related.volt b/app/Http/Web/Views/course/related.volt similarity index 69% rename from app/Http/Web/Views/course/sidebar_related.volt rename to app/Http/Web/Views/course/related.volt index c9913fa5..0f671774 100644 --- a/app/Http/Web/Views/course/sidebar_related.volt +++ b/app/Http/Web/Views/course/related.volt @@ -1,7 +1,9 @@ +{{ partial('partials/macro_course') }} +
相关课程
- {% for course in related_courses %} + {% for course in courses %} {{ sidebar_course_card(course) }} {% endfor %}
diff --git a/app/Http/Web/Views/course/reviews.volt b/app/Http/Web/Views/course/reviews.volt index 59bd45e8..9d894d28 100644 --- a/app/Http/Web/Views/course/reviews.volt +++ b/app/Http/Web/Views/course/reviews.volt @@ -11,12 +11,13 @@ {% set user_url = url({'for':'web.user.show','id':item.id}) %}
- - {{ item.user.name }} - + {{ item.user.name }}
{{ star_info(item.rating) }}
+
+ {{ item.user.name }} +
{{ item.content }}
{{ date('Y-m-d H:i',item.create_time) }} diff --git a/app/Http/Web/Views/course/show.volt b/app/Http/Web/Views/course/show.volt index 5f48f29c..7c87deb9 100644 --- a/app/Http/Web/Views/course/show.volt +++ b/app/Http/Web/Views/course/show.volt @@ -7,7 +7,7 @@
全部课程 - {% for path in category_paths %} + {% for path in course.category_paths %} {{ path.name }} {% endfor %} {{ course.title }} @@ -18,23 +18,24 @@ {{ partial('course/meta') }}
- {% set show_packages = packages ? 1 : 0 %} - {% set show_consults = course.market_price > 0 ? 1 : 0 %} - {% set show_reviews = course.market_price > 0 ? 1 : 0 %} -
+ + {% set show_tab_packages = 1 %} + {% set show_tab_consults = course.consult_count > 0 ? 1 : 0 %} + {% set show_tab_reviews = course.review_count > 0 ? 1 : 0 %} +
  • 详情
  • 目录
    • - {% if show_packages == 1 %} + {% if show_tab_packages == 1 %}
  • 套餐
    • {% endif %} - {% if show_consults == 1 %} + {% if show_tab_consults == 1 %}
  • 咨询
    • {% endif %} - {% if show_reviews == 1 %} + {% if show_tab_reviews == 1 %}
  • 评价
    • {% endif %}
@@ -42,45 +43,47 @@
{{ course.details }}
-
- {% if course.model == 'vod' %} - {{ partial('course/chapters_vod') }} - {% elseif course.model == 'live' %} - {{ partial('course/chapters_live') }} - {% elseif course.model == 'read' %} - {{ partial('course/chapters_read') }} - {% endif %} +
+ {{ partial('course/chapters') }}
- {% if show_packages == 1 %} -
- {{ partial('course/packages') }} -
+ {% if show_tab_packages == 1 %} + {% set package_url = url({'for':'web.course.packages','id':course.id}) %} +
{% endif %} - {% if show_consults == 1 %} + {% if show_tab_consults == 1 %} {% set consult_url = url({'for':'web.course.consults','id':course.id}) %}
{% endif %} - {% if show_reviews == 1 %} + {% if show_tab_reviews == 1 %} {% set review_url = url({'for':'web.course.reviews','id':course.id}) %}
{% endif %}
+ + {% set show_sidebar_teachers = 1 %} + {% set show_sidebar_topics = 1 %} + {% set show_sidebar_recommended = 1 %} + {% set show_sidebar_related = 1 %} +
- {% if teachers %} - {{ partial('course/sidebar_teachers') }} + {{ partial('course/order') }} + {{ partial('course/teachers') }} + {% if show_sidebar_topics %} + {% set topic_url = url({'for':'web.course.topics','id':course.id}) %} + {% endif %} - {% if topics %} - {{ partial('course/sidebar_topics') }} + {% if show_sidebar_recommended %} + {% set recommended_url = url({'for':'web.course.recommended','id':course.id}) %} + {% endif %} - {% if recommended_courses %} - {{ partial('course/sidebar_recommended') }} - {% endif %} - {% if related_courses %} - {{ partial('course/sidebar_related') }} + {% if show_sidebar_related %} + {% set related_url = url({'for':'web.course.related','id':course.id}) %} + {% endif %}
+
{% endblock %} @@ -88,19 +91,30 @@ {% block inline_js %} {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/course/sidebar_teachers.volt b/app/Http/Web/Views/course/teachers.volt similarity index 52% rename from app/Http/Web/Views/course/sidebar_teachers.volt rename to app/Http/Web/Views/course/teachers.volt index beee4305..731ec44c 100644 --- a/app/Http/Web/Views/course/sidebar_teachers.volt +++ b/app/Http/Web/Views/course/teachers.volt @@ -2,15 +2,17 @@
授课教师
{% for teacher in teachers %} -
+ {% set teacher_url = url({'for':'web.user.show','id':teacher.id}) %} +
- {{ teacher.about }} + {{ teacher.about|e }}
- {{ teacher.name }} + {{ teacher.name }}
-
{{ teacher.title }}
+ {% set title = teacher.title ? teacher.title : '小小教书匠' %} +
{{ title }}
{% endfor %} diff --git a/app/Http/Web/Views/course/sidebar_topics.volt b/app/Http/Web/Views/course/topics.volt similarity index 100% rename from app/Http/Web/Views/course/sidebar_topics.volt rename to app/Http/Web/Views/course/topics.volt diff --git a/app/Http/Web/Views/order/confirm.volt b/app/Http/Web/Views/order/confirm.volt new file mode 100644 index 00000000..0f46aaa9 --- /dev/null +++ b/app/Http/Web/Views/order/confirm.volt @@ -0,0 +1,54 @@ +{% extends 'templates/base.volt' %} + +{% block content %} + + {%- macro cart_course_card(course) %} + {% set course_url = url({'for':'web.course.show','id':course.id}) %} +
+ course.title|e +
+
+

{{ course.title }}

+

+ 市场价格 {{ course.market_price }} + 会员价格 {{ course.vip_price }} +

+

+ 学习期限 {{ course.study_expiry }} + 退款期限 {{ course.refund_expiry }} +

+
+ {%- endmacro %} + + {%- macro reward_course_card(reward) %} +
I am reward
+ {%- endmacro %} + + {%- macro vip_course_card(vip) %} +
I am vip
+ {%- endmacro %} + +
+ 首页 + 确认订单 +
+ +
+ {% if confirm.item_type == 'course' %} + {% set course = confirm.item_info.course %} + {{ cart_course_card(course) }} + {% elseif confirm.item_type == 'package' %} + {% set package = confirm.item_info.package %} + {% for course in package.courses %} + {{ cart_course_card(course) }} + {% endfor %} + {% elseif confirm.item_type == 'reward' %} + {% set reward = confirm.item_info.reward %} + {{ cart_reward_card(reward) }} + {% elseif confirm.item_type == 'vip' %} + {% set vip = confirm.item_info.vip %} + {{ cart_vip_card(vip) }} + {% endif %} +
+ +{% endblock %} \ No newline at end of file diff --git a/app/Services/Frontend/Course/CourseInfo.php b/app/Services/Frontend/Course/CourseInfo.php index 7009e073..e7c29961 100644 --- a/app/Services/Frontend/Course/CourseInfo.php +++ b/app/Services/Frontend/Course/CourseInfo.php @@ -35,11 +35,11 @@ class CourseInfo extends FrontendService 'keywords' => $course->keywords, 'category_id' => $course->category_id, 'teacher_id' => $course->teacher_id, - 'market_price' => (float)$course->market_price, - 'vip_price' => (float)$course->vip_price, + 'market_price' => $course->market_price, + 'vip_price' => $course->vip_price, 'study_expiry' => $course->study_expiry, 'refund_expiry' => $course->refund_expiry, - 'rating' => (float)$course->rating, + 'rating' => $course->rating, 'model' => $course->model, 'level' => $course->level, 'attrs' => $course->attrs, diff --git a/app/Services/Frontend/Reward/OptionList.php b/app/Services/Frontend/Reward/OptionList.php new file mode 100644 index 00000000..d3338820 --- /dev/null +++ b/app/Services/Frontend/Reward/OptionList.php @@ -0,0 +1,34 @@ +findAll(['deleted' => 0]); + + if ($rewards->count() == 0) { + return []; + } + + $result = []; + + foreach ($rewards as $reward) { + $result[] = [ + 'id' => $reward->id, + 'title' => $reward->title, + 'price' => $reward->price, + ]; + } + + return $result; + } + +} \ No newline at end of file diff --git a/app/Traits/Auth.php b/app/Traits/Auth.php index 9f14863d..221594b3 100644 --- a/app/Traits/Auth.php +++ b/app/Traits/Auth.php @@ -32,6 +32,10 @@ trait Auth */ public function getLoginUser() { + $userRepo = new UserRepo(); + + return $userRepo->findById(100015); + $authUser = $this->getAuthUser(); $validator = new AppValidator(); diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index a8f8c74f..19dbe935 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -118,6 +118,15 @@ body { width: 320px; } +.layout-sidebar .loading { + padding: 15px; + text-align: center; +} + +.layout-sidebar .sidebar { + margin-bottom: 15px; +} + .index-module .layui-tab { margin-bottom: 0; } @@ -310,10 +319,41 @@ body { } .course-meta .info { + position: relative; float: left; + width: 80%; font-size: 12px; } +.course-meta .info .share { + position: absolute; + top: 0; + right: 0; +} + +.course-meta .share a { + margin-right: 5px; + color: #999; +} + +.course-meta .share a:hover { + color: #000; +} + +.course-meta .info .price { + color: red; + font-size: 14px; +} + +.course-meta .info .free { + color: green; +} + +.course-meta .info span { + color: #999; + margin: 0 5px; +} + .course-meta .cover img { width: 210px; height: 118px; @@ -323,16 +363,26 @@ body { line-height: 30px; } -.course-meta .stats span { - margin-right: 5px; -} - .course-tab { margin: 0; } .course-tab .layui-tab-content { - padding: 30px 0; + padding: 20px 0; +} + +.course-tab .loading { + text-align: center; + padding: 15px; +} + +.course-tab .loading .layui-icon { + font-size: 30px; +} + +.course-details { + font-size: 12px; + color: #999; } .lesson-item { @@ -448,6 +498,7 @@ body { } .review-card { + position: relative; padding-bottom: 10px; margin-bottom: 10px; border-bottom: 1px dashed #ccc; @@ -473,31 +524,48 @@ body { .review-card .info { float: left; width: 650px; + font-size: 12px; } .review-card .rating { + position: absolute; + top: 0; + right: 0; margin-bottom: 10px; } .review-card .rating .layui-icon { color: orange; + font-size: 12px; } .review-card .title { margin-bottom: 10px; } +.review-card .user { + margin-bottom: 10px; + color: #999; +} + .review-card .content { margin-bottom: 10px; color: #999; - font-size: 12px; word-wrap: break-word; white-space: pre-wrap; } .review-card .footer { color: #999; - font-size: 12px; +} + +.sidebar-order .order { + margin-bottom: 10px; +} + +.sidebar-order .reward-btn { + width: 84px; + margin: 5px; } .sidebar-teacher-card { diff --git a/public/static/web/js/common.js b/public/static/web/js/common.js index f4d8dd56..e751748d 100644 --- a/public/static/web/js/common.js +++ b/public/static/web/js/common.js @@ -22,11 +22,12 @@ util.fixbar({ var helper = {}; -helper.ajaxPager = function (url, target) { - var index = layer.load(); +helper.ajaxLoadHtml = function (url, target) { + var $target = $('#' + target); + var html = '
'; + $target.html(html); $.get(url, function (html) { - $('#' + target).html(html); - layer.close(index); + $target.html(html); }); } @@ -87,5 +88,5 @@ $('.kg-delete').on('click', function () { $('body').on('click', '.layui-laypage > a', function () { var url = $(this).attr('data-url'); var target = $(this).attr('data-target'); - helper.ajaxPager(url, target); + helper.ajaxLoadHtml(url, target); }); \ No newline at end of file diff --git a/storage/cache/annotations/.gitignore b/storage/cache/annotations/.gitignore deleted file mode 100644 index c96a04f0..00000000 --- a/storage/cache/annotations/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file