diff --git a/application/controllers/infofix.php b/application/controllers/infofix.php index adbe94b4..a8a3ed2e 100644 --- a/application/controllers/infofix.php +++ b/application/controllers/infofix.php @@ -13,11 +13,11 @@ class infofix extends CI_Controller $this->load->model('infoContents_model'); $this->load->model('infoMetas_model'); $this->site_code = $this->input->get('site_code') ? $this->input->get('site_code') : $this->config->item('site_code'); + header('Access-Control-Allow-Origin: *'); } function list_info_by_keys() { - header('Access-Control-Allow-Origin: *'); // 防止超时 set_time_limit(0); @@ -116,7 +116,6 @@ class infofix extends CI_Controller function update_info_by_keys() { - header('Access-Control-Allow-Origin: *'); // json参数 $site = $this->input->get_post('site'); $keys = $this->input->get_post('keys'); @@ -194,12 +193,14 @@ class infofix extends CI_Controller function get_by_icid($ic_id) { $ic = $this->infoContents_model->get_ic_contents2($ic_id); - $json = $this->infoMetas_model->get($ic_id, 'AMP_JSON'); + $json = json_decode($this->infoMetas_model->get($ic_id, 'AMP_JSON')); + $use = $this->infoMetas_model->get($ic_id, 'AMP_BODY_PC_STATUS'); if ($ic) { echo json_encode( array( 'state' => 0, 'ic_content' => $ic->ic_content, + 'pc_use' => $use, 'json' => $json ) );