作者 郭文星

123

@@ -64,9 +64,11 @@ class Order extends Backend @@ -64,9 +64,11 @@ class Order extends Backend
64 ->order($sort, $order) 64 ->order($sort, $order)
65 ->paginate($limit); 65 ->paginate($limit);
66 $res=$this->model->where("id",">",0)->update(["is_check"=>1]); 66 $res=$this->model->where("id",">",0)->update(["is_check"=>1]);
67 -  
68 foreach ($list as $row) { 67 foreach ($list as $row) {
69 $row->visible(['id', 'order_no','phone', 'type','intended_driver_id', 'pay_type', 'price', 'is_pay', 'user_name', 'driver_name', 'pay_time', 'refund_time','reservation_time', 'create_time']); 68 $row->visible(['id', 'order_no','phone', 'type','intended_driver_id', 'pay_type', 'price', 'is_pay', 'user_name', 'driver_name', 'pay_time', 'refund_time','reservation_time', 'create_time']);
  69 + if(!$row['driver_name']){
  70 + $row['driver_name']="未选择司机";
  71 + }
70 $row->visible(['driver']); 72 $row->visible(['driver']);
71 $row->getRelation('driver')->visible(['name']); 73 $row->getRelation('driver')->visible(['name']);
72 $row->visible(['car']); 74 $row->visible(['car']);
@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function @@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
28 [ 28 [
29 {checkbox: true}, 29 {checkbox: true},
30 {field: 'id', title: __('Id')}, 30 {field: 'id', title: __('Id')},
  31 + {field: 'driver_name', title: __('Driver_name')},
31 { 32 {
32 field: 'order_no', 33 field: 'order_no',
33 title: __('Order_no'), 34 title: __('Order_no'),