From 8748b7d52f38b68aec72286d6b556e70738478a5 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Wed, 22 Jul 2020 21:07:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=88=91=E7=9A=84=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Web/Controllers/OrderController.php | 2 + app/Http/Web/Controllers/RefundController.php | 3 + app/Http/Web/Views/my/orders.volt | 9 +- app/Http/Web/Views/my/refunds.volt | 9 +- app/Http/Web/Views/order/info.volt | 69 +++++++------ app/Http/Web/Views/order/pay.volt | 55 +---------- app/Http/Web/Views/partials/macro_order.volt | 31 ++---- app/Http/Web/Views/refund/confirm.volt | 65 ++++++------ app/Http/Web/Views/refund/info.volt | 99 +++++++++---------- public/static/web/css/common.css | 34 ++++--- public/static/web/js/my.js | 45 +++++++++ public/static/web/js/order.pay.js | 52 ++++++++++ 12 files changed, 264 insertions(+), 209 deletions(-) create mode 100644 public/static/web/js/my.js create mode 100644 public/static/web/js/order.pay.js diff --git a/app/Http/Web/Controllers/OrderController.php b/app/Http/Web/Controllers/OrderController.php index 0614bcb9..90cd295b 100644 --- a/app/Http/Web/Controllers/OrderController.php +++ b/app/Http/Web/Controllers/OrderController.php @@ -7,6 +7,7 @@ use App\Services\Frontend\Order\OrderCancel as OrderCancelService; use App\Services\Frontend\Order\OrderConfirm as OrderConfirmService; use App\Services\Frontend\Order\OrderCreate as OrderCreateService; use App\Services\Frontend\Order\OrderInfo as OrderInfoService; +use Phalcon\Mvc\View; /** * @RoutePrefix("/order") @@ -25,6 +26,7 @@ class OrderController extends Controller $order = $service->handle($sn); + $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); $this->view->setVar('order', $order); } diff --git a/app/Http/Web/Controllers/RefundController.php b/app/Http/Web/Controllers/RefundController.php index 7c628033..02887c3b 100644 --- a/app/Http/Web/Controllers/RefundController.php +++ b/app/Http/Web/Controllers/RefundController.php @@ -7,6 +7,7 @@ use App\Services\Frontend\Refund\RefundCancel as RefundCancelService; use App\Services\Frontend\Refund\RefundConfirm as RefundConfirmService; use App\Services\Frontend\Refund\RefundCreate as RefundCreateService; use App\Services\Frontend\Refund\RefundInfo as RefundInfoService; +use Phalcon\Mvc\View; /** * @RoutePrefix("/refund") @@ -29,6 +30,7 @@ class RefundController extends Controller $confirm = $service->handle($sn); + $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); $this->view->setVar('order', $order); $this->view->setVar('confirm', $confirm); } @@ -61,6 +63,7 @@ class RefundController extends Controller $refund = $service->handle($sn); + $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); $this->view->setVar('refund', $refund); } diff --git a/app/Http/Web/Views/my/orders.volt b/app/Http/Web/Views/my/orders.volt index e4dcf658..05c3ca26 100644 --- a/app/Http/Web/Views/my/orders.volt +++ b/app/Http/Web/Views/my/orders.volt @@ -20,6 +20,7 @@ {% if pager.total_pages > 0 %}
{% for item in pager.items %} + {% set order_info_url = url({'for':'web.order.info'},{'sn':item.sn}) %}
编号：{{ item.sn }} @@ -30,7 +31,7 @@
{{ '￥%0.2f'|format(item.amount) }}
{{ order_status(item.status) }}
- 详情 + 详情
@@ -41,4 +42,10 @@
+{% endblock %} + +{% block include_js %} + + {{ js_include('web/js/my.js') }} + {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/my/refunds.volt b/app/Http/Web/Views/my/refunds.volt index eb169992..36fad6b0 100644 --- a/app/Http/Web/Views/my/refunds.volt +++ b/app/Http/Web/Views/my/refunds.volt @@ -20,6 +20,7 @@ {% if pager.total_pages > 0 %}
{% for item in pager.items %} + {% set refund_info_url = url({'for':'web.refund.info'},{'sn':item.sn}) %}
编号：{{ item.sn }} @@ -30,7 +31,7 @@
{{ '￥%0.2f'|format(item.amount) }}
{{ refund_status(item.status) }}
- 详情 + 详情
@@ -41,4 +42,10 @@
+{% endblock %} + +{% block include_js %} + + {{ js_include('web/js/my.js') }} + {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/order/info.volt b/app/Http/Web/Views/order/info.volt index cdc4d141..b91d0d81 100644 --- a/app/Http/Web/Views/order/info.volt +++ b/app/Http/Web/Views/order/info.volt @@ -1,44 +1,43 @@ -{% extends 'templates/full.volt' %} +{% extends 'templates/layer.volt' %} {% block content %} {{ partial('partials/macro_order') }} -
- 首页 - 我的订单 - 订单详情 - {{ order.subject }} + {% set order_pay_url = url({'for':'web.order.pay'},{'sn':order.sn}) %} + {% set refund_confirm_url = url({'for':'web.refund.confirm'},{'sn':order.sn}) %} + + + + + + + + + +
+ 订单金额：{{ '￥%0.2f'|format(order.amount) }} + 订单状态：{{ order_status(order.status) }} +
{{ item_info(order) }}{{ status_history(order.status_history) }}
+
+
+ {% if order.status == 'pending' %} + 立即支付 + {% endif %} + {% if (order.item_type in ['course','package']) and (order.status == 'finished') %} + 申请退款 + {% endif %}
-
- - - - - - - - - - - - - - - -
基本信息订单金额订单类型订单状态流转时间
{{ item_info(order) }}{{ '￥%0.2f'|format(order.amount) }}{{ item_type(order.item_type) }}{{ order_status(order.status) }}{{ status_history(order.status_history) }}
-
-
- 返回上页 - {% if order.status == 'pending' %} - 立即支付 - {% endif %} - {% if (order.item_type in ['course','package']) and (order.status == 'finished') %} - 申请退款 - {% endif %} -
-
-
+{% endblock %} + +{% block inline_js %} + + {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/order/pay.volt b/app/Http/Web/Views/order/pay.volt index a42d0331..e2775dfe 100644 --- a/app/Http/Web/Views/order/pay.volt +++ b/app/Http/Web/Views/order/pay.volt @@ -16,8 +16,8 @@
{% set create_url = url({'for':'web.trade.create'}) %} {% set status_url = url({'for':'web.trade.status'}) %} - - + +
友情提示：请在12小时内完成支付，有问题请联系客服 @@ -38,55 +38,8 @@ {% endblock %} -{% block inline_js %} +{% block include_js %} - + {{ js_include('web/js/order.pay.js') }} {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/partials/macro_order.volt b/app/Http/Web/Views/partials/macro_order.volt index 7bbac80d..fac79670 100644 --- a/app/Http/Web/Views/partials/macro_order.volt +++ b/app/Http/Web/Views/partials/macro_order.volt @@ -1,39 +1,36 @@ {%- macro item_info(order) %} {% if order.item_type == 'course' %} {% set course = order.item_info.course %} - {% set course_url = url({'for':'web.course.show','id':course.id}) %}
-

课程名称：{{ course.title }}

+

课程名称：{{ course.title }}

市场价格：{{ '￥%0.2f'|format(course.market_price) }}会员价格：{{ '￥%0.2f'|format(course.vip_price) }}

-

学习期限：{{ date('Y-m-d H:i:s',course.study_expiry_time) }}退款期限：{{ date('Y-m-d H:i:s',course.refund_expiry_time) }}

+

学习期限：{{ date('Y-m-d',course.study_expiry_time) }}退款期限：{{ date('Y-m-d',course.refund_expiry_time) }}

{% elseif order.item_type == 'package' %} {% set courses = order.item_info.courses %} {% for course in courses %} - {% set course_url = url({'for':'web.course.show','id':course.id}) %}
-

课程名称：{{ course.title }}

+

课程名称：{{ course.title }}

市场价格：{{ '￥%0.2f'|format(course.market_price) }}会员价格：{{ '￥%0.2f'|format(course.vip_price) }}

-

学习期限：{{ date('Y-m-d H:i:s',course.study_expiry_time) }}退款期限：{{ date('Y-m-d H:i:s',course.refund_expiry_time) }}

+

学习期限：{{ date('Y-m-d',course.study_expiry_time) }}退款期限：{{ date('Y-m-d',course.refund_expiry_time) }}

{% endfor %} {% elseif order.item_type == 'vip' %} {% set vip = order.item_info.vip %}
-

商品名称：{{ order.subject }}

+

商品名称：{{ order.subject }}

商品价格：{{ '￥%0.2f'|format(order.amount) }}

{% elseif order.item_type == 'reward' %} {% set course = order.item_info.course %} {% set reward = order.item_info.reward %} - {% set course_url = url({'for':'web.course.show','id':course.id}) %}
-

课程名称：{{ course.title }}

+

课程名称：{{ course.title }}

赞赏金额：{{ '￥%0.2f'|format(reward.price) }}

{% elseif order.item_type == 'test' %}
-

商品名称：{{ order.subject }}

+

商品名称：{{ order.subject }}

商品价格：{{ '￥%0.2f'|format(order.amount) }}

{% endif %} @@ -53,20 +50,6 @@ {% endfor %} {%- endmacro %} -{%- macro item_type(value) %} - {% if value == 'course' %} - 课程 - {% elseif value == 'package' %} - 套餐 - {% elseif value == 'vip' %} - 会员 - {% elseif value == 'reward' %} - 赞赏 - {% elseif value == 'test' %} - 测试 - {% endif %} -{%- endmacro %} - {%- macro order_status(value) %} {% if value == 'pending' %} 待支付 diff --git a/app/Http/Web/Views/refund/confirm.volt b/app/Http/Web/Views/refund/confirm.volt index 86a5ab2b..d31a6459 100644 --- a/app/Http/Web/Views/refund/confirm.volt +++ b/app/Http/Web/Views/refund/confirm.volt @@ -1,50 +1,43 @@ -{% extends 'templates/full.volt' %} +{% extends 'templates/layer.volt' %} {% block content %} {%- macro item_info(confirm) %} {% if confirm.item_type == 'course' %} {% set course = confirm.item_info.course %} - {% set course_url = url({'for':'web.course.show','id':course.id}) %} + {% set expiry_flag = course.refund_expiry_time < time() ? '（已过期）' : '' %}
-

课程名称：{{ course.title }}

-

退款期限：{{ date('Y-m-d H:i:s',course.refund_expiry_time) }}

+

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

{% elseif confirm.item_type == 'package' %} {% set courses = confirm.item_info.courses %} {% for course in courses %} - {% set course_url = url({'for':'web.course.show','id':course.id}) %} + {% set expiry_flag = course.refund_expiry_time < time() ? '（已过期）' : '' %}
-

课程名称：{{ course.title }}

-

退款期限：{{ date('Y-m-d H:i:s',course.refund_expiry_time) }}

+

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

{% endfor %} {% endif %} {%- endmacro %} -
- 首页 - 我的订单 - 确认退款 - {{ order.subject }} -
- -
- - - - - - - - - - - -
订单编号：{{ order.sn }}订单金额退款金额
{{ item_info(confirm) }}{{ '￥%0.2f'|format(order.amount) }}{{ '￥%0.2f'|format(confirm.refund_amount) }}
-
+ + + + + + + + + + + +
退款项目退款金额订单金额
{{ item_info(confirm) }}{{ '￥%0.2f'|format(confirm.refund_amount) }}{{ '￥%0.2f'|format(order.amount) }}
+
+ {% if confirm.refund_amount > 0 %}
@@ -54,11 +47,23 @@

-
-
+ {% else %} +
没有符合条件的退款项目
+ {% endif %} + +{% endblock %} + +{% block inline_js %} + + {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/refund/info.volt b/app/Http/Web/Views/refund/info.volt index 4ce387ec..71055291 100644 --- a/app/Http/Web/Views/refund/info.volt +++ b/app/Http/Web/Views/refund/info.volt @@ -1,41 +1,30 @@ -{% extends 'templates/full.volt' %} +{% extends 'templates/layer.volt' %} {% block content %} {{ partial('partials/macro_refund') }} -
- 首页 - 我的退款 - 退款详情 - {{ refund.subject }} -
+ {% set cancel_url = url({'for':'web.refund.cancel'}) %} -
- - - - - - - - - - - - - - - -
退款项目订单金额退款金额退款状态流转时间
{{ refund.subject }}{{ '￥%0.2f'|format(refund.order.amount) }}{{ '￥%0.2f'|format(refund.amount) }}{{ refund_status(refund.status) }}{{ status_history(refund.status_history) }}
-
-
- - {% if refund.status == 'approved' %} - - {% endif %} -
-
+ + + + + + + + +
+ 订单金额：{{ '￥%0.2f'|format(refund.order.amount) }} + 退款金额：{{ '￥%0.2f'|format(refund.amount) }} + 退款状态：{{ refund_status(refund.status) }} +
{{ refund.subject }}{{ status_history(refund.status_history) }}
+
+
+ + {% if refund.status == 'approved' %} + + {% endif %}
{% endblock %} @@ -43,30 +32,30 @@ {% block inline_js %} diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index 002d3cf8..29ea2a50 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -1405,18 +1405,39 @@ body { margin-right: 30px; } -.kg-table p { +.order-table { + margin: 0; +} + +.order-table p { line-height: 1.8em; } +.order-table span { + margin-right: 10px; +} + .order-table .price { color: red; } +.order-item { + padding-bottom: 10px; + margin-bottom: 10px; + border-bottom: 1px solid #e6e6e6; +} + +.order-item:last-child { + padding-bottom: 0; + margin-bottom: 0; + border-bottom: none; +} + .order-card { padding: 15px; margin-bottom: 20px; background-color: white; + color: #666; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05); } @@ -1430,17 +1451,6 @@ body { margin-right: 10px; } -.order-card .header .sn { - color: #666; -} - -.order-card .header .time { - color: #666; -} - -.order-card .body { -} - .order-card .column { float: left; line-height: 40px; diff --git a/public/static/web/js/my.js b/public/static/web/js/my.js new file mode 100644 index 00000000..a5154ba4 --- /dev/null +++ b/public/static/web/js/my.js @@ -0,0 +1,45 @@ +layui.use(['jquery', 'layer', 'helper'], function () { + + var $ = layui.jquery; + var layer = layui.layer; + var helper = layui.helper; + + /** + * 订单详情 + */ + $('.btn-order-info').on('click', function () { + var url = $(this).data('url'); + layer.open({ + type: 2, + title: '订单详情', + content: [url, 'no'], + area: '800px', + offset: '200px' + }); + }); + + /** + * 退款详情 + */ + $('.btn-refund-info').on('click', function () { + var url = $(this).data('url'); + layer.open({ + type: 2, + title: '退款详情', + content: [url, 'no'], + area: '800px', + offset: '200px' + }); + }); + + if ($('#tab-courses').length > 0) { + var $tabCourses = $('#tab-courses'); + helper.ajaxLoadHtml($tabCourses.data('url'), $tabCourses.attr('id')); + } + + if ($('#tab-users').length > 0) { + var $tabUsers = $('#tab-users'); + helper.ajaxLoadHtml($tabUsers.data('url'), $tabUsers.attr('id')); + } + +}); \ No newline at end of file diff --git a/public/static/web/js/order.pay.js b/public/static/web/js/order.pay.js new file mode 100644 index 00000000..0f21193c --- /dev/null +++ b/public/static/web/js/order.pay.js @@ -0,0 +1,52 @@ +layui.use(['jquery', 'layer'], function () { + + var $ = layui.jquery; + var layer = layui.layer; + + $('.btn-pay').on('click', function () { + var channel = $(this).data('channel'); + var createUrl = $('input[name=trade_create_url]').val(); + var statusUrl = $('input[name=trade_status_url]').val(); + var forwardUrl = $('input[name=forward_url]').val(); + var orderSn = $('input[name=order_sn]').val(); + var $qrBox = $('#' + channel + '-qr-box'); + var $snInput = $('input[name=' + channel + '_trade_sn]'); + var qrTitle = channel === 'alipay' ? '支付宝扫码支付' : '微信扫码支付'; + var qrHtml = $qrBox.html(); + if (qrHtml.length === 0) { + var postData = {order_sn: orderSn, channel: channel}; + $.post(createUrl, postData, function (res) { + qrHtml = '
支付二维码
'; + showQrLayer(qrTitle, qrHtml); + $qrBox.html(qrHtml); + $snInput.html(res.sn); + var interval = setInterval(function () { + var queryData = {sn: res.sn}; + $.get(statusUrl, queryData, function (res) { + if (res.status === 'finished') { + clearInterval(interval); + var html = '
支付成功
'; + $('#pay-layer').html(html); + setTimeout(function () { + window.location.href = forwardUrl; + }, 5000); + } + }); + }, 3000) + }); + } else { + showQrLayer(qrTitle, qrHtml); + } + }); + + function showQrLayer(title, content) { + layer.open({ + type: 1, + id: 'pay-layer', + title: title, + content: content, + area: ['640px', '320px'] + }) + } + +}); \ No newline at end of file