正在显示
6 个修改的文件
包含
10 行增加
和
7 行删除
| @@ -307,7 +307,7 @@ class Api extends Controller | @@ -307,7 +307,7 @@ class Api extends Controller | ||
| 307 | 'time3' => array('value' =>date("Y-m-d H:i:s",$order['departure_time']), 'color' => '#173177'), | 307 | 'time3' => array('value' =>date("Y-m-d H:i:s",$order['departure_time']), 'color' => '#173177'), |
| 308 | 'thing7' => array('value' =>"{$order['position']}", 'color' => '#173177'), | 308 | 'thing7' => array('value' =>"{$order['position']}", 'color' => '#173177'), |
| 309 | 'thing8' => array('value' => "{$substring}师傅{$car['license_plate']}", 'color' => '#173177'), | 309 | 'thing8' => array('value' => "{$substring}师傅{$car['license_plate']}", 'color' => '#173177'), |
| 310 | - 'phone_number5' => array('value' => "0873-8896518", 'color' => '#173177'), | 310 | + 'phone_number5' => array('value' => "{$order['phone']}", 'color' => '#173177'), |
| 311 | ); | 311 | ); |
| 312 | 312 | ||
| 313 | 313 |
| @@ -252,7 +252,7 @@ if (!function_exists('senWxmsgToDriverUser')) { | @@ -252,7 +252,7 @@ if (!function_exists('senWxmsgToDriverUser')) { | ||
| 252 | 'time3' => array('value' =>date("Y-m-d H:i:s",$order['departure_time']), 'color' => '#173177'), | 252 | 'time3' => array('value' =>date("Y-m-d H:i:s",$order['departure_time']), 'color' => '#173177'), |
| 253 | 'thing7' => array('value' =>"{$order['position']}", 'color' => '#173177'), | 253 | 'thing7' => array('value' =>"{$order['position']}", 'color' => '#173177'), |
| 254 | 'thing8' => array('value' => "{$substring}师傅{$car['license_plate']}", 'color' => '#173177'), | 254 | 'thing8' => array('value' => "{$substring}师傅{$car['license_plate']}", 'color' => '#173177'), |
| 255 | - 'phone_number5' => array('value' => "0873-8896518", 'color' => '#173177'), | 255 | + 'phone_number5' => array('value' => "{$order['phone']}", 'color' => '#173177'), |
| 256 | ); | 256 | ); |
| 257 | if ($wxopenid) { | 257 | if ($wxopenid) { |
| 258 | $config = get_addon_config('wechat'); | 258 | $config = get_addon_config('wechat'); |
| @@ -161,7 +161,8 @@ class Car extends Backend | @@ -161,7 +161,8 @@ class Car extends Backend | ||
| 161 | // if($istrue){ | 161 | // if($istrue){ |
| 162 | // $this->error("该司机已添加车辆"); | 162 | // $this->error("该司机已添加车辆"); |
| 163 | // } | 163 | // } |
| 164 | - $route=Db::name("route")->where("id",$params['route_id'])->find(); | 164 | + $route_id_array = explode(",", $params['route_id']); |
| 165 | + $route=Db::name("route")->where("id",$route_id_array[0])->find(); | ||
| 165 | $user=Db::name("user")->where("mobile",$params['driver_phone'])->find(); | 166 | $user=Db::name("user")->where("mobile",$params['driver_phone'])->find(); |
| 166 | if($user){ | 167 | if($user){ |
| 167 | $driver=Db::name("driver")->where("user_id",$user['id'])->find(); | 168 | $driver=Db::name("driver")->where("user_id",$user['id'])->find(); |
| @@ -234,7 +235,7 @@ class Car extends Backend | @@ -234,7 +235,7 @@ class Car extends Backend | ||
| 234 | $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate; | 235 | $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate; |
| 235 | $row->validateFailException()->validate($validate); | 236 | $row->validateFailException()->validate($validate); |
| 236 | } | 237 | } |
| 237 | - | 238 | + $route_id_array = explode(",", $params['route_id']); |
| 238 | $car=Db::name('car')->where("id",$ids)->find(); | 239 | $car=Db::name('car')->where("id",$ids)->find(); |
| 239 | $driver=Db::name('driver')->where("id",$car['driver_id'])->find(); | 240 | $driver=Db::name('driver')->where("id",$car['driver_id'])->find(); |
| 240 | $user=Db::name("user")->where("mobile",$params['driver_phone'])->find(); | 241 | $user=Db::name("user")->where("mobile",$params['driver_phone'])->find(); |
| @@ -243,7 +244,7 @@ class Car extends Backend | @@ -243,7 +244,7 @@ class Car extends Backend | ||
| 243 | $params['driver_id']=$driver['id']; | 244 | $params['driver_id']=$driver['id']; |
| 244 | if(!$driver['place_image']){ | 245 | if(!$driver['place_image']){ |
| 245 | $index=new Index(); | 246 | $index=new Index(); |
| 246 | - $route=Db::name("route")->where("id",$params['route_id'])->find(); | 247 | + $route=Db::name("route")->where("id",$route_id_array[0])->find(); |
| 247 | $driver=Db::name("driver")->where("id",$params['driver_id'])->find(); | 248 | $driver=Db::name("driver")->where("id",$params['driver_id'])->find(); |
| 248 | $carmodel=Db::name("carmodel")->where("id",$params['carmodel_id'])->find(); | 249 | $carmodel=Db::name("carmodel")->where("id",$params['carmodel_id'])->find(); |
| 249 | $car=Db::name("car")->where("driver_id",$driver['id'])->find(); | 250 | $car=Db::name("car")->where("driver_id",$driver['id'])->find(); |
| @@ -314,6 +314,7 @@ class Order extends Backend | @@ -314,6 +314,7 @@ class Order extends Backend | ||
| 314 | $car=Db::name("car")->where("driver_id",$row['driver_id'])->find(); | 314 | $car=Db::name("car")->where("driver_id",$row['driver_id'])->find(); |
| 315 | $row['license_plate']=$car['license_plate']; | 315 | $row['license_plate']=$car['license_plate']; |
| 316 | $row['driver_name']=$driver['name']; | 316 | $row['driver_name']=$driver['name']; |
| 317 | + $row['driver_phone']=$driver['phone']; | ||
| 317 | } | 318 | } |
| 318 | $route=Db::name("route")->find($row['route_id']); | 319 | $route=Db::name("route")->find($row['route_id']); |
| 319 | $row['route_name']=$route['name']; | 320 | $row['route_name']=$route['name']; |
| @@ -27,6 +27,7 @@ return [ | @@ -27,6 +27,7 @@ return [ | ||
| 27 | 'Route_id' => '选择线路', | 27 | 'Route_id' => '选择线路', |
| 28 | 'Driver_id' => '司机名称', | 28 | 'Driver_id' => '司机名称', |
| 29 | //'Driver_name' => '运行路线名称', | 29 | //'Driver_name' => '运行路线名称', |
| 30 | + 'driver_phone' => '司机电话', | ||
| 30 | 'phone' => '联系电话', | 31 | 'phone' => '联系电话', |
| 31 | 'route_name' => '线路名称', | 32 | 'route_name' => '线路名称', |
| 32 | 'Pay_time' => '支付时间', | 33 | 'Pay_time' => '支付时间', |
| @@ -108,7 +108,7 @@ class Index extends Api | @@ -108,7 +108,7 @@ class Index extends Api | ||
| 108 | 'time3' => array('value' =>date("Y-m-d H:i:s",$order['departure_time']), 'color' => '#173177'), | 108 | 'time3' => array('value' =>date("Y-m-d H:i:s",$order['departure_time']), 'color' => '#173177'), |
| 109 | 'thing7' => array('value' =>"{$order['position']}", 'color' => '#173177'), | 109 | 'thing7' => array('value' =>"{$order['position']}", 'color' => '#173177'), |
| 110 | 'thing8' => array('value' => "{$substring}师傅{$car['license_plate']}", 'color' => '#173177'), | 110 | 'thing8' => array('value' => "{$substring}师傅{$car['license_plate']}", 'color' => '#173177'), |
| 111 | - 'phone_number5' => array('value' => "0873-8896518", 'color' => '#173177'), | 111 | + 'phone_number5' => array('value' => "{$order['phone']}", 'color' => '#173177'), |
| 112 | ); | 112 | ); |
| 113 | if ($wxopenid) { | 113 | if ($wxopenid) { |
| 114 | $config = get_addon_config('wechat'); | 114 | $config = get_addon_config('wechat'); |
| @@ -132,7 +132,7 @@ class Index extends Api | @@ -132,7 +132,7 @@ class Index extends Api | ||
| 132 | 'time3' => array('value' =>date("Y-m-d H:i:s",$order['departure_time']), 'color' => '#173177'), | 132 | 'time3' => array('value' =>date("Y-m-d H:i:s",$order['departure_time']), 'color' => '#173177'), |
| 133 | 'thing7' => array('value' =>"{$order['position']}", 'color' => '#173177'), | 133 | 'thing7' => array('value' =>"{$order['position']}", 'color' => '#173177'), |
| 134 | 'thing8' => array('value' => "{$substring}师傅{$car['license_plate']}", 'color' => '#173177'), | 134 | 'thing8' => array('value' => "{$substring}师傅{$car['license_plate']}", 'color' => '#173177'), |
| 135 | - 'phone_number5' => array('value' => "0873-8896518", 'color' => '#173177'), | 135 | + 'phone_number5' => array('value' => "{$order['phone']}", 'color' => '#173177'), |
| 136 | ); | 136 | ); |
| 137 | if ($wxopenid) { | 137 | if ($wxopenid) { |
| 138 | $config = get_addon_config('wechat'); | 138 | $config = get_addon_config('wechat'); |
-
请 注册 或 登录 后发表评论