From 4975d1e68f378623bc9bf7e06ca8f6ec24888d79 Mon Sep 17 00:00:00 2001 From: devil Date: Mon, 8 Jun 2020 17:31:16 +0800 Subject: [PATCH] =?UTF-8?q?=20=E8=AE=A2=E5=8D=95=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/Orderaftersale.php | 80 ++- application/admin/form/Order.php | 1 - application/admin/form/Orderaftersale.php | 301 +++++++++++ .../admin/view/default/order/index.html | 110 +++- .../view/default/orderaftersale/detail.html | 42 +- .../view/default/orderaftersale/index.html | 491 ++++-------------- .../default/orderaftersale/module/info.html | 24 + .../orderaftersale/module/operate.html | 35 ++ .../default/orderaftersale/module/user.html | 14 + .../orderaftersale/module/voucher.html | 14 + application/service/OrderAftersaleService.php | 2 +- public/static/admin/default/css/order.css | 9 - .../admin/default/css/orderaftersale.css | 28 - 13 files changed, 646 insertions(+), 505 deletions(-) create mode 100644 application/admin/form/Orderaftersale.php create mode 100644 application/admin/view/default/orderaftersale/module/info.html create mode 100644 application/admin/view/default/orderaftersale/module/operate.html create mode 100644 application/admin/view/default/orderaftersale/module/user.html create mode 100644 application/admin/view/default/orderaftersale/module/voucher.html diff --git a/application/admin/controller/Orderaftersale.php b/application/admin/controller/Orderaftersale.php index 081e12d1c..183f92e42 100644 --- a/application/admin/controller/Orderaftersale.php +++ b/application/admin/controller/Orderaftersale.php @@ -52,47 +52,35 @@ class Orderaftersale extends Common */ public function Index() { - // 参数 - $params = input(); - $params['user_type'] = 'admin'; - - // 分页 - $number = MyC('admin_page_number', 10, true); - - // 条件 - $where = OrderAftersaleService::OrderAftersaleListWhere($params); - - // 获取总数 - $total = OrderAftersaleService::OrderAftersaleTotal($where); + // 总数 + $total = OrderAftersaleService::OrderAftersaleTotal($this->form_where); // 分页 $page_params = array( - 'number' => $number, + 'number' => $this->page_size, 'total' => $total, - 'where' => $params, - 'page' => isset($params['page']) ? intval($params['page']) : 1, + 'where' => $this->data_request, + 'page' => $this->page, 'url' => MyUrl('admin/orderaftersale/index'), ); $page = new \base\Page($page_params); - $this->assign('page_html', $page->GetPageHtml()); - // 获取列表 - $data_params = array( - 'm' => $page->GetPageStarNumber(), - 'n' => $number, - 'where' => $where, - 'is_public' => 0, - ); - $data = OrderAftersaleService::OrderAftersaleList($data_params); - $this->assign('data_list', $data['data']); + // 获取数据列表 + $data_params = [ + 'where' => $this->form_where, + 'm' => $page->GetPageStarNumber(), + 'n' => $this->page_size, + 'is_public' => 0, + ]; + $ret = OrderAftersaleService::OrderAftersaleList($data_params); // 静态数据 - $this->assign('common_order_aftersale_type_list', lang('common_order_aftersale_type_list')); - $this->assign('common_order_aftersale_status_list', lang('common_order_aftersale_status_list')); $this->assign('common_order_aftersale_refundment_list', lang('common_order_aftersale_refundment_list')); // 参数 - $this->assign('params', $params); + $this->assign('params', $this->data_request); + $this->assign('page_html', $page->GetPageHtml()); + $this->assign('data_list', $ret['data']); return $this->fetch(); } @@ -105,26 +93,24 @@ class Orderaftersale extends Common */ public function Detail() { - // 参数 - $params = input(); - $params['user_type'] = 'admin'; + if(!empty($this->data_request['id'])) + { + // 条件 + $where = [ + ['id', '=', intval($this->data_request['id'])], + ]; - // 条件 - $where = OrderAftersaleService::OrderAftersaleListWhere($params); - - // 获取列表 - $data_params = array( - 'm' => 0, - 'n' => 1, - 'where' => $where, - 'is_public' => 0, - ); - $ret = OrderAftersaleService::OrderAftersaleList($data_params); - $data = (empty($ret['data']) || empty($ret['data'][0])) ? [] : $ret['data'][0]; - $this->assign('data', $data); - - // 参数 - $this->assign('params', $params); + // 获取列表 + $data_params = array( + 'm' => 0, + 'n' => 1, + 'where' => $where, + 'is_public' => 0, + ); + $ret = OrderAftersaleService::OrderAftersaleList($data_params); + $data = (empty($ret['data']) || empty($ret['data'][0])) ? [] : $ret['data'][0]; + $this->assign('data', $data); + } return $this->fetch(); } diff --git a/application/admin/form/Order.php b/application/admin/form/Order.php index a61ed8147..b4f1c40c5 100644 --- a/application/admin/form/Order.php +++ b/application/admin/form/Order.php @@ -44,7 +44,6 @@ class Order // 基础配置 'base' => [ 'key_field' => 'id', - 'status_field' => 'is_shelves', 'is_search' => 1, 'search_url' => MyUrl('admin/order/index'), ], diff --git a/application/admin/form/Orderaftersale.php b/application/admin/form/Orderaftersale.php new file mode 100644 index 000000000..e86c4f04b --- /dev/null +++ b/application/admin/form/Orderaftersale.php @@ -0,0 +1,301 @@ + [ + 'key_field' => 'id', + 'is_search' => 1, + 'search_url' => MyUrl('admin/orderaftersale/index'), + ], + // 表单配置 + 'form' => [ + [ + 'label' => '订单号', + 'view_type' => 'field', + 'view_key' => 'order_no', + 'width' => 170, + 'search_config' => [ + 'form_type' => 'input', + 'where_type' => '=', + ], + ], + [ + 'label' => '基础信息', + 'view_type' => 'module', + 'view_key' => 'orderaftersale/module/info', + 'grid_size' => 'lg', + 'search_config' => [ + 'form_type' => 'input', + 'form_name' => 'id', + 'where_type' => 'like', + 'where_type_custom' => 'in', + 'where_handle_custom' => 'WhereValueBaseInfo', + 'placeholder' => '请输入商品名称/型号', + ], + ], + [ + 'label' => '用户信息', + 'view_type' => 'module', + 'view_key' => 'orderaftersale/module/user', + 'grid_size' => 'sm', + 'search_config' => [ + 'form_type' => 'input', + 'form_name' => 'user_id', + 'where_type' => 'like', + 'where_type_custom' => 'in', + 'where_handle_custom' => 'WhereValueUserInfo', + 'placeholder' => '请输入用户名/昵称/手机/邮箱', + ], + ], + [ + 'label' => '状态', + 'view_type' => 'field', + 'view_key' => 'status_text', + 'width' => 120, + 'search_config' => [ + 'form_type' => 'select', + 'form_name' => 'status', + 'where_type' => 'in', + 'data' => lang('common_order_aftersale_status_list'), + 'data_key' => 'value', + 'data_name' => 'name', + 'is_multiple' => 1, + ], + ], + [ + 'label' => '申请类型', + 'view_type' => 'field', + 'view_key' => 'type_text', + 'width' => 120, + 'search_config' => [ + 'form_type' => 'select', + 'form_name' => 'type', + 'where_type' => 'in', + 'data' => lang('common_order_aftersale_type_list'), + 'data_key' => 'value', + 'data_name' => 'name', + 'is_multiple' => 1, + ], + ], + [ + 'label' => '原因', + 'view_type' => 'field', + 'view_key' => 'reason', + 'search_config' => [ + 'form_type' => 'input', + 'where_type' => 'like', + ], + ], + [ + 'label' => '退款金额(元)', + 'view_type' => 'field', + 'view_key' => 'price', + 'search_config' => [ + 'form_type' => 'section', + 'is_point' => 1, + ], + ], + [ + 'label' => '退货数量', + 'view_type' => 'field', + 'view_key' => 'number', + 'search_config' => [ + 'form_type' => 'section', + ], + ], + [ + 'label' => '退款说明', + 'view_type' => 'field', + 'view_key' => 'msg', + 'search_config' => [ + 'form_type' => 'input', + 'where_type' => 'like', + ], + ], + [ + 'label' => '退款类型', + 'view_type' => 'field', + 'view_key' => 'refundment_text', + 'width' => 120, + 'search_config' => [ + 'form_type' => 'select', + 'form_name' => 'refundment', + 'where_type' => 'in', + 'data' => lang('common_order_aftersale_refundment_list'), + 'data_key' => 'value', + 'data_name' => 'name', + 'is_multiple' => 1, + ], + ], + [ + 'label' => '凭证', + 'view_type' => 'module', + 'view_key' => 'orderaftersale/module/voucher', + 'width' => 140, + ], + [ + 'label' => '快递公司', + 'view_type' => 'field', + 'view_key' => 'express_name', + 'search_config' => [ + 'form_type' => 'input', + 'where_type' => 'like', + ], + ], + [ + 'label' => '快递单号', + 'view_type' => 'field', + 'view_key' => 'express_number', + 'search_config' => [ + 'form_type' => 'input', + 'where_type' => 'like', + ], + ], + [ + 'label' => '申请时间', + 'view_type' => 'field', + 'view_key' => 'apply_time_time', + 'search_config' => [ + 'form_type' => 'datetime', + 'form_name' => 'apply_time', + ], + ], + [ + 'label' => '确认时间', + 'view_type' => 'field', + 'view_key' => 'confirm_time_time', + 'search_config' => [ + 'form_type' => 'datetime', + 'form_name' => 'confirm_time', + ], + ], + [ + 'label' => '退货时间', + 'view_type' => 'field', + 'view_key' => 'delivery_time_time', + 'search_config' => [ + 'form_type' => 'datetime', + 'form_name' => 'delivery_time', + ], + ], + [ + 'label' => '审核时间', + 'view_type' => 'field', + 'view_key' => 'audit_time_time', + 'search_config' => [ + 'form_type' => 'datetime', + 'form_name' => 'audit_time', + ], + ], + [ + 'label' => '创建时间', + 'view_type' => 'field', + 'view_key' => 'add_time_time', + 'search_config' => [ + 'form_type' => 'datetime', + 'form_name' => 'add_time', + ], + ], + [ + 'label' => '更新时间', + 'view_type' => 'field', + 'view_key' => 'upd_time_time', + 'search_config' => [ + 'form_type' => 'datetime', + 'form_name' => 'upd_time', + ], + ], + [ + 'label' => '操作', + 'view_type' => 'operate', + 'view_key' => 'orderaftersale/module/operate', + 'align' => 'center', + 'fixed' => 'right', + ], + ], + ]; + } + + /** + * 用户信息条件处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2020-06-08 + * @desc description + * @param [string] $value [条件值] + * @param [array] $params [输入参数] + */ + public function WhereValueUserInfo($value, $params = []) + { + if(!empty($value)) + { + // 获取用户 id + $ids = Db::name('User')->where('username|nickname|mobile|email', 'like', '%'.$value.'%')->column('id'); + + // 避免空条件造成无效的错觉 + return empty($ids) ? [0] : $ids; + } + return $value; + } + + /** + * 基础信息条件处理 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2020-06-08 + * @desc description + * @param [string] $value [条件值] + * @param [array] $params [输入参数] + */ + public function WhereValueBaseInfo($value, $params = []) + { + if(!empty($value)) + { + // 获取订单详情搜索的订单售后 id + $ids = Db::name('OrderAftersale')->alias('oa')->join(['__ORDER_DETAIL__'=>'od'], 'oa.order_detail_id=od.id')->where('title|model', 'like', '%'.$value.'%')->column('oa.id'); + + // 避免空条件造成无效的错觉 + return empty($ids) ? [0] : $ids; + } + return $value; + } +} +?> \ No newline at end of file diff --git a/application/admin/view/default/order/index.html b/application/admin/view/default/order/index.html index 907d6eab9..e8609b8a3 100755 --- a/application/admin/view/default/order/index.html +++ b/application/admin/view/default/order/index.html @@ -1,2 +1,110 @@ -{{extend name="public/module/form" /}} \ No newline at end of file +{{extend name="public/module/form" /}} + + +{{block name="form_extend"}} + +
+
+
+ × +
+
+
+
+ + +
+
+ + + +
+
+
+
+
+ + +
+
+
+

发货操作

+ × +
+
+
+
+ {{if !empty($express_list)}} +
    + {{foreach $express_list as $express}} + {{if $express.is_enable eq 1}} +
  • + {{if !empty($express.icon)}} + + {{/if}} + {{$express.name}} + +
    • + {{/if}} + {{/foreach}} +
+ {{/if}} + {{if empty($express_list)}} +
没有快递方式
+ {{/if}} +
+ +
+ + +
+ +
+ + + + +
+
+
+
+
+ + +
+
+
+

支付操作

+ × +
+
+
+
+ {{if !empty($buy_payment_list)}} +
    + {{foreach $buy_payment_list as $payment}} +
  • + {{if !empty($payment.logo)}} + + {{/if}} + {{$payment.name}} + +
    • + {{/foreach}} +
+ {{/if}} + {{if empty($buy_payment_list)}} +
没有支付方式
+ {{/if}} +
+
+ + + +
+
+
+
+
+{{/block}} \ No newline at end of file diff --git a/application/admin/view/default/orderaftersale/detail.html b/application/admin/view/default/orderaftersale/detail.html index 7a76ba02e..fa7dab486 100644 --- a/application/admin/view/default/orderaftersale/detail.html +++ b/application/admin/view/default/orderaftersale/detail.html @@ -1,17 +1,18 @@ -{{include file="public/header" /}} + +{{extend name="public/module/detail" /}} - -
- {{if !empty($data)}} + +{{if !empty($data)}} + {{block name="detail_data"}}
商品信息
-
+
- + -
- {{$data.order_data.items.title}} +
+ {{$data.order_data.items.title}} {{if !empty($data.order_data.items.spec)}}
    {{foreach $data.order_data.items.spec as $spec}} @@ -21,16 +22,18 @@ {{/if}}
- {{if $data.order_data.items.original_price gt 0}} -

{{$price_symbol}}{{$data.order_data.items.original_price}}

- {{/if}} -

{{$price_symbol}}{{$data.order_data.items.price}} x {{$data.order_data.items.buy_number}}

+
+ {{if $data.order_data.items.original_price gt 0}} + {{$price_symbol}}{{$data.order_data.items.original_price}} + {{/if}} + {{$price_symbol}}{{$data.order_data.items.price}} x {{$data.order_data.items.buy_number}} +
用户信息
- {{else /}} -
没有相关数据
- {{/if}} -
- - - -{{include file="public/footer" /}} - \ No newline at end of file + {{/block}} +{{/if}} \ No newline at end of file diff --git a/application/admin/view/default/orderaftersale/index.html b/application/admin/view/default/orderaftersale/index.html index 14fd899ec..d2da26bac 100644 --- a/application/admin/view/default/orderaftersale/index.html +++ b/application/admin/view/default/orderaftersale/index.html @@ -1,402 +1,103 @@ -{{include file="public/header" /}} + +{{extend name="public/module/form" /}} - -
-
- -
-
-
- - - - -
- + +{{block name="form_extend"}} + +
+
+
+

审核操作

+ ×
- - - - - - - - - - - -
- 类型： - - - 状态： - -
- 退款： - - - - 清除条件 -
- - +
+
+
用户信息
+ +
申请信息
+
+
    +
  • 类型：...
    • +
  • 原因：...
    • +
  • 数量：...
    • +
  • 金额：...
    • +
  • 说明：...
    • +
+
+
- -
- - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} -
- plugins_view_admin_order_aftersale_top_operate -
- {{/if}} - {{php}} - $hook_name = 'plugins_view_admin_order_aftersale_top_operate'; - $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true]); - if(!empty($hook_data) && is_array($hook_data)) - { - foreach($hook_data as $hook) - { - if(is_string($hook) || is_int($hook)) - { - echo htmlspecialchars_decode($hook); - } - } - } - {{/php}} -
- +
+
+ + {{if !empty($common_order_aftersale_refundment_list)}} + {{foreach $common_order_aftersale_refundment_list as $v}} + + {{/foreach}} + {{/if}} +
- -
- - - - - - - - - - - - - - {{if !empty($data_list)}} - {{foreach $data_list as $v}} - - - - - - - - - - {{/foreach}} - {{/if}} - -
商品信息用户信息申请信息凭证状态快递信息操作
-
- {{$v.order_data.order_no}} - {{$v.order_data.order_model_name}} - {{$v.order_data.client_type_name}} -
-
-
- - - -
- {{$v.order_data.items.title}} - {{if !empty($v.order_data.items.spec)}} -
    - {{foreach $v.order_data.items.spec as $spec}} -
  • {{$spec.type}}：{{$spec.value}}
    • - {{/foreach}} -
