Merge pull request 'update' (#100) from zhangwei into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/100
This commit is contained in:
commit
90e4cc0ac5
@ -420,6 +420,8 @@ class VehicleController extends BaseApiController
|
||||
$data['mileage'] = 0;
|
||||
if($data['status'] == 2){
|
||||
$data['company'] = Company::field('company_name,master_name as user_name,master_phone as user_phone,province,city,area,street,village,brigade')->where('id',$data['rent_company_id'])->find()->append(['province_name', 'city_name', 'area_name', 'street_name', 'village_name','brigade_name']);
|
||||
//获取合同
|
||||
$data['contract'] = VehicleContract::field('id,contract_no,file,status,create_time,update_time')->where('id',$data['contract_id'])->findOrEmpty();
|
||||
}
|
||||
//当前坐标位置
|
||||
$position = curl_post($this->url.'/api/getCarLocal',[],['car_id'=>$carId]);
|
||||
|
Loading…
x
Reference in New Issue
Block a user