diff --git a/admin/controllers/Upload.php b/admin/controllers/Upload.php index 1da3f66f..8c5eef97 100755 --- a/admin/controllers/Upload.php +++ b/admin/controllers/Upload.php @@ -23,7 +23,7 @@ class Upload extends CI_Controller $mark = $this->input->get('mark'); $source = $this->input->get('source'); - if('pdf' == $types){ + if('file' == $mark){ return $this->pdf(); } diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php index 7f24ab12..1c288e74 100644 --- a/admin/controllers/receiver/Orders.php +++ b/admin/controllers/receiver/Orders.php @@ -117,10 +117,18 @@ class Orders extends HD_Controller{ //获取代办信息 $agent = $this->order_agents_model->get(['o_id'=>$row['id']]); $imgs = []; + $car_imgs = []; if($agent){ $agent['if_ins'] = intval($agent['if_ins']); $agent['ins_time'] = $agent['ins_time'] != '0000-00-00 00:00:00' ? date('Y-m-d',strtotime($agent['ins_time'])):''; - $agent['car_img_src'] = $agent['car_img']?build_qiniu_image_url($agent['car_img']):''; + if($agent['car_img']){ + $file_name = substr($agent['car_img'], strrpos($agent['car_img'], '/')+1); + $car_imgs[] = array( + 'src' => build_qiniu_image_url($agent['car_img']), + 'value' => $agent['car_img'], + 'title' => $file_name + ); + } if($agent['ins_img']){ $ins_img = json_decode($agent['ins_img']); foreach($ins_img as $val){ @@ -139,6 +147,7 @@ class Orders extends HD_Controller{ } $row['agent'] = $agent; $row['bx_imgs'] = $imgs; + $row['car_imgs'] = $car_imgs; $info = $row; $this->data['info'] = $info; $this->data['_title'] = '订单详情'; diff --git a/admin/views/receiver/orders/agentinfo.php b/admin/views/receiver/orders/agentinfo.php index 531cfed1..c7eee77b 100644 --- a/admin/views/receiver/orders/agentinfo.php +++ b/admin/views/receiver/orders/agentinfo.php @@ -32,14 +32,19 @@