- {{/if}} -
-
-
- {{if $v.order_data.items.original_price gt 0}} - {{$price_symbol}}{{$v.order_data.items.original_price}} - {{/if}} - {{$price_symbol}}{{$v.order_data.items.price}} x {{$v.order_data.items.buy_number}} -
- 		- 类型：{{$v.type_text}}
- 原因：{{$v.reason}}
- 数量：{{$v.number}}
- 金额：{{$price_symbol}}{{$v.price}}
- 说明：{{$v.msg}}
- 时间：{{$v.apply_time_time}} - 		- {{if !empty($v['images'])}} -
-
    - {{foreach $v.images as $img}} -
  • - - - -
    • - {{/foreach}} -
-
- {{/if}} - 		-

{{$v.status_text}}

- {{if $v['status'] eq 3 and !empty($v['refundment_text'])}} - {{$v.refundment_text}} - {{/if}} - {{if $v['status'] eq 4 and !empty($v['refuse_reason'])}} - {{$v.refuse_reason}} - {{/if}} - 		- {{if $v['type'] eq 1 and in_array($v['status'], [2,3])}} - 快递：{{$v.express_name}}
- 单号：{{$v.express_number}}
- 时间：{{$v.delivery_time_time}} - {{/if}} - 		-
- - {{if $v['status'] eq 0 and $v['type'] eq 1}} - - {{/if}} - {{if $v['status'] eq 2}} - - {{/if}} - {{if in_array($v['status'], [0,2])}} - - {{/if}} - {{if in_array($v['status'], [1,2])}} - - {{/if}} - {{if in_array($v['status'], [4,5])}} - - {{/if}} - - - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} -
- plugins_view_admin_orderaftersale_list_operate -
- {{/if}} - {{php}} - $hook_name = 'plugins_view_admin_orderaftersale_list_operate'; - $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true, 'id'=>$v['id'], 'data'=>$v]); - if(!empty($hook_data) && is_array($hook_data)) - { - foreach($hook_data as $hook) - { - if(is_string($hook) || is_int($hook)) - { - echo htmlspecialchars_decode($hook); - } - } - } - {{/php}} -
-
- {{if empty($data_list)}} -
没有相关数据
- {{/if}} -
- - - -
- - {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} -
- plugins_view_admin_order_aftersale_bottom_operate -
- {{/if}} - {{php}} - $hook_name = 'plugins_view_admin_order_aftersale_bottom_operate'; - $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>true]); - if(!empty($hook_data) && is_array($hook_data)) - { - foreach($hook_data as $hook) - { - if(is_string($hook) || is_int($hook)) - { - echo htmlspecialchars_decode($hook); - } - } - } - {{/php}} -
- - - -
-
-
-

