xieruidong 2 年之前
父节点
当前提交
ab05806aaa
共有 2 个文件被更改,包括 13 次插入2 次删除
  1. 1 1
      application/admin/controller/Orders.php
  2. 12 1
      public/assets/js/backend/orders.js

+ 1 - 1
application/admin/controller/Orders.php

@@ -61,7 +61,7 @@ class Orders extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $filter=json_decode(input('filter'));
             $list = $this->model
-                ->with(['user','logistics','voucher','admin','info'])
+                ->with(['user','logistics','voucher','admin','info','info.refund'])
                     ->where($where)
                 ->where(function (Query $query){
                     if($this->admin('is_seller')){

+ 12 - 1
public/assets/js/backend/orders.js

@@ -33,7 +33,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             /*if(status===0 && order.voucher && order.voucher.status===0){
                                 return `<span class="label label-default">待审核</span>`
                             }*/
-                            return Table.api.formatter.status.call(this,status,order,index)
+                            let s=Table.api.formatter.status.call(this,status,order,index)
+
+                                let info=[]
+                                order.info.forEach(item=>{
+                                    if(item.refund && item.refund.is_pass && info.indexOf(item.refund.refund_type_text)===-1){
+                                        info.push(item.refund.refund_type_text)
+                                    }
+                                })
+                                if(info.length){
+                                    s+=`<div><a class="text-danger">${info.join(',')}</a></div>`
+                                }
+                                return s
                         },searchList:status},
                         {field: 'user.nickname', title: __('下单用户')},
                         {field: 'info', title: __('商品信息'),operate: false,formatter(info, order, index) {