diff --git a/app/Http/Home/Controllers/ConsultController.php b/app/Http/Home/Controllers/ConsultController.php index dfacf179..41c827cf 100644 --- a/app/Http/Home/Controllers/ConsultController.php +++ b/app/Http/Home/Controllers/ConsultController.php @@ -77,8 +77,14 @@ class ConsultController extends Controller $consult = $service->handle($consult->id); + $location = $this->url->get([ + 'for' => 'home.course.show', + 'id' => $consult['course']['id'], + ]); + $content = [ - 'consult' => $consult, + 'location' => $location, + 'target' => 'parent', 'msg' => '提交咨询成功', ]; @@ -92,14 +98,13 @@ class ConsultController extends Controller { $service = new ConsultUpdateService(); - $consult = $service->handle($id); + $service->handle($id); - $service = new ConsultInfoService(); - - $consult = $service->handle($consult->id); + $location = $this->url->get(['for' => 'home.uc.consults']); $content = [ - 'consult' => $consult, + 'location' => $location, + 'target' => 'parent', 'msg' => '更新咨询成功', ]; @@ -127,14 +132,13 @@ class ConsultController extends Controller $service = new ConsultReplyService(); - $consult = $service->handle($id); + $service->handle($id); - $service = new ConsultInfoService(); - - $consult = $service->handle($consult->id); + $location = $this->url->get(['for' => 'home.tc.consults']); $content = [ - 'consult' => $consult, + 'location' => $location, + 'target' => 'parent', 'msg' => '回复咨询成功', ]; diff --git a/app/Http/Home/Controllers/RefundController.php b/app/Http/Home/Controllers/RefundController.php index ba01b011..8036fe84 100644 --- a/app/Http/Home/Controllers/RefundController.php +++ b/app/Http/Home/Controllers/RefundController.php @@ -49,7 +49,15 @@ class RefundController extends Controller $service->handle(); - return $this->jsonSuccess(['msg' => '申请退款成功']); + $location = $this->url->get(['for' => 'home.uc.refunds']); + + $content = [ + 'location' => $location, + 'target' => 'parent', + 'msg' => '提交申请成功', + ]; + + return $this->jsonSuccess($content); } /** diff --git a/app/Http/Home/Controllers/ReviewController.php b/app/Http/Home/Controllers/ReviewController.php index 2b6ab9f6..5ed994a7 100644 --- a/app/Http/Home/Controllers/ReviewController.php +++ b/app/Http/Home/Controllers/ReviewController.php @@ -55,13 +55,6 @@ class ReviewController extends Controller $this->notFound(); } - $approved = $review['published'] == ReviewModel::PUBLISH_APPROVED; - $owned = $review['me']['owned'] == 1; - - if (!$approved && !$owned) { - $this->notFound(); - } - return $this->jsonSuccess(['review' => $review]); } @@ -72,14 +65,13 @@ class ReviewController extends Controller { $service = new ReviewCreateService(); - $review = $service->handle(); + $service->handle(); - $service = new ReviewInfoService(); - - $review = $service->handle($review->id); + $location = $this->url->get(['for' => 'home.uc.reviews']); $content = [ - 'review' => $review, + 'location' => $location, + 'target' => 'parent', 'msg' => '发布评价成功', ]; @@ -95,12 +87,11 @@ class ReviewController extends Controller $service->handle($id); - $service = new ReviewInfoService(); - - $review = $service->handle($id); + $location = $this->url->get(['for' => 'home.uc.reviews']); $content = [ - 'review' => $review, + 'location' => $location, + 'target' => 'parent', 'msg' => '更新评价成功', ]; diff --git a/app/Http/Home/Views/macros/order.volt b/app/Http/Home/Views/macros/order.volt index 480d9901..e97a4381 100644 --- a/app/Http/Home/Views/macros/order.volt +++ b/app/Http/Home/Views/macros/order.volt @@ -10,7 +10,7 @@ {% if course.model in [1,2,3] %}
学习期限:{{ date('Y-m-d',course.study_expiry_time) }} - 退款期限:{{ date('Y-m-d',course.refund_expiry_time) }} + 退款期限:{{ course.refund_expiry > 0 ? date('Y-m-d',course.refund_expiry_time) : '不支持' }}
{% elseif course.model == 4 %}上课时间:{{ course.attrs.start_date }} ~ {{ course.attrs.end_date }}
@@ -23,13 +23,13 @@课程名称:{{ course.title }}
- 市场价格:{{ '¥%0.2f'|format(course.market_price) }} + 市场价格:{{ '¥%0.2f'|format(course.market_price) }} 会员价格:{{ '¥%0.2f'|format(course.vip_price) }}
{% if course.model in [1,2,3] %}学习期限:{{ date('Y-m-d',course.study_expiry_time) }} - 退款期限:{{ date('Y-m-d',course.refund_expiry_time) }} + 退款期限:{{ course.refund_expiry > 0 ? date('Y-m-d',course.refund_expiry_time) : '不支持' }}
{% endif %}课程名称:{{ course.title }}
退款期限:{{ date('Y-m-d H:i:s',course.refund_expiry_time) }} {{ expiry_flag }}
-退款金额:{{ '¥%0.2f'|format(course.refund_amount) }}退款比例:{{ 100 * course.refund_percent }}%
+退款金额:{{ '¥%0.2f'|format(course.refund_amount) }}退款比例:{{ 100 * course.refund_rate }}%
课程名称:{{ course.title }}
退款期限:{{ date('Y-m-d H:i:s',course.refund_expiry_time) }} {{ expiry_flag }}
-退款金额:{{ '¥%0.2f'|format(course.refund_amount) }}退款比例:{{ 100 * course.refund_percent }}%
+退款金额:{{ '¥%0.2f'|format(course.refund_amount) }}退款比例:{{ 100 * course.refund_rate }}%