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

application/controllers/information.php

@@ -2845,15 +2845,6 @@ class Information extends CI_Controller {
         true
       );
       $information->ic_content = str_replace('<!--@INQUIRY-FORM@-->', $inquiry_form_template, $information->ic_content);
-
-      // GP 表单
-      $gp_form_content = $this->load->view(
-        'mobile_first/thailand-gp-form',
-        ['meta_product_code' => $meta_product_code, 'information' => $information],
-        true
-      );
-      $information->ic_content = str_replace('<!--@GP-FORM@-->', $gp_form_content, $information->ic_content);
-
     }
 
     $price_tag_list = $this->parse_price_tag($information->ic_content);
@@ -2940,7 +2931,7 @@ class Information extends CI_Controller {
       }
     }
 
-                                                                                     //主样式表，内联模式
+    //主样式表，内联模式
     if (is_file('D:/wwwroot/origin-www.thailandhighlights.com/css/th-mobile-first.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速
       $main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.thailandhighlights.com/css/th-mobile-first.css'));
     } else {