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

转到一个项目

作者 郭文星
提交 f6eb4e0bb454c9dad638eef110c935edc4ecf8a1 1 个父辈 e337c893

123

内嵌 并排对比
正在显示 6 个修改的文件 包含 25 行增加 和 7 行删除
@@ -10,6 +10,7 @@ return [ @@ -10,6 +10,7 @@ return [
10 'Colour' => '车辆颜色', 10 'Colour' => '车辆颜色',
11 'Driver_license_img' => '驾照', 11 'Driver_license_img' => '驾照',
12 'Driving_license_img' => '行驶证', 12 'Driving_license_img' => '行驶证',
  13 + 'Reservation_time' => '预约时间',
13 'Start_time' => '发车时间', 14 'Start_time' => '发车时间',
14 'Create_time' => '创建时间', 15 'Create_time' => '创建时间',
15 'Route.name' => '线路名称', 16 'Route.name' => '线路名称',
@@ -65,6 +65,12 @@ @@ -65,6 +65,12 @@
65 </div> 65 </div>
66 </div> 66 </div>
67 <div class="form-group"> 67 <div class="form-group">
  68 + <label class="control-label col-xs-12 col-sm-2">{:__('Reservation_time')}:</label>
  69 + <div class="col-xs-12 col-sm-8">
  70 + <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="{:date('H:i')}">
  71 + </div>
  72 + </div>
  73 + <div class="form-group">
68 <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label> 74 <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label>
69 <div class="col-xs-12 col-sm-8"> 75 <div class="col-xs-12 col-sm-8">
70 <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="{:date('Y-m-d H:i:s')}"> 76 <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="{:date('Y-m-d H:i:s')}">
@@ -65,6 +65,12 @@ @@ -65,6 +65,12 @@
65 </div> 65 </div>
66 </div> 66 </div>
67 <div class="form-group"> 67 <div class="form-group">
  68 + <label class="control-label col-xs-12 col-sm-2">{:__('Reservation_time')}:</label>
  69 + <div class="col-xs-12 col-sm-8">
  70 + <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):''}">
  71 + </div>
  72 + </div>
  73 + <div class="form-group">
68 <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label> 74 <label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:</label>
69 <div class="col-xs-12 col-sm-8"> 75 <div class="col-xs-12 col-sm-8">
70 <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):''}"> 76 <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):''}">
@@ -32,7 +32,7 @@ class Car extends Api @@ -32,7 +32,7 @@ class Car extends Api
32 $res=Db::name("car") 32 $res=Db::name("car")
33 ->alias("a") 33 ->alias("a")
34 ->join("route b","a.route_id=b.id") 34 ->join("route b","a.route_id=b.id")
35 - ->field("a.id,b.id as route_id,DATE_FORMAT(FROM_UNIXTIME(a.start_time), '%H:%i') AS start_time ,b.price") 35 + ->field("a.id,b.id as route_id,DATE_FORMAT(FROM_UNIXTIME(a.reservation_time), '%H:%i') AS reservation_time ,DATE_FORMAT(FROM_UNIXTIME(a.start_time), '%H:%i') AS start_time ,b.price")
36 ->where("route_id",$route_id) 36 ->where("route_id",$route_id)
37 ->group("start_time") 37 ->group("start_time")
38 ->select(); 38 ->select();
@@ -68,6 +68,7 @@ class Car extends Api @@ -68,6 +68,7 @@ class Car extends Api
68 $route_id = $this->request->param("route_id"); 68 $route_id = $this->request->param("route_id");
69 $car_id = $this->request->param("car_id"); 69 $car_id = $this->request->param("car_id");
70 70
  71 +
71 } 72 }
72 73
73 /** 74 /**
@@ -113,7 +114,7 @@ class Car extends Api @@ -113,7 +114,7 @@ class Car extends Api
113 "phone"=>$phone, 114 "phone"=>$phone,
114 "is_adult"=>$is_adult 115 "is_adult"=>$is_adult
115 ]); 116 ]);
116 - return $this->success("添加成功",$res); 117 + return $this->success("修改成功",$res);
117 } 118 }
118 119
119 /** 120 /**
@@ -122,9 +123,12 @@ class Car extends Api @@ -122,9 +123,12 @@ class Car extends Api
122 */ 123 */
123 public function selectorder(){ 124 public function selectorder(){
124 $is_pay=$this->request->param("is_pay"); //是否支付:1=已支付,2=未支付,3=已退款,4=已取消 125 $is_pay=$this->request->param("is_pay"); //是否支付:1=已支付,2=未支付,3=已退款,4=已取消
  126 + $w['user_id'] = $this->auth->id;
  127 + if ($is_pay){
  128 + $w['is_pay'] = $is_pay;
  129 + }
125 $res=Db::name("order") 130 $res=Db::name("order")
126 - ->where("is_pay",$is_pay)  
127 - ->where("user_id",$this->auth->id) 131 + ->where($w)
128 ->select(); 132 ->select();
129 return $this->success("请求成功",$res); 133 return $this->success("请求成功",$res);
130 } 134 }
@@ -16,13 +16,13 @@ return [ @@ -16,13 +16,13 @@ return [
16 // 数据库类型 16 // 数据库类型
17 'type' => Env::get('database.type', 'mysql'), 17 'type' => Env::get('database.type', 'mysql'),
18 // 服务器地址 18 // 服务器地址
19 - 'hostname' => Env::get('database.hostname', '127.0.0.1'), 19 + 'hostname' => Env::get('database.hostname', '121.37.3.63'),
20 // 数据库名 20 // 数据库名
21 'database' => Env::get('database.database', 'net_car'), 21 'database' => Env::get('database.database', 'net_car'),
22 // 用户名 22 // 用户名
23 - 'username' => Env::get('database.username', 'root'), 23 + 'username' => Env::get('database.username', 'net_car'),
24 // 密码 24 // 密码
25 - 'password' => Env::get('database.password', '123456'), 25 + 'password' => Env::get('database.password', 'yznN5MMw7Htbj8Ac'),
26 // 端口 26 // 端口
27 'hostport' => Env::get('database.hostport', ''), 27 'hostport' => Env::get('database.hostport', ''),
28 // 连接dsn 28 // 连接dsn
@@ -36,6 +36,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -36,6 +36,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
36 {field: 'driving_license_img', title: __('Driving_license_img'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images}, 36 {field: 'driving_license_img', title: __('Driving_license_img'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
37 {field: 'route.name', title: __('Route.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, 37 {field: 'route.name', title: __('Route.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
38 {field: 'driver.name', title: __('Driver.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, 38 {field: 'driver.name', title: __('Driver.name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
  39 + {field: 'reservation_time', title: __('Reservation_time'),operate:'RANGE', addclass:'datetimerange',datetimeFormat:"HH:mm", autocomplete:false, formatter: Table.api.formatter.datetime},
39 {field: 'start_time', title: __('Start_time'),operate:'RANGE', addclass:'datetimerange',datetimeFormat:"HH:mm", autocomplete:false, formatter: Table.api.formatter.datetime}, 40 {field: 'start_time', title: __('Start_time'),operate:'RANGE', addclass:'datetimerange',datetimeFormat:"HH:mm", autocomplete:false, formatter: Table.api.formatter.datetime},
40 {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, 41 {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
41 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} 42 {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}