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

转到一个项目

作者 郭文星
提交 60d93646ff6dba90a21aa3c31095c0d0e637a531 1 个父辈 f2740569

123

内嵌 并排对比
正在显示 7 个修改的文件 包含 13 行增加 和 43 行删除
@@ -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','price','is_pay','user_name','driver_name','pay_time','refund_time','create_time']); 61 + $row->visible(['id','order_no','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']);
@@ -8,6 +8,13 @@ return [ @@ -8,6 +8,13 @@ return [
8 'Is_pay 1' => '已支付', 8 'Is_pay 1' => '已支付',
9 'Is_pay 2' => '未支付', 9 'Is_pay 2' => '未支付',
10 'Is_pay 3' => '已退款', 10 'Is_pay 3' => '已退款',
  11 + 'Type' => '订单类型',
  12 + 'Type 1' => '计票',
  13 + 'Type 2' => '城际',
  14 + 'Pay_type' => '支付类型',
  15 + 'Pay_type wxpay' => '微信支付',
  16 + 'Pay_type offlinepay' => '线下支付',
  17 + 'Type 3' => '包车',
11 'Car_id' => '订单车辆', 18 'Car_id' => '订单车辆',
12 'User_id' => '乘车人', 19 'User_id' => '乘车人',
13 'User_name' => '乘车人姓名', 20 'User_name' => '乘车人姓名',
@@ -18,24 +18,7 @@ @@ -18,24 +18,7 @@
18 <input id="c-end_address" class="form-control" name="row[end_address]" type="text"> 18 <input id="c-end_address" class="form-control" name="row[end_address]" type="text">
19 </div> 19 </div>
20 </div> 20 </div>
21 - <div class="form-group">  
22 - <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>  
23 - <div class="col-xs-12 col-sm-8">  
24 -  
25 - <select id="c-type" class="form-control selectpicker" name="row[type]">  
26 - {foreach name="typeList" item="vo"}  
27 - <option value="{$key}" {in name="key" value=""}selected{/in}>{$vo}</option>  
28 - {/foreach}  
29 - </select>  
30 21
31 - </div>  
32 - </div>  
33 - <div class="form-group">  
34 - <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>  
35 - <div class="col-xs-12 col-sm-8">  
36 - <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number">  
37 - </div>  
38 - </div>  
39 <div class="form-group"> 22 <div class="form-group">
40 <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label> 23 <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
41 <div class="col-xs-12 col-sm-8"> 24 <div class="col-xs-12 col-sm-8">
@@ -18,24 +18,7 @@ @@ -18,24 +18,7 @@
18 <input id="c-end_address" class="form-control" name="row[end_address]" type="text" value="{$row.end_address|htmlentities}"> 18 <input id="c-end_address" class="form-control" name="row[end_address]" type="text" value="{$row.end_address|htmlentities}">
19 </div> 19 </div>
20 </div> 20 </div>
21 - <div class="form-group">  
22 - <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>  
23 - <div class="col-xs-12 col-sm-8">  
24 -  
25 - <select id="c-type" class="form-control selectpicker" name="row[type]">  
26 - {foreach name="typeList" item="vo"}  
27 - <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>  
28 - {/foreach}  
29 - </select>  
30 21
31 - </div>  
32 - </div>  
33 - <div class="form-group">  
34 - <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>  
35 - <div class="col-xs-12 col-sm-8">  
36 - <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">  
37 - </div>  
38 - </div>  
39 <div class="form-group"> 22 <div class="form-group">
40 <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label> 23 <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
41 <div class="col-xs-12 col-sm-8"> 24 <div class="col-xs-12 col-sm-8">
@@ -976,6 +976,7 @@ class Car extends Base @@ -976,6 +976,7 @@ class Car extends Base
976 $data=[ 976 $data=[
977 "order_no"=>getOrderSn(), 977 "order_no"=>getOrderSn(),
978 "price"=>$price, 978 "price"=>$price,
  979 + "driver_id"=>$driver['id'],
979 "reservation_time"=>$reservation_time, 980 "reservation_time"=>$reservation_time,
980 "is_pay"=>"2",//未支付 981 "is_pay"=>"2",//未支付
981 "route_id"=>$route_id, 982 "route_id"=>$route_id,
@@ -1085,8 +1086,8 @@ class Car extends Base @@ -1085,8 +1086,8 @@ class Car extends Base
1085 ->field("a.*,b.start_address,b.end_address") 1086 ->field("a.*,b.start_address,b.end_address")
1086 ->where("driver_id",$driver["id"]) 1087 ->where("driver_id",$driver["id"])
1087 ->where("is_qrcode",1) 1088 ->where("is_qrcode",1)
1088 - ->where("create_time",">",$start_time)  
1089 - ->where("create_time","<",$end_time) 1089 + ->where("a.create_time",">",$start_time)
  1090 + ->where("a.create_time","<",$end_time)
1090 ->page($page,$total) 1091 ->page($page,$total)
1091 ->select(); 1092 ->select();
1092 $amount=Db::name("order") 1093 $amount=Db::name("order")
@@ -31,13 +31,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -31,13 +31,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
31 {field: 'order_no', title: __('Order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, 31 {field: 'order_no', title: __('Order_no'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
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: 'user_name', title: __('User_name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},  
35 - {field: 'driver_name', title: __('Driver_name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, 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},
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},
39 - {field: 'driver.name', title: __('Driver.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},  
40 - {field: 'car.license_plate', title: __('Car.license_plate'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},  
41 {field: 'user.username', title: __('User.username'), operate: 'LIKE'}, 39 {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
42 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate, 40 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,
43 buttons:[ 41 buttons:[
@@ -29,8 +29,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -29,8 +29,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
29 {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, 29 {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
30 {field: 'start_address', title: __('Start_address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, 30 {field: 'start_address', title: __('Start_address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
31 {field: 'end_address', title: __('End_address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, 31 {field: 'end_address', title: __('End_address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
32 - {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.normal},  
33 - {field: 'price', title: __('Price'), operate:'BETWEEN'},  
34 {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, 32 {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
35 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 33 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
36 ] 34 ]