init

application/admin/controller/MobileOrder.php

@@ -62,7 +62,7 @@ class MobileOrder extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                ->with(['info','operation','operation.admin','admin','admin.admin'])
+                ->with(['info','operation','operation.admin','admin','admin.admin','refund_log','refund_log.refunduser'])
                 ->where($where)
                 ->where('type',1)
                 ->order($sort, $order)

application/common/model/MobileOrderOperation.php

@@ -18,7 +18,7 @@ class MobileOrderOperation extends Model
         'create_time_format_short',
     ];
   public function getCreateTimeFormatAttr($a,$m){
-      return date('Y-m-d H:i:s',$m['create_time']);
+      return date('m/d H:i',$m['create_time']);
   }
     public function getCreateTimeFormatShortAttr($a,$m){
         return date('m/d',$m['create_time']);

application/common/model/MobileOrderRefundLog.php

@@ -12,6 +12,9 @@ class MobileOrderRefundLog extends Model
 {
     protected $autoWriteTimestamp=true;
     protected $updateTime=null;
+    protected $append=[
+        'create_time_format',
+    ];
 
     public function refunduser(){
         return $this->morphTo('refunduser',[
@@ -47,4 +50,8 @@ class MobileOrderRefundLog extends Model
             'pass'=>$data['pass'],
         ]);
     }
+
+    public function getCreateTimeFormatAttr($a,$b){
+        return date('m/d H:i',$b['create_time']);
+    }
 }

public/assets/js/backend/mobile.js

@@ -71,7 +71,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        //{field: 'id', title: __('Id')},
+                        {field: 'id', title: __('Id')},
                         {field: 'no', title: __('手机号'), operate: "LIKE"},
                         {field: 'province', title: __('Province'),operate: 'LIKE'},
                         {field: 'city', title: __('归属地'),operate: 'LIKE'},

public/assets/js/backend/mobile_order.js

@@ -58,7 +58,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 a.push(`<div>套餐:${order.info?order.info.info.describe:''}</div>`)
                                 a.push(`<div>备注:${order.info?order.info.mobile.remark:''}</div>`)
                                 return `<div style="max-width: 200px;word-wrap: break-word;word-break: break-all;white-space: normal;text-align: left;">${a.join('')}</div>`
-                            },width:200},
+                            },width:200,valign:'top',align:'left'},
                         {field: 'order_no', title: __('收货人'),operate: false,formatter(_,order){
                                 let a=[]
                                 a.push(`<div>收货人:${order.name}</div>`)
@@ -70,24 +70,38 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 a.push(`<div>快递单号:${order.trans_no}</div>`)
                                 a.push(`<a class="btn btn-link btn-click-show-open" style="color: #00a2ff;" data-id="${order.id}" data-open="${order.open_uploaded}">查看资料</a>`)
                                 return `<div style="max-width: 200px;word-wrap: break-word;word-break: break-all;white-space: normal;text-align: left;">${a.join('')}</div>`
-                            },width:200},
+                            },width:200,valign:'top',align:'left'},
                         {field: 'status', title: __('Status'),formatter: Table.api.formatter.label,searchList:status},
-                        {field: 'remark_backend', title: __('备注'),formatter: Table.api.formatter.content,operate:false},
-                        {field: 'remark_sub', title: __('分站备注'),formatter: Table.api.formatter.content,operate:false},
+                        {field: 'remark_backend', title: __('备注'),formatter: Table.api.formatter.content,operate:false,align: 'left',valign: 'top'},
+                        //{field: 'remark_sub', title: __('分站备注'),formatter: Table.api.formatter.content,operate:false},
+                        {field: '', title: __('退款记录'),formatter(_,order){
+                                let a=[]
+                                order.refund_log.forEach(item=>{
+                                    a.push(`<div>${item.create_time_format} ${item.pass?'同意':'驳回'} ${item.reason}</div>`)
+                                })
+                                return `<div style="text-align: left;font-size: 10px;">${a.join('')}</div>`
+                            },operate:false,valign:'top',align:'left'},
+                        {field: '', title: __('操作员'),formatter(_,order){
+                                let a=[]
+                                order.admin.forEach(item=>{
+                                    a.push(`<div>${item.admin.nickname}</div>`)
+                                })
+                                return `<div style="text-align: left;font-size: 10px;">${a.join('')}</div>`
+                            },operate:false,valign:'top',align:'left'},
                         {field: '', title: __('客服记录'),formatter(_,order){
                             let a=[]
                                 order.operation.forEach(item=>{
-                                    a.push(`<div>${item.create_time_format_short} ${item.admin?item.admin.nickname:'-'} ${item.content}</div>`)
+                                    a.push(`<div>${item.create_time_format} ${item.admin?item.admin.nickname:'-'} ${item.content}</div>`)
                                 })
                                 return `<div style="text-align: left;font-size: 10px;">${a.join('')}</div>`
-                            },operate:false},
+                            },operate:false,valign:'top',align:'left'},
                         {field: '', title: __('操作员'),formatter(_,order){
                                 let a=[]
                                 order.admin.forEach(item=>{
                                     a.push(`<div>${item.admin.nickname}</div>`)
                                 })
                                 return `<div style="text-align: left;font-size: 10px;">${a.join('')}</div>`
-                            },operate:false},
+                            },operate:false,valign:'top',align:'left'},
                         {field: 'pay_link', title: __('付款链接'),formatter:Table.api.formatter.url,operate:false},
                         {field: 'create_time', title: __('Create_time'),formatter: Table.api.formatter.datetime,addClass:'datetimerange',operate: 'range'},
                         {field: 'update_time', title: __('更新时间'),formatter: Table.api.formatter.datetime,addClass:'datetimerange',operate: 'range'},