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

转到一个项目

作者 郭文星
提交 76b07118d94b3ed70c9757612c616fdf68762cce 1 个父辈 0044685e

123

内嵌 并排对比
正在显示 8 个修改的文件 包含 41 行增加 和 9 行删除
@@ -102,10 +102,10 @@ class Car extends Backend @@ -102,10 +102,10 @@ class Car extends Backend
102 $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate; 102 $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
103 $this->model->validateFailException()->validate($validate); 103 $this->model->validateFailException()->validate($validate);
104 } 104 }
105 -// $istrue=$this->model->where("driver_id",$params['driver_id'])->find();  
106 -// if($istrue){  
107 -// $this->error("该司机添加车辆");  
108 -// } 105 + $istrue=$this->model->where("driver_id",$params['driver_id'])->find();
  106 + if($istrue){
  107 + $this->error("该司机添加车辆");
  108 + }
109 $route=Db::name("route")->where("id",$params['route_id'])->find(); 109 $route=Db::name("route")->where("id",$params['route_id'])->find();
110 $driver=Db::name("driver")->where("id",$params['driver_id'])->find(); 110 $driver=Db::name("driver")->where("id",$params['driver_id'])->find();
111 $result = $this->model->allowField(true)->save($params); 111 $result = $this->model->allowField(true)->save($params);
@@ -164,6 +164,23 @@ class Car extends Backend @@ -164,6 +164,23 @@ class Car extends Backend
164 $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate; 164 $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
165 $row->validateFailException()->validate($validate); 165 $row->validateFailException()->validate($validate);
166 } 166 }
  167 +
  168 + $car=Db::name('car')->where("id",$ids)->find();
  169 + $driver=Db::name('driver')->where("id",$car['driver_id'])->find();
  170 + if(!$driver['place_image']){
  171 + $index=new Index();
  172 + $route=Db::name("route")->where("id",$params['route_id'])->find();
  173 + $driver=Db::name("driver")->where("id",$params['driver_id'])->find();
  174 + $data=[
  175 + "start_address"=>$route["start_address"],
  176 + "end_address"=>$route["end_address"],
  177 + "name"=>$driver["name"],
  178 + "driver_id"=>$driver["id"],
  179 + ];
  180 + $place_image=$index->build(json_encode($data));
  181 + $result = Db::name('driver')->where('id','=',$driver["id"])->update(['place_image'=>$place_image['fileurl']]);
  182 + }
  183 +
