Merge branch 'master' of github.com:hainatravel/information-system

4 years ago · 93af3ee7f3
parent 6f671e20eb 5c3e206261
commit 93af3ee7f3
2 changed files with 18 additions and 13 deletions
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@ -613,16 +613,16 @@ class Information extends CI_Controller
        preg_match_all('^<!--@FEEDBACK_(.*)@-->^', $template, $feedback_array);
        if (!empty($feedback_array)) {
            foreach ($feedback_array[0] as $index => $tag_name) {
-                // $city_name = $feedback_array[1][$index];
-                // $feedback_data = $this->feedback_model->get_feedback_by_city($city_name);
-                // $feedback_content = $this->load->view(
-                //     $template_path . '-feedback',
-                //     array('feedback_data' => $feedback_data),
-                //     true);
-                // $template = str_replace(
-                //     $tag_name,
-                //     $feedback_content,
-                //     $template);
+                $city_name = $feedback_array[1][$index];
+                $feedback_data = $this->feedback_model->get_feedback_by_city($city_name);
+                $feedback_content = $this->load->view(
+                    $template_path . '-feedback',
+                    array('feedback_data' => $feedback_data),
+                    true);
+                $template = str_replace(
+                    $tag_name,
+                    $feedback_content,
+                    $template);
            }
        }

--- a/application/controllers/test.php
+++ b/application/controllers/test.php
@ -10,20 +10,25 @@ class Test extends CI_Controller
    {
        parent::__construct();
        $this->load->model('feedback_model');
+        $this->load->model('Information_model');

    }

    public function feedback()
    {
+        $is_id = $this->input->get_post('is_id');
        $template_path = 'mobile_first/ch';

+        $information = $this->Information_model->Detail($is_id);
+
        $feedback_array = array();
-        preg_match_all('^<!--@FEEDBACK_(.*)@-->^', '<html><div><!--@FEEDBACK_Shanghai@--></div></html>', $feedback_array);
+        preg_match_all('^<!--@FEEDBACK_(.*)@-->^', $information->ic_content, $feedback_array);
        if (!empty($feedback_array)) {
            foreach ($feedback_array[0] as $index => $tag_name) {
                $city_name = $feedback_array[1][$index];
-                echo $city_name;
-                echo htmlentities($tag_name);
+                echo $information->ic_title.'<br>';
+                echo $city_name.'<br>';
+                echo htmlentities($tag_name).'<br>';
                $feedback_data = $this->feedback_model->get_feedback_by_city($city_name);
                $feedback_content = $this->load->view(
                    $template_path . '-feedback',