审核操作

- × -
-
-
-
用户信息
- -
申请信息
-
-
    -
  • 类型：...
    • -
  • 原因：...
    • -
  • 数量：...
    • -
  • 金额：...
    • -
  • 说明：...
    • -
-
-
- - -
- - {{if !empty($common_order_aftersale_refundment_list)}} - {{foreach $common_order_aftersale_refundment_list as $v}} - - {{/foreach}} - {{/if}} -
- -
- - -
- -
+
+ + +
+
- - -
-
-
-

拒绝操作

- × -
-
-
-
用户信息
- -
申请信息
-
-
    -
  • 类型：...
    • -
  • 原因：...
    • -
  • 数量：...
    • -
  • 金额：...
    • -
  • 说明：...
    • -
-
-
- -
-
- - -
- -
- - -
-
-
-
-
- - - {{if !empty($data_list)}} - {{$page_html|raw}} - {{/if}} -
-
- - - -{{include file="public/footer" /}} - \ No newline at end of file + + +
+
+
+

拒绝操作

+ × +
+
+
+
用户信息
+ +
申请信息
+
+
    +
  • 类型：...
    • +
  • 原因：...
    • +
  • 数量：...
    • +
  • 金额：...
    • +
  • 说明：...
    • +
+
+
+ +
+
+ + +
+ +
+ + +
+
+
+
+
+{{/block}} \ No newline at end of file diff --git a/application/admin/view/default/orderaftersale/module/info.html b/application/admin/view/default/orderaftersale/module/info.html new file mode 100644 index 000000000..5c0a6ca46 --- /dev/null +++ b/application/admin/view/default/orderaftersale/module/info.html @@ -0,0 +1,24 @@ + +{{if !empty($module_data) and !empty($module_data['order_data'])}} +
+ + + +
+ {{$module_data.order_data.items.title}} + {{if !empty($module_data.order_data.items.spec)}} +
    + {{foreach $module_data.order_data.items.spec as $spec}} +
  • {{$spec.type}}：{{$spec.value}}
    • + {{/foreach}} +
