郭文星 / wyc.tenyes.cn · 提交

转到一个项目

作者 郭文星
提交 39a2d773cc1019222f3db265224affb2974408c9 1 个父辈 5541a1cc

123

内嵌 并排对比
正在显示 3 个修改的文件 包含 4 行增加 和 2 行删除
@@ -58,7 +58,7 @@ class Order extends Backend @@ -58,7 +58,7 @@ class Order extends Backend
58 ->paginate($limit); 58 ->paginate($limit);
59 59
60 foreach ($list as $row) { 60 foreach ($list as $row) {
61 - $row->visible(['id','order_no','type','price','is_pay','user_name','driver_name','pay_time','refund_time','create_time']); 61 + $row->visible(['id','order_no','type','pay_type','price','is_pay','user_name','driver_name','pay_time','refund_time','create_time']);
62 $row->visible(['driver']); 62 $row->visible(['driver']);
63 $row->getRelation('driver')->visible(['name']); 63 $row->getRelation('driver')->visible(['name']);
64 $row->visible(['car']); 64 $row->visible(['car']);
@@ -981,6 +981,7 @@ class Car extends Base @@ -981,6 +981,7 @@ class Car extends Base
981 "is_pay"=>"2",//未支付 981 "is_pay"=>"2",//未支付
982 "route_id"=>$route_id, 982 "route_id"=>$route_id,
983 "user_id"=>$this->auth->id, 983 "user_id"=>$this->auth->id,
  984 + "driver_id"=>$driver['id'],
984 "phone"=>$phone, 985 "phone"=>$phone,
985 "create_time"=>time(), 986 "create_time"=>time(),
986 "reservation_time"=>time(), 987 "reservation_time"=>time(),
@@ -1032,6 +1033,7 @@ class Car extends Base @@ -1032,6 +1033,7 @@ class Car extends Base
1032 "reservation_time"=>$reservation_time, 1033 "reservation_time"=>$reservation_time,
1033 "is_pay"=>"1",//未支付 1034 "is_pay"=>"1",//未支付
1034 "route_id"=>$route_id, 1035 "route_id"=>$route_id,
  1036 + "driver_id"=>$driver['id'],
1035 "user_id"=>$this->auth->id, 1037 "user_id"=>$this->auth->id,
1036 "phone"=>$phone, 1038 "phone"=>$phone,
1037 "pay_type"=>"offlinepay", 1039 "pay_type"=>"offlinepay",
@@ -32,7 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -32,7 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
32 {field: 'price', title: __('Price'), operate:'BETWEEN'}, 32 {field: 'price', title: __('Price'), operate:'BETWEEN'},
33 {field: 'is_pay', title: __('Is_pay'), searchList: {"1":__('Is_pay 1'),"2":__('Is_pay 2'),"3":__('Is_pay 3')}, formatter: Table.api.formatter.normal}, 33 {field: 'is_pay', title: __('Is_pay'), searchList: {"1":__('Is_pay 1'),"2":__('Is_pay 2'),"3":__('Is_pay 3')}, formatter: Table.api.formatter.normal},
34 {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal}, 34 {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2'),"3":__('Type 3')}, formatter: Table.api.formatter.normal},
35 - {field: 'pay_type', title: __('Pay_type'), searchList: {"1":__('Pay_type wxpay'),"2":__('Pay_type offlinepay')}, formatter: Table.api.formatter.normal}, 35 + {field: 'pay_type', title: __('Pay_type'), searchList: {"Wxpay":__('Pay_type wxpay'),"offlinepay":__('Pay_type offlinepay')}, formatter: Table.api.formatter.normal},
36 {field: 'pay_time', title: __('Pay_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, 36 {field: 'pay_time', title: __('Pay_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
37 {field: 'refund_time', title: __('Refund_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, 37 {field: 'refund_time', title: __('Refund_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
38 {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, 38 {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},