diff --git a/app/Console/Tasks/CloseTradeTask.php b/app/Console/Tasks/CloseTradeTask.php index 7d4a3bfb..49da9877 100644 --- a/app/Console/Tasks/CloseTradeTask.php +++ b/app/Console/Tasks/CloseTradeTask.php @@ -43,12 +43,16 @@ class CloseTradeTask extends Task $alipayTrade = $alipay->find($trade->sn); if ($alipayTrade) { + /** * 异步通知接收异常，补救漏网 */ if ($alipayTrade->trade_status == 'TRADE_SUCCESS') { + $this->eventsManager->fire('pay:afterPay', $this, $trade); + $allowClosed = false; + } elseif ($alipayTrade->trade_status == 'WAIT_BUYER_PAY') { $alipay->close($trade->sn); } @@ -75,12 +79,16 @@ class CloseTradeTask extends Task $wxpayTrade = $wxpay->find($trade->sn); if ($wxpayTrade) { + /** * 异步通知接收异常，补救漏网 */ if ($wxpayTrade->trade_state == 'SUCCESS') { + $this->eventsManager->fire('pay:afterPay', $this, $trade); + $allowClosed = false; + } elseif ($wxpayTrade->trade_state == 'NOTPAY') { $wxpay->close($trade->sn); } diff --git a/app/Http/Web/Controllers/CourseController.php b/app/Http/Web/Controllers/CourseController.php index 76cc85f0..f6bd897c 100644 --- a/app/Http/Web/Controllers/CourseController.php +++ b/app/Http/Web/Controllers/CourseController.php @@ -107,6 +107,7 @@ class CourseController extends Controller $packages = $service->handle($id); $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->pick('course/show_packages'); $this->view->setVar('packages', $packages); } @@ -122,6 +123,7 @@ class CourseController extends Controller $pager->target = 'tab-consults'; $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->pick('course/show_consults'); $this->view->setVar('pager', $pager); } @@ -137,6 +139,7 @@ class CourseController extends Controller $pager->target = 'tab-reviews'; $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->pick('course/show_reviews'); $this->view->setVar('pager', $pager); } @@ -150,6 +153,7 @@ class CourseController extends Controller $courses = $service->handle($id); $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->pick('course/show_recommended'); $this->view->setVar('courses', $courses); } @@ -163,6 +167,7 @@ class CourseController extends Controller $courses = $service->handle($id); $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->pick('course/show_related'); $this->view->setVar('courses', $courses); } @@ -176,21 +181,10 @@ class CourseController extends Controller $topics = $service->handle($id); $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->pick('course/show_topics'); $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); - } - /** * @Get("/{id:[0-9]+}/rating", name="web.course.rating") */ @@ -200,6 +194,7 @@ class CourseController extends Controller $course = $service->handle($id); + $this->view->pick('course/rating'); $this->view->setVar('course', $course); } diff --git a/app/Http/Web/Views/chapter/show_vod.volt b/app/Http/Web/Views/chapter/show_vod.volt index c9df7a12..dba895ca 100644 --- a/app/Http/Web/Views/chapter/show_vod.volt +++ b/app/Http/Web/Views/chapter/show_vod.volt @@ -2,9 +2,11 @@ {% block content %} - {% set like_url = url({'for':'web.chapter.like','id':chapter.id}) %} - {% set learning_url = url({'for':'web.chapter.learning','id':chapter.id}) %} + {% set chapter_url = url({'for':'web.chapter.show','id':chapter.id}) %} {% set danmu_url = url({'for':'web.chapter.danmu','id':chapter.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':'http://baidu.com','size':5}) %}
@@ -19,12 +21,16 @@
-
- {{ chapter.like_count }} - {{ chapter.user_count }} - - +
+
+ {% if auth_user.id > 0 %} {% else %} @@ -94,6 +100,13 @@
+
+ + + + +
+ {% endblock %} {% block include_js %} @@ -102,6 +115,7 @@ {{ js_include('lib/jquery.min.js') }} {{ js_include('lib/jquery.danmu.min.js') }} + {{ js_include('web/js/share.js') }} {{ js_include('web/js/vod.player.js') }} {{ js_include('web/js/chapter.action.js') }} diff --git a/app/Http/Web/Views/course/show.volt b/app/Http/Web/Views/course/show.volt index dd0a7346..186b8c40 100644 --- a/app/Http/Web/Views/course/show.volt +++ b/app/Http/Web/Views/course/show.volt @@ -15,7 +15,7 @@
- {{ partial('course/meta') }} + {{ partial('course/show_meta') }}
@@ -26,27 +26,18 @@
- {% if show_tab_packages == 1 %} - {{ course.package_count }} - {% endif %} - {% if show_tab_consults == 1 %} - {{ course.consult_count }} - {% endif %} - {% if show_tab_reviews == 1 %} - {{ course.review_count }} - {% endif %}
  • 详情
  • 目录
    • {% if show_tab_packages == 1 %} -
  • 套餐
    • +
  • 套餐{{ course.package_count }}
    • {% endif %} {% if show_tab_consults == 1 %} -
  • 咨询
    • +
  • 咨询{{ course.consult_count }}
    • {% endif %} {% if show_tab_reviews == 1 %} -
  • 评价
    • +
  • 评价{{ course.review_count }}
    • {% endif %}
@@ -54,7 +45,7 @@
{{ course.details }}
- {{ partial('course/chapters') }} + {{ partial('course/show_chapters') }}
{% if show_tab_packages == 1 %} {% set packages_url = url({'for':'web.course.packages','id':course.id}) %} @@ -79,8 +70,8 @@ {% set show_sidebar_related = 1 %}
- {{ partial('course/order') }} - {{ partial('course/teachers') }} + {{ partial('course/show_order') }} + {{ partial('course/show_teachers') }} {% if show_sidebar_topics %} {% set topics_url = url({'for':'web.course.topics','id':course.id}) %} diff --git a/app/Http/Web/Views/course/chapters.volt b/app/Http/Web/Views/course/show_chapters.volt similarity index 100% rename from app/Http/Web/Views/course/chapters.volt rename to app/Http/Web/Views/course/show_chapters.volt diff --git a/app/Http/Web/Views/course/consults.volt b/app/Http/Web/Views/course/show_consults.volt similarity index 100% rename from app/Http/Web/Views/course/consults.volt rename to app/Http/Web/Views/course/show_consults.volt diff --git a/app/Http/Web/Views/course/meta.volt b/app/Http/Web/Views/course/show_meta.volt similarity index 80% rename from app/Http/Web/Views/course/meta.volt rename to app/Http/Web/Views/course/show_meta.volt index cb3428dd..fa54d8f7 100644 --- a/app/Http/Web/Views/course/meta.volt +++ b/app/Http/Web/Views/course/show_meta.volt @@ -34,14 +34,14 @@

{% set favorite_url = url({'for':'web.course.favorite','id':course.id}) %} - {% set course_url = url({'for':'web.course.show','id':course.id}) %} - {% set qrcode_url = url({'for':'web.qrcode_img'},{'text':'http://baidu.com','size':5}) %} + {% set full_course_url = full_url({'for':'web.course.show','id':course.id}) %} + {% set qrcode_url = url({'for':'web.qrcode_img'},{'text':full_course_url}) %}
- - - - + + + +