167 $result = $row->allowField(true)->save($params); 184 $result = $row->allowField(true)->save($params);
168 Db::commit(); 185 Db::commit();
169 } catch (ValidateException|PDOException|Exception $e) { 186 } catch (ValidateException|PDOException|Exception $e) {
@@ -10,7 +10,7 @@ return [ @@ -10,7 +10,7 @@ return [
10 'Colour' => '车辆颜色', 10 'Colour' => '车辆颜色',
11 'Driving_license' => '行驶证', 11 'Driving_license' => '行驶证',
12 'Driver_license' => '驾照', 12 'Driver_license' => '驾照',
13 - 'Seat_id' => '座位id', 13 + 'Seat_id' => '座位价格',
14 'Reservation_time' => '预约时间', 14 'Reservation_time' => '预约时间',
15 'Start_time' => '发车时间', 15 'Start_time' => '发车时间',
16 'Create_time' => '创建时间', 16 'Create_time' => '创建时间',
@@ -3,5 +3,6 @@ @@ -3,5 +3,6 @@
3 return [ 3 return [
4 'Id' => 'ID', 4 'Id' => 'ID',
5 'Name' => '车型名称', 5 'Name' => '车型名称',
6 - 'Price' => '包车价格' 6 + 'Price' => '包车价格',
  7 + 'Intercity_price' => '城际价格'
7 ]; 8 ];
@@ -73,13 +73,13 @@ @@ -73,13 +73,13 @@
73 <div class="form-group"> 73 <div class="form-group">
74 <label class="control-label col-xs-12 col-sm-2">{:__('Reservation_time')}:</label> 74 <label class="control-label col-xs-12 col-sm-2">{:__('Reservation_time')}:</label>
75 <div class="col-xs-12 col-sm-8"> 75 <div class="col-xs-12 col-sm-8">
76 - <input id="c-reservation_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[reservation_time]" type="text" value="{:$row.reservation_time?datetime($row.reservation_time):''}"> 76 + <input id="c-reservation_time" class="form-control datetimepicker" data-date-format=" HH:mm" data-use-current="true" name="row[reservation_time]" type="text" value="{:$row.reservation_time?datetime($row.reservation_time):''}">
77 </div> 77 </div>
78 </div> 78 </div>
79 <div class="form-group"> 79 <div class="form-group">
80 <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label> 80 <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label>
81 <div class="col-xs-12 col-sm-8"> 81 <div class="col-xs-12 col-sm-8">
82 - <input id="c-start_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[start_time]" type="text" value="{:$row.start_time?datetime($row.start_time):''}"> 82 + <input id="c-start_time" class="form-control datetimepicker" data-date-format=" HH:mm" data-use-current="true" name="row[start_time]" type="text" value="{:$row.start_time?datetime($row.start_time):''}">
83 </div> 83 </div>
84 </div> 84 </div>
85 <div class="form-group"> 85 <div class="form-group">
@@ -12,6 +12,12 @@ @@ -12,6 +12,12 @@
12 <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number"> 12 <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number">
13 </div> 13 </div>
14 </div> 14 </div>
  15 + <div class="form-group">
  16 + <label class="control-label col-xs-12 col-sm-2">{:__('Intercity_price')}:</label>
  17 + <div class="col-xs-12 col-sm-8">
  18 + <input id="c-intercity_price" class="form-control" step="0.01" name="row[intercity_price]" type="number">
  19 + </div>
  20 + </div>
15 <div class="form-group layer-footer"> 21 <div class="form-group layer-footer">
16 <label class="control-label col-xs-12 col-sm-2"></label> 22 <label class="control-label col-xs-12 col-sm-2"></label>
17 <div class="col-xs-12 col-sm-8"> 23 <div class="col-xs-12 col-sm-8">
@@ -12,6 +12,12 @@ @@ -12,6 +12,12 @@
12 <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}"> 12 <input id="c-price" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
13 </div> 13 </div>
14 </div> 14 </div>
  15 + <div class="form-group">
  16 + <label class="control-label col-xs-12 col-sm-2">{:__('Intercity_price')}:</label>
  17 + <div class="col-xs-12 col-sm-8">
  18 + <input id="c-intercity_price" class="form-control" step="0.01" name="row[intercity_price]" type="number" value="{$row.intercity_price|htmlentities}">
  19 + </div>
  20 + </div>
15 <div class="form-group layer-footer"> 21 <div class="form-group layer-footer">
16 <label class="control-label col-xs-12 col-sm-2"></label> 22 <label class="control-label col-xs-12 col-sm-2"></label>
17 <div class="col-xs-12 col-sm-8"> 23 <div class="col-xs-12 col-sm-8">
@@ -976,7 +976,8 @@ class Car extends Base @@ -976,7 +976,8 @@ class Car extends Base
976 * @return void 976 * @return void
977 */ 977 */
978 public function qrcode(){ 978 public function qrcode(){
979 - $driver=Db::name("driver")->where('user_id',$this->auth->id)->field("place_image")->find(); 979 + $driver=Db::name("driver")->where('user_id',7)->field("place_image")->find();
  980 + $driver['place_image']=full_image($driver['place_image']);
980 $this->success("请求成功",$driver); 981 $this->success("请求成功",$driver);
981 } 982 }
982 983
@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
28 {field: 'id', title: __('Id')}, 28 {field: 'id', title: __('Id')},
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: 'price', title: __('Price'), operate:'BETWEEN'}, 30 {field: 'price', title: __('Price'), operate:'BETWEEN'},
  31 + {field: 'intercity_price', title: __('Intercity_price'), operate:'BETWEEN'},
31 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 32 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
32 ] 33 ]
33 ] 34 ]