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

转到一个项目

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

123

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