123

@@ -114,7 +114,7 @@ class Car extends Backend
             $data=[
                 "start_address"=>$route["start_address"],
                 "end_address"=>$route["end_address"],
-                "price"=>$carmodel["intercity_price"],
+                "price"=>$route["price"],
                 "name"=>$driver["name"],
                 "driver_id"=>$driver["id"],
                 "route_id"=>$route["id"],
@@ -178,7 +178,7 @@ class Car extends Backend
                 $data=[
                     "start_address"=>$route["start_address"],
                     "end_address"=>$route["end_address"],
-                    "price"=>$carmodel["intercity_price"],
+                    "price"=>$route["price"],
                     "name"=>$driver["name"],
                     "driver_id"=>$driver["id"],
                     "route_id"=>$route["id"],

@@ -20,6 +20,12 @@
     </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">
             <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 @@
     </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">
             <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
      * @return void
      */
     public function selectroute(){
-        $res=Db::name("route")->field("id,name,start_address,end_address")->limit(2)->select();
+        $res=Db::name("route")->field("id,name,price,start_address,end_address")->limit(2)->select();
         return $this->success($res);
     }
 
@@ -1083,7 +1083,7 @@ class Car extends Base
         $total=$this->request->param("total");
         $start_time=$this->request->param("start_time");
         $end_time=$this->request->param("end_time");
-        $driver=Db::name("driver")->where('user_id',$this->auth->id)->find();
+        $driver=Db::name("driver")->where('user_id',7)->find();
         $res=Db::name("order")
             ->alias("a")
             ->join("route b","a.route_id=b.id")

@@ -29,6 +29,7 @@ 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: '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}
                     ]