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

转到一个项目

作者 郭文星
提交 3ea20ffe18e46aa1055d601f8c41d221518e8c8a 1 个父辈 41c09072

123

内嵌 并排对比
正在显示 5 个修改的文件 包含 17 行增加 和 4 行删除
@@ -114,7 +114,7 @@ class Car extends Backend @@ -114,7 +114,7 @@ class Car extends Backend
114 $data=[ 114 $data=[
115 "start_address"=>$route["start_address"], 115 "start_address"=>$route["start_address"],
116 "end_address"=>$route["end_address"], 116 "end_address"=>$route["end_address"],
117 - "price"=>$carmodel["intercity_price"], 117 + "price"=>$route["price"],
118 "name"=>$driver["name"], 118 "name"=>$driver["name"],
119 "driver_id"=>$driver["id"], 119 "driver_id"=>$driver["id"],
120 "route_id"=>$route["id"], 120 "route_id"=>$route["id"],
@@ -178,7 +178,7 @@ class Car extends Backend @@ -178,7 +178,7 @@ class Car extends Backend
178 $data=[ 178 $data=[
179 "start_address"=>$route["start_address"], 179 "start_address"=>$route["start_address"],
180 "end_address"=>$route["end_address"], 180 "end_address"=>$route["end_address"],
181 - "price"=>$carmodel["intercity_price"], 181 + "price"=>$route["price"],
182 "name"=>$driver["name"], 182 "name"=>$driver["name"],
183 "driver_id"=>$driver["id"], 183 "driver_id"=>$driver["id"],
184 "route_id"=>$route["id"], 184 "route_id"=>$route["id"],
@@ -20,6 +20,12 @@ @@ -20,6 +20,12 @@
20 </div> 20 </div>
21 21
22 <div class="form-group"> 22 <div class="form-group">
  23 + <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
  24 + <div class="col-xs-12 col-sm-8">
  25 + <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number">
  26 + </div>
  27 + </div>
  28 + <div class="form-group">
23 <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label> 29 <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
24 <div class="col-xs-12 col-sm-8"> 30 <div class="col-xs-12 col-sm-8">
25 <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}"> 31 <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}">
@@ -20,6 +20,12 @@ @@ -20,6 +20,12 @@
20 </div> 20 </div>
21 21
22 <div class="form-group"> 22 <div class="form-group">
  23 + <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
  24 + <div class="col-xs-12 col-sm-8">
  25 + <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
  26 + </div>
  27 + </div>
  28 + <div class="form-group">
23 <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label> 29 <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
24 <div class="col-xs-12 col-sm-8"> 30 <div class="col-xs-12 col-sm-8">
25 <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:$row.create_time?datetime($row.create_time):''}"> 31 <input id="c-create_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:$row.create_time?datetime($row.create_time):''}">
@@ -20,7 +20,7 @@ class Car extends Base @@ -20,7 +20,7 @@ class Car extends Base
20 * @return void 20 * @return void
21 */ 21 */
22 public function selectroute(){ 22 public function selectroute(){
23 - $res=Db::name("route")->field("id,name,start_address,end_address")->limit(2)->select(); 23 + $res=Db::name("route")->field("id,name,price,start_address,end_address")->limit(2)->select();
24 return $this->success($res); 24 return $this->success($res);
25 } 25 }
26 26
@@ -1083,7 +1083,7 @@ class Car extends Base @@ -1083,7 +1083,7 @@ class Car extends Base
1083 $total=$this->request->param("total"); 1083 $total=$this->request->param("total");
1084 $start_time=$this->request->param("start_time"); 1084 $start_time=$this->request->param("start_time");
1085 $end_time=$this->request->param("end_time"); 1085 $end_time=$this->request->param("end_time");
1086 - $driver=Db::name("driver")->where('user_id',$this->auth->id)->find(); 1086 + $driver=Db::name("driver")->where('user_id',7)->find();
1087 $res=Db::name("order") 1087 $res=Db::name("order")
1088 ->alias("a") 1088 ->alias("a")
1089 ->join("route b","a.route_id=b.id") 1089 ->join("route b","a.route_id=b.id")
@@ -29,6 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -29,6 +29,7 @@ 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: 'price', title: __('Price'), operate:'BETWEEN'},
32 {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, 33 {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
33 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 34 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
34 ] 35 ]