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 %}
diff --git a/app/Http/Home/Views/refund/confirm.volt b/app/Http/Home/Views/refund/confirm.volt index 44715192..2472ec38 100644 --- a/app/Http/Home/Views/refund/confirm.volt +++ b/app/Http/Home/Views/refund/confirm.volt @@ -9,7 +9,7 @@

课程名称:{{ 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 }}%

{% elseif confirm.item_type == 2 %} {% set courses = confirm.item_info.courses %} @@ -18,7 +18,7 @@

课程名称:{{ 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 }}%

{% endfor %} {% endif %} @@ -40,12 +40,9 @@
{% if confirm.refund_amount > 0 %} -
+
- -
- -
+
@@ -68,4 +65,4 @@ }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/Http/Home/Views/review/add.volt b/app/Http/Home/Views/review/add.volt index 9c308738..f894a707 100644 --- a/app/Http/Home/Views/review/add.volt +++ b/app/Http/Home/Views/review/add.volt @@ -24,9 +24,9 @@
- +
- +
@@ -54,4 +54,4 @@ {{ js_include('home/js/user.console.review.js') }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/Http/Home/Views/review/edit.volt b/app/Http/Home/Views/review/edit.volt index a6056c66..8c658d49 100644 --- a/app/Http/Home/Views/review/edit.volt +++ b/app/Http/Home/Views/review/edit.volt @@ -26,7 +26,7 @@
- +
@@ -53,4 +53,4 @@ {{ js_include('home/js/user.console.review.js') }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/Services/Refund.php b/app/Services/Refund.php index 72aae172..ac0a0ea0 100644 --- a/app/Services/Refund.php +++ b/app/Services/Refund.php @@ -53,15 +53,15 @@ class Refund extends Service $serviceFee = $this->getServiceFee($order); $serviceRate = $this->getServiceRate($order); - $refundPercent = 0.00; + $refundRate = 0.00; $refundAmount = 0.00; if ($itemInfo['course']['refund_expiry_time'] > time()) { - $refundPercent = $this->getCourseRefundPercent($order->item_id, $order->owner_id); - $refundAmount = round(($order->amount - $serviceFee) * $refundPercent, 2); + $refundRate = $this->getCourseRefundRate($order->item_id, $order->owner_id); + $refundAmount = round(($order->amount - $serviceFee) * $refundRate, 2); } - $itemInfo['course']['refund_percent'] = $refundPercent; + $itemInfo['course']['refund_rate'] = $refundRate; $itemInfo['course']['refund_amount'] = $refundAmount; return [ @@ -95,17 +95,17 @@ class Refund extends Service $course['cover'] = kg_cos_course_cover_url($course['cover']); - $refundPercent = 0.00; + $refundRate = 0.00; $refundAmount = 0.00; if ($course['refund_expiry_time'] > time()) { - $pricePercent = round($course['market_price'] / $totalMarketPrice, 4); - $refundPercent = $this->getCourseRefundPercent($course['id'], $order->owner_id); - $refundAmount = round(($order->amount - $serviceFee) * $pricePercent * $refundPercent, 2); + $priceRate = round($course['market_price'] / $totalMarketPrice, 4); + $refundRate = $this->getCourseRefundRate($course['id'], $order->owner_id); + $refundAmount = round(($order->amount - $serviceFee) * $priceRate * $refundRate, 2); $totalRefundAmount += $refundAmount; } - $course['refund_percent'] = $refundPercent; + $course['refund_rate'] = $refundRate; $course['refund_amount'] = $refundAmount; } @@ -176,7 +176,7 @@ class Refund extends Service return $serviceRate; } - protected function getCourseRefundPercent($courseId, $userId) + protected function getCourseRefundRate($courseId, $userId) { $courseRepo = new CourseRepo(); diff --git a/public/static/home/js/teacher.console.js b/public/static/home/js/teacher.console.js index 77cd2075..f936efb2 100644 --- a/public/static/home/js/teacher.console.js +++ b/public/static/home/js/teacher.console.js @@ -12,7 +12,7 @@ layui.use(['jquery', 'layer'], function () { type: 2, title: '咨询详情', content: [url, 'no'], - area: ['720px', '320px'] + area: ['720px', '320px'], }); }); @@ -26,9 +26,6 @@ layui.use(['jquery', 'layer'], function () { title: '回复咨询', content: [url, 'no'], area: ['720px', '300px'], - cancel: function () { - parent.location.reload(); - } }); }); @@ -41,8 +38,8 @@ layui.use(['jquery', 'layer'], function () { type: 2, title: '直播推流', content: [url, 'no'], - area: ['640px', '420px'] + area: ['640px', '420px'], }); }); -}); \ No newline at end of file +}); diff --git a/public/static/home/js/user.console.js b/public/static/home/js/user.console.js index 4e28e434..45ed97af 100644 --- a/public/static/home/js/user.console.js +++ b/public/static/home/js/user.console.js @@ -12,7 +12,7 @@ layui.use(['jquery', 'layer'], function () { type: 2, title: '咨询详情', content: [url, 'no'], - area: ['720px', '320px'] + area: ['720px', '320px'], }); }); @@ -26,9 +26,6 @@ layui.use(['jquery', 'layer'], function () { title: '编辑咨询', content: [url, 'no'], area: ['720px', '420px'], - cancel: function () { - parent.location.reload(); - } }); }); @@ -42,9 +39,6 @@ layui.use(['jquery', 'layer'], function () { title: '发布评价', content: [url, 'no'], area: ['640px', '480px'], - cancel: function () { - parent.location.reload(); - } }); }); @@ -58,9 +52,6 @@ layui.use(['jquery', 'layer'], function () { title: '修改评价', content: [url, 'no'], area: ['640px', '480px'], - cancel: function () { - parent.location.reload(); - } }); }); @@ -74,7 +65,7 @@ layui.use(['jquery', 'layer'], function () { title: '订单详情', content: [url, 'no'], area: '800px', - offset: '200px' + offset: '200px', }); }); @@ -88,7 +79,7 @@ layui.use(['jquery', 'layer'], function () { title: '退款详情', content: [url, 'no'], area: '800px', - offset: '200px' + offset: '200px', }); }); diff --git a/public/static/home/js/user.console.review.js b/public/static/home/js/user.console.review.js index 534f3749..f9656eeb 100644 --- a/public/static/home/js/user.console.review.js +++ b/public/static/home/js/user.console.review.js @@ -7,10 +7,6 @@ layui.use(['jquery', 'rate'], function () { var $rating2 = $('input[name=rating2]'); var $rating3 = $('input[name=rating3]'); - $('.btn-cancel').on('click', function () { - parent.layer.closeAll(); - }); - rate.render({ elem: '#rating1', value: $rating1.val(), @@ -35,4 +31,4 @@ layui.use(['jquery', 'rate'], function () { } }); -}); \ No newline at end of file +});