+ {{/if}} +
+
+
+ {{if $module_data.order_data.items.original_price gt 0}} + {{$price_symbol}}{{$module_data.order_data.items.original_price}} + {{/if}} + {{$price_symbol}}{{$module_data.order_data.items.price}} x {{$module_data.order_data.items.buy_number}} +
+{{/if}} \ No newline at end of file diff --git a/application/admin/view/default/orderaftersale/module/operate.html b/application/admin/view/default/orderaftersale/module/operate.html new file mode 100644 index 000000000..b5dbe25b8 --- /dev/null +++ b/application/admin/view/default/orderaftersale/module/operate.html @@ -0,0 +1,35 @@ + + +{{if $module_data['status'] eq 0 and $module_data['type'] eq 1}} + +{{/if}} +{{if $module_data['status'] eq 2}} + +{{/if}} +{{if in_array($module_data['status'], [0,2])}} + +{{/if}} +{{if in_array($module_data['status'], [1,2])}} + +{{/if}} +{{if in_array($module_data['status'], [4,5])}} + +{{/if}} \ No newline at end of file diff --git a/application/admin/view/default/orderaftersale/module/user.html b/application/admin/view/default/orderaftersale/module/user.html new file mode 100644 index 000000000..b6784522a --- /dev/null +++ b/application/admin/view/default/orderaftersale/module/user.html @@ -0,0 +1,14 @@ + +{{if !empty($module_data)}} + {{if !empty($module_data['user'])}} + {{$module_data.user.user_name_view}} +
    +
  • 名称：{{if empty($module_data['user']['username'])}}未填写{{else /}}{{$module_data.user.username}}{{/if}}
    • +
  • 昵称：{{if empty($module_data['user']['nickname'])}}未填写{{else /}}{{$module_data.user.nickname}}{{/if}}
    • +
  • 手机：{{if empty($module_data['user']['mobile'])}}未填写{{else /}}{{$module_data.user.mobile}}{{/if}}
    • +
  • 邮箱：{{if empty($module_data['user']['email'])}}未填写{{else /}}{{$module_data.user.email}}{{/if}}
    • +
+ {{else /}} + 用户信息异常 + {{/if}} +{{/if}} \ No newline at end of file diff --git a/application/admin/view/default/orderaftersale/module/voucher.html b/application/admin/view/default/orderaftersale/module/voucher.html new file mode 100644 index 000000000..1c31a2445 --- /dev/null +++ b/application/admin/view/default/orderaftersale/module/voucher.html @@ -0,0 +1,14 @@ + +{{if !empty($module_data) and !empty($module_data['images'])}} +
+
    + {{foreach $module_data.images as $img}} +
  • + + + +
    • + {{/foreach}} +
+
+{{/if}} \ No newline at end of file diff --git a/application/service/OrderAftersaleService.php b/application/service/OrderAftersaleService.php index ad13d0d9b..d0842af48 100644 --- a/application/service/OrderAftersaleService.php +++ b/application/service/OrderAftersaleService.php @@ -415,7 +415,7 @@ class OrderAftersaleService $v['status_text'] = array_key_exists($v['status'], $status_list) ? $status_list[$v['status']]['name'] : ''; // 退款方式 - $v['refundment_text'] = array_key_exists($v['refundment'], $refundment_list) ? $refundment_list[$v['refundment']]['name'] : ''; + $v['refundment_text'] = ($v['status'] == 3 && array_key_exists($v['refundment'], $refundment_list)) ? $refundment_list[$v['refundment']]['name'] : ''; // 图片 if(!empty($v['images'])) diff --git a/public/static/admin/default/css/order.css b/public/static/admin/default/css/order.css index 8fc2f83fb..d4d45f62a 100755 --- a/public/static/admin/default/css/order.css +++ b/public/static/admin/default/css/order.css @@ -17,15 +17,6 @@ .business-item ul li:nth-child(2n) { margin-right: 0; } } -/** - * 用户信息 - */ -.user-info img { - max-width: 35px; - max-height: 35px; - margin: 0 5px 2px 0; -} - /** * 虚拟销售-密钥信息 */ diff --git a/public/static/admin/default/css/orderaftersale.css b/public/static/admin/default/css/orderaftersale.css index 71aec32ef..046d2e3ec 100644 --- a/public/static/admin/default/css/orderaftersale.css +++ b/public/static/admin/default/css/orderaftersale.css @@ -1,41 +1,13 @@ /** * 商品列表 */ -.goods-detail img { width: 60px; height: 60px; position: absolute; left: 0; } -.goods-detail { position: relative; min-height: 65px; overflow: hidden; } -.goods-title { max-height: 36px; height: auto; } -.goods-base {float: left; top: 0; margin-left: 65px; } .goods-spec li { color: #888; line-height: 16px; } .original-price { color: #9c9c9c; text-decoration: line-through; } -/** - * 用户信息 - */ -.user-info img { - max-width: 35px; - max-height: 35px; - margin: 0 5px 2px 0; -} - /** * 列表 */ -@media only screen and (min-width:640px) { - table.am-table tr .row-goods { width: 25%; } - table.am-table tr .row-user-info { width: 15%; } - table.am-table tr .row-apply { width: 25%; } - table.am-table tr .row-more { width: 80px; } - table.am-table tr .row-operation { width: 85px; } -} -@media only screen and (max-width:640px) { - table.am-table tr .row-apply { width: 50%; } - table.am-table tr .row-operation, table.am-table tr .row-more { width: 75px; } -} - table.am-table .am-slider { - width: 100px; - max-height: 108px; - overflow: hidden; box-shadow: none; -webkit-box-shadow: none; }