|
@@ -36,9 +36,9 @@ class Project extends Base_Controller {
|
|
|
if (empty($project_id)) exit(json_result('0007',$this->response['0007']));
|
|
|
|
|
|
$data['network_total'] = $this->Network_model->get_count(array('projectid'=>$project_id,'type'=>0));
|
|
|
- $proData = $this->Project_model->get_one(['id'=>$project_id],'projectname,projectid as number,address as location,createtime as create_time,cityid');
|
|
|
+ $proData = $this->Project_model->get_one(['id'=>$project_id],'projectname,projectid as number,address,createtime as create_time,cityid');
|
|
|
$data['number'] = $proData['number'];
|
|
|
- $data['location'] = $proData['location'];
|
|
|
+ $data['address'] = $proData['address'];
|
|
|
$data['projectname'] = $proData['projectname'];
|
|
|
$data['create_time'] = $proData['create_time'];
|
|
|
$data['cityid'] = $proData['cityid'];
|
|
@@ -127,6 +127,7 @@ class Project extends Base_Controller {
|
|
|
$location_ch = $res1['chinese_name'];
|
|
|
$location_en = $res1['english_name'];
|
|
|
}
|
|
|
+ $data['location'] = $location_en;
|
|
|
$project_weather = $this->db->query('select * from project_weather where projectId = '.$project_id)->row_array();
|
|
|
if (empty($project_weather) || time() - strtotime($project_weather['updatetime']) > 3600) {
|
|
|
$url = 'https://way.jd.com/he/freeweather?city='.$res1['chinese_name'].'&appkey=a44fc7f907194098c69bb8e90003bca6';
|