123

@@ -58,7 +58,7 @@ class Order extends Backend
                     ->paginate($limit);
 
             foreach ($list as $row) {
-                $row->visible(['id','order_no','type','price','is_pay','user_name','driver_name','pay_time','refund_time','create_time']);
+                $row->visible(['id','order_no','type','pay_type','price','is_pay','user_name','driver_name','pay_time','refund_time','create_time']);
                 $row->visible(['driver']);
 				$row->getRelation('driver')->visible(['name']);
 				$row->visible(['car']);

@@ -981,6 +981,7 @@ class Car extends Base
             "is_pay"=>"2",//未支付
             "route_id"=>$route_id,
             "user_id"=>$this->auth->id,
+            "driver_id"=>$driver['id'],
             "phone"=>$phone,
             "create_time"=>time(),
             "reservation_time"=>time(),
@@ -1032,6 +1033,7 @@ class Car extends Base
             "reservation_time"=>$reservation_time,
             "is_pay"=>"1",//未支付
             "route_id"=>$route_id,
+            "driver_id"=>$driver['id'],
             "user_id"=>$this->auth->id,
             "phone"=>$phone,
             "pay_type"=>"offlinepay",

@@ -32,7 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'price', title: __('Price'), operate:'BETWEEN'},
                         {field: 'is_pay', title: __('Is_pay'), searchList: {"1":__('Is_pay 1'),"2":__('Is_pay 2'),"3":__('Is_pay 3')}, formatter: Table.api.formatter.normal},
                         {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal},
-                        {field: 'pay_type', title: __('Pay_type'), searchList: {"1":__('Pay_type wxpay'),"2":__('Pay_type offlinepay')}, formatter: Table.api.formatter.normal},
+                        {field: 'pay_type', title: __('Pay_type'), searchList: {"Wxpay":__('Pay_type wxpay'),"offlinepay":__('Pay_type offlinepay')}, formatter: Table.api.formatter.normal},
                         {field: 'pay_time', title: __('Pay_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'refund_time', title: __('Refund_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},