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

application/controllers/information.php

@@ -1043,6 +1043,13 @@ class Information extends CI_Controller
             }
         }
         
+        $why_us_covid_list_pc = $this->load->view(
+            $template_path . '-why-us-covid-list-pc', array(), true);
+        $information->ic_content = str_replace('<!--@WHY-US-COVID-LIST-PC@-->', $why_us_covid_list_pc, $information->ic_content);
+        $why_us_covid_list_mobile = $this->load->view(
+            $template_path . '-why-us-covid-mobile', array(), true);
+        $information->ic_content = str_replace('<!--@WHY-US-COVID-MOBILE@-->', $why_us_covid_list_mobile, $information->ic_content);
+
 
         if (is_file('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')) {//主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速
             $main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css'));
@@ -1069,14 +1076,6 @@ class Information extends CI_Controller
         $lazy_content = $this->html_optimize_lib->set_lazy_loader($information->ic_content, 'https://data.chinahighlights.com/grey.gif');
         $template = str_replace('<!--@CUSTOM-CONENT@-->', $lazy_content, $template);
         
-        //替换内容中各种标签
-        //$tag_why_us = $this->load->view($template_path . '-why-us', false, true);
-        // $template = str_replace('<!--@TAG-WHY-US@-->', $tag_why_us, $template);
-
-        //Google广告代码
-        //if (!empty(get_meta($information->ic_id, 'meta_google_ad_content'))) {
-        //$template = str_replace('<!--@Match-Content-GOOGLE@-->', '<script  async  src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script><ins class="adsbygoogle" style="display:block" data-ad-format="autorelaxed" data-ad-client="ca-pub-4231674166786366" data-ad-slot="1447610161" data-matched-content-rows-num="2,2" data-matched-content-columns-num="1,3" data-matched-content-ui-type="image_stacked,image_stacked"></ins><script>(adsbygoogle =  window.adsbygoogle || []).push({});</script>', $template);
-        //}
         //社媒分享图片
         $full_ic_photo = '';
         if (!empty($information->ic_photo)) {
@@ -1223,6 +1222,39 @@ class Information extends CI_Controller
                 true);
             $information->ic_content = str_replace('<!--@INQUIRY-FORM@-->', $inquiry_form_template, $information->ic_content);
         }
+        // why-us 相关的标签        
+        $why_us_mobile = $this->load->view($template_path . '-why-us-mobile', false, true);
+        $information->ic_content = str_replace('<!--@WHY_US_MOBILE@-->', $why_us_mobile, $information->ic_content);
+
+        $why_us_tour_detail_pc = $this->load->view($template_path . '-why-us-tour-detail-pc', false, true);
+        $information->ic_content = str_replace('<!--@WHY_US_TOUR_DETAIL_PC@-->', $why_us_tour_detail_pc, $information->ic_content);
+
+        $why_us_tour_list_pc = $this->load->view($template_path . '-why-us-tour-list-pc', false, true);
+        $information->ic_content = str_replace('<!--@WHY_US_TOUR_LIST_PC@-->', $why_us_tour_list_pc, $information->ic_content);
+
+        $breadcrumb_content = $this->load->view($template_path . '-breadcrumb', array('breadcrumb_data' => $breadcrumb_data), true);
+        $information->ic_content = str_replace('<!--@BREADCRUMB-BLOCK@-->', $breadcrumb_content, $information->ic_content);
+
+        // 动态加载反馈标签，第一个城市不足八条，使用第二城市数据。
+        // HTLM: <div><!--@FEEDBACK_Siem Reap,Bangkok@--></div>
+        // 解析结果：<!--@FEEDBACK_Siem Reap,Bangkok@-->; Siem Reap,Bangkok
+        $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_string = $feedback_array[1][$index];
+                $city_name_list = explode(',', $city_name_string);
+                $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list);
+                $feedback_content = $this->load->view(
+                    $template_path . '-feedback-list',
+                    array('feedback_list' => $feedback_list),
+                    true);
+                $information->ic_content = str_replace(
+                    $tag_name,
+                    $feedback_content,
+                    $information->ic_content);
+            }
+        }
 
         //主样式表，内联模式
         if (is_file('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css')) {//主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速
@@ -1281,6 +1313,28 @@ class Information extends CI_Controller
         file_put_contents($html_path, $template, LOCK_EX);
     }
 
+    public function test_ah_feedback() {
+        $feedback_array = [];
+        preg_match_all('^<!--@FEEDBACK_(.*)@-->^', '<div><!--@FEEDBACK_Siem Reap,Bangkok@--></div>', $feedback_array);
+        if (!empty($feedback_array)) {
+            foreach ($feedback_array[0] as $index => $tag_name) {
+                $city_name_string = $feedback_array[1][$index];
+                $city_name_list = explode(',', $city_name_string);
+                $feedback_list = $this->Feedback_model->get_feedback_by_city_list($city_name_list);
+                var_dump($feedback_list);
+                $feedback_content = $this->load->view(
+                    'mobile_first/ah' . '-feedback-list',
+                    array('feedback_list' => $feedback_list),
+                    true);
+                echo $feedback_content;
+                // $information->ic_content = str_replace(
+                //     $tag_name,
+                //     $feedback_content,
+                //     $information->ic_content);
+            }
+        }
+    }
+
     /**
      * @description: CT用的生成静态文件方法.有些内容的替换，CT这边不一样，需要单独处理 zp
      * @param {type} $device='mobile' or 'pc'
@@ -1501,6 +1555,18 @@ class Information extends CI_Controller
 
         }
 
+        //游船详细页
+        if ($meta_ct_page_type == "cruisedetails"){
+            $productType = $meta_ct_page_type;
+            $meta_ct_page_value = get_meta($information->ic_id, 'meta_ct_page_value');
+            if (!empty($meta_ct_page_value)) {
+                $productCode = $meta_ct_page_value;
+            }
+            $dataCruise["shipname"]=$productCode;
+            $template_curisedetails = $this->load->view($template_path . '-cruisedetails-form', $dataCruise, TRUE);
+            $data["template_curisedetails"] = $template_curisedetails;
+        }
+
         //表单页
         if (in_array($meta_ct_page_type, array("customize", "contactus", "pagewithform","tourdetail"))) {
             $productType = $meta_ct_page_type;

application/models/feedback_model.php

@@ -7,6 +7,74 @@ class Feedback_model extends CI_Model {
         $this->HT = $this->load->database('HT', TRUE);
     }
 
+    /**
+     * 根据城市英文名查找最新八条反馈信息
+    */
+    function get_feedback_by_city_list($city_name_list) {
+
+        $feedback_query =
+            $this->HT->query("
+            select top 8
+              tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name
+            from Eva_TAInfo 
+                left join Eva_TADetail on TAD_TAI_SN=TAI_SN
+                left join  V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1
+            where TAD_Content is not null and vci.cii2_name = ?
+            order by tai_getdate desc",
+                array($city_name_list[0]));
+
+        $first_city_num = $feedback_query->num_rows();
+        $feedback_result = $feedback_query->result();
+        $feedback_list = [];
+
+        foreach ($feedback_result as $feedback_row) {
+            $createdOn = new DateTime($feedback_row->tai_getdate);
+            $createdOnString = $createdOn->format('M Y');
+    
+            $feedback = [
+                'title' => $feedback_row->tai_title,
+                'customer' => $feedback_row->tai_customerid,
+                'content' => $feedback_row->tad_content,
+                'url' => $feedback_row->tai_url,
+                'createdOn' => $createdOnString
+            ];
+            $feedback_list[] = $feedback;
+        }
+
+        $enough_count = 8 - $first_city_num;
+        
+        if ($enough_count > 0 && count($city_name_list) > 1) {
+            
+            $feedback_query =
+                $this->HT->query("
+                    select top ?
+                    tad_content, tai_customerid, tai_title, tai_getdate, tai_url, vci.cii2_name
+                    from Eva_TAInfo 
+                        left join Eva_TADetail on TAD_TAI_SN=TAI_SN
+                        left join  V_CIty_Info vci on vci.cii_sn = tai_cii_sn and vci.LGC_LGC = 1
+                    where TAD_Content is not null and vci.cii2_name = ?
+                    order by tai_getdate desc",
+                    array($enough_count, $city_name_list[1]));
+            $feedback_result = $feedback_query->result();
+    
+            foreach ($feedback_result as $feedback_row) {
+                $createdOn = new DateTime($feedback_row->tai_getdate);
+                $createdOnString = $createdOn->format('M Y');
+        
+                $feedback = [
+                    'title' => $feedback_row->tai_title,
+                    'customer' => $feedback_row->tai_customerid,
+                    'content' => $feedback_row->tad_content,
+                    'url' => $feedback_row->tai_url,
+                    'createdOn' => $createdOnString
+                ];
+                $feedback_list[] = $feedback;
+            }
+        }
+
+        return $feedback_list;
+    }
+
     /**
      * 根据城市英文名查找最新一条反馈信息
     */

application/third_party/train/models/BIZ_intel_train_model.php

@@ -120,7 +120,11 @@ class BIZ_intel_train_model extends CI_Model {
 	}
 	
 	public function get_allstations(){
-		$sql = "SELECT * FROM TrainStation_intel where station_id != 1";
+		// $sql = "SELECT * FROM TrainStation_intel where station_id != 1";
+		//2022-4-20 zp 上面所有站点由于印度有8335个站点，循环读取系统吃不消，用下面的限制有车次的才显示。
+		$sql = "SELECT * FROM TrainStation_intel 
+		inner join TrainSearch_intel on tsi_ToStation = station_id
+		where station_id <> 1";
 		$query = $this->HT->query($sql);
 	    return $query->result();
 	}

application/views/mobile_first/ah-feedback-list.php

@@ -0,0 +1,19 @@
+<div class="tour_h2_bg">
+<h2 class="tour_h2_title">What Our Customers Said</h2>
+</div>
+<div class="table-responsive">
+<table>
+	<tbody>
+		<tr>
+    <?php foreach ($feedback_list as $index => $feedback) {?>
+      <td>
+        <div class="tour_feedback">
+        <div class="feedback_content"><strong><?php echo $feedback['title'] ?></strong><?php echo $feedback['content'] ?><a href="<?php echo $feedback['url'] ?>" target="_blank">More</a></div>
+        <div class="customer_name"><?php echo $feedback['customer'] ?>, <?php echo $feedback['createdOn'] ?></div>
+        <img alt="" class="img-responsive" height="40" width="211" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png"></div>
+      </td>
+    <?php }?>			
+		</tr>
+	</tbody>
+</table>
+</div>

application/views/mobile_first/ah-inquiry-form.php

@@ -1,12 +1,16 @@
 
 
 <div class="tmbottom">
-<h3 style="text-align:center;" class="visible-xs">For a quick conversation, simply reach us via WhatsApp:</h3>
+<h3 style="text-align: center;
-    <div class="contactwechat visible-xs"><img alt="asia highlights' wechat code" height="100px" src="https://data.globalhighlights.com/image/aboutus/gh-whatsapp-qr-code.jpg" width="100px" >
+    font-size: 20px;
+    line-height: 22px;">For a quick conversation, simply reach us via WhatsApp:</h3>
+    <div class="contactwechat"><img alt="asia highlights' wechat code" height="100px" src="https://data.globalhighlights.com/image/aboutus/gh-whatsapp-qr-code.jpg" width="100px" >
     <div class="wechatinfo"><span class="wechatred">+86 15807734776</span><br>
     Email: <span class="wechatred">contact@asiahighlights.com</span></div>
     </div>
-    <h3 style="text-align:center;">Send Us an Inquiry Now</h3>  
+    <h3 style="text-align: center;
+    font-size: 20px;
+    line-height: 22px;">Start planning your tailor-made tour now. Your 1:1 travel consultant will reply within 1 working day.</h3>  
     <form action="/orders/quick_inquiry_save" method="post" novalidate="" onsubmit="return validateQuickInquiryForm()"><input class="FullName" id="realname" name="name" placeholder="Your name" required="" type="text" value="" />
     <div id="realname_errmsg" style="display: none">
     <div class="requiredArea" style="margin-top:-10px;">Please enter your name</div>

application/views/mobile_first/ah-pc.php

@@ -31,6 +31,13 @@
             f.parentNode.insertBefore(j, f);
         })(window, document, 'script', 'dataLayer', 'GTM-56CMWN3');</script>
     <!-- End Google Tag Manager -->
+    <!-- Global site tag (gtag.js) - Google Ads: 996341496 --><script async src="https://www.googletagmanager.com/gtag/js?id=AW-996341496"></script>
+    <script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+  gtag('config', 'AW-996341496');
+</script>
 </head>
 
 <body>
@@ -139,7 +146,7 @@
                     </div>
                 </li>
                 <li class="dropdown"><a href="/about-us" class="p_topnavilink" >About Us</a></li>
-                <li class="dropdown" style="    padding-top: 15px"><a href="/contact-us" class="p_topnavilink contactbutton" >Contact Us</a></li>
+                <li class="dropdown" style="    padding-top: 18px"><a href="/contact-us" class="p_topnavilink contactbutton" >Contact Us</a></li>
                 <li class="dropdown" style="    margin-right: 0;">
                     <div class="siteSearch">
                         <form class="searchtextbox" id="searchbox_001281624266240652297:cl1fy1cxepi"
@@ -180,6 +187,8 @@
             </ul>  
             </div>
         <!--@TIPS-RIGHT@-->
+        <div class="info_tm_button"><a href="/forms/tailormade" id="create_my_trip_button_pc">Create My Trip</a>
+          </div>
     </div>
  
     <!--@ARTICLENEXT@-->
@@ -187,11 +196,10 @@
 
 <!--PC正文 结束-->
 
-
 <!--PC底部-->
 <div class="infotailor">
 
-        <span class="infotailorword">We are here to help you...<br> Start planning your tailor-made Asia tour with 1-1
+        <span class="infotailorword">We are here to help you...<br> Start planning your tailor-made tour with 1-1
             help from our travel advisors.
 
             <span class="infotailormade"><a href="/forms/tailormade" >Create My Trip</a></span>
@@ -199,6 +207,48 @@
         </span>
 </div>
 
+
+<div class="bottom_why_us">
+    <h2>The Asia Highlights Experience</h2>
+    
+    <div class="table-responsive">
+        <table class="why_us_table">
+        <tbody>
+            <tr>
+                <td>
+                    <div class="bottom_why_us_content" >
+                    <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-1.png" alt="1-to-1 Expert Planning" class="img-responsive" >
+        <h3 >1-to-1 Expert Planning</h3>
+        <p>Your tour will be tailor-made to suit you by a destination expert. Your personal travel advisor will always reply within 24 hours.</p>
+                    </div>
+                </td>
+                <td>
+                    <div class="bottom_why_us_content">
+                    <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-2.png" alt="Personal Journeys" class="img-responsive" >
+        <h3>Personal Journeys</h3>
+        <p >Enjoy having your own personal local guide and ride. Explore destinations at your own pace. Have as much flexibility as possible.</p>
+                    </div>
+                </td>
+                <td>
+                    <div class="bottom_why_us_content">
+                    <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-3.png" alt="Authentic Experiences" class="img-responsive">
+        <h3>Authentic Experiences</h3>
+        <p>Go beyond the sightseeing. Understand the destinations by practicing the local culture and interacting with local people.</p>
+                    </div>
+                </td>
+                <td>
+                    <div class="bottom_why_us_content">
+                    <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-4.png" alt="One-Stop Service" class="img-responsive" >
+        <h3>One-Stop Service</h3>
+        <p>Leave all the booking work to us, including international and internal transportation, visas, hotels, meals, and activities.</p>
+                    </div>
+                </td>
+            </tr>
+        </tbody>
+        </table>
+        </div>
+        
+    </div>
 <div class="infobottom">
     <div class="footerbox">
 

application/views/mobile_first/ah-why-us-mobile.php

@@ -0,0 +1,3 @@
+<div class="infoimage visible-xs">
+<img src="https://data.asiahighlights.com/image/about/covid-why-us-mobile.jpg" class="img-responsive" alt="travel with confidence despite covid-19">
+</div>

application/views/mobile_first/ah-why-us-tour-detail-pc.php

@@ -0,0 +1,3 @@
+<div class="infoimage hidden-xs">
+    <img src="https://data.asiahighlights.com/image/about/covid-why-us-tour-detail-pc.jpg" class="img-responsive" alt="travel with confidence despite covid-19">
+    </div>

application/views/mobile_first/ah-why-us-tour-list-pc.php

@@ -0,0 +1,5 @@
+<div class="all_width_content hidden-xs" style="height: 574px; background: #565656;">
+    <div class="all_width_content_1140">
+<img src="https://data.asiahighlights.com/image/about/covid-why-us-tour-list-pc.jpg" alt="travel with confidence despite covid-19">
+        </div>
+        </div>

application/views/mobile_first/ah.php

@@ -24,7 +24,14 @@
             f.parentNode.insertBefore(j, f);
         })(window, document, 'script', 'dataLayer', 'GTM-56CMWN3');</script>
     <!-- End Google Tag Manager -->
+<!-- Global site tag (gtag.js) - Google Ads: 996341496 --><script async src="https://www.googletagmanager.com/gtag/js?id=AW-996341496"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
 
+  gtag('config', 'AW-996341496');
+</script>
 </head>
 <body>
 <!-- Google Tag Manager (noscript) -->
@@ -172,6 +179,8 @@
 
 
     <!--@TIPS-RIGHT@-->
+    <div class="info_tm_button"><a href="/forms/tailormade" id="create_my_trip_button_mobile">Create My Trip</a>
+      </div>
 </div>
 
 
@@ -183,10 +192,49 @@
 <!--移动底部-->
 <footer>
     <div class="infotailor">
-        <span class="infotailorword">We are here to help you...<br> Start planning your tailor-made Asia tour with 1-1 help from our travel advisors.
+        <span class="infotailorword">We are here to help you...<br> Start planning your tailor-made tour with 1-1 help from our travel advisors.
-        <span class="infotailormade"><a href="/forms/tailormade">Create My Trip <i
+        <span class="infotailormade"><a href="/forms/tailormade">Create My Trip</a></span>
-                        aria-hidden="true" class="fa fa-caret-right"></i></a></span>
         </span>
+    </div>
+    <div class="bottom_why_us">
+      <h2>The Asia Highlights Experience</h2>
+      
+      <div class="table-responsive">
+          <table class="why_us_table">
+          <tbody>
+              <tr>
+                  <td>
+                      <div class="bottom_why_us_content">
+                      <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-1.png" alt="1-to-1 Expert Planning" class="img-responsive">
+          <h3>1-to-1 Expert Planning</h3>
+          <p>Your tour will be tailor-made to suit you by a destination expert. Your personal travel advisor will always reply within 24 hours.</p>
+                      </div>
+                  </td>
+                  <td>
+                      <div class="bottom_why_us_content">
+                      <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-2.png" alt="Personal Journeys" class="img-responsive">
+          <h3>Personal Journeys</h3>
+          <p>Enjoy having your own personal local guide and ride. Explore destinations at your own pace. Have as much flexibility as possible.</p>
+                      </div>
+                  </td>
+                  <td>
+                      <div class="bottom_why_us_content">
+                      <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-3.png" alt="Authentic Experiences" class="img-responsive">
+          <h3>Authentic Experiences</h3>
+          <p>Go beyond the sightseeing. Understand the destinations by practicing the local culture and interacting with local people.</p>
+                      </div>
+                  </td>
+                  <td>
+                      <div class="bottom_why_us_content">
+                      <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-4.png" alt="One-Stop Service" class="img-responsive">
+          <h3>One-Stop Service</h3>
+          <p>Leave all the booking work to us, including international and internal transportation, visas, hotels, meals, and activities.</p>
+                      </div>
+                  </td>
+              </tr>
+          </tbody>
+          </table>
+          </div>
           
       </div>
     <div class="infobottom">

application/views/mobile_first/ch-inquiry-form.php

@@ -18,8 +18,8 @@
             <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/input-name.png">
                 <span class="form_required">*</span>
             </span>    
-            <input class="FullName" id="realname" name="realname" placeholder="Full name" type="text"/> <span
+            <input class="FullName" id="realname" name="realname" placeholder="Your name" type="text"/> <span
-                        id="realname_errmsg" style="display: none"><span class="requiredArea">Please enter your full name</span></span>
+                        id="realname_errmsg" style="display: none"><span class="requiredArea">Please enter your name</span></span>
             </p>
 
             <p>

application/views/mobile_first/ch-pc.php

@@ -189,10 +189,50 @@
     </div>
     <div class="infotailor">
 
-  <span class="infotailorword">We are here to help you...<br> start planning your tailor-made China tour with 1-1 help from our travel advisors.
+  <span class="infotailorword">We are here to help you...<br> start planning your tailor-made tour with 1-1 help from our travel advisors.
     <span class="tourbutton"><a href="/tour/create-my-trip.htm" id="bottom_tailormade_pc">Create Your Trip </a></span>
     </span> 
 </div>
+<div class="bottom_why_us">
+    <h2>The China Highlights Experience</h2> 
+    <div class="table-responsive">
+        <table class="why_us_table">
+        <tbody>
+            <tr>
+                <td>
+                    <div class="bottom_why_us_content">
+                    <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-1.png" alt="1-to-1 Expert Planning" class="img-responsive">
+        <h3>1-to-1 Expert Planning</h3>
+        <p>Your tour will be tailor-made by your personal travel advisor — a destination expert. Every reply will be within 24 hours.</p>
+                    </div>
+                </td>
+                <td>
+                    <div class="bottom_why_us_content">
+                    <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-2.png" alt="Personal Journeys" class="img-responsive">
+        <h3>Personal Journeys</h3>
+        <p>Enjoy your personal local guide and ride. Explore destinations at your own pace. Have unparalleled flexibility, which is impossible on a group tour.</p>
+                    </div>
+                </td>
+                <td>
+                    <div class="bottom_why_us_content">
+                    <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-3.png" alt="Well-Selected Local Guides" class="img-responsive">
+        <h3>Well-Selected Local Guides</h3>
+        <p>Knowledgeable, enthusiastic, and attentive — your personal local guides will share interesting stories, insider information, and even create unexpected highlights!</p>
+                    </div>
+                </td>
+                <td>
+                    <div class="bottom_why_us_content">
+                    <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-4.png" alt="Authentic Experiences" class="img-responsive">
+        <h3>Authentic Experiences</h3>
+        <p>Discover the hidden gems. Experience local culture by practicing it. Try new and exciting activities, and unveil the stories behind the sights and people. </p>
+                    </div>
+                </td>
+            </tr>
+        </tbody>
+        </table>
+        </div>
+        
+    </div>
     <div class="footerbox">
 <div class="list_content">
         <div class="aboutusleft">

application/views/mobile_first/ch.php

@@ -212,12 +212,51 @@
 
 <footer>
     <div class="infotailor">
-<span class="infotailorword">We are here to help you...<br> start planning your tailor-made China tour with 1-1 help from our travel advisors.
+<span class="infotailorword">We are here to help you...<br> start planning your tailor-made tour with 1-1 help from our travel advisors.
 <span class="tourbutton"><a href="/tour/create-my-trip.htm">Create Your Trip</a></span>
 </span>
 
     </div>
+    <div class="bottom_why_us">
+      <h2>The China Highlights Experience</h2>
+      <div class="table-responsive">
+          <table class="why_us_table">
+          <tbody>
+              <tr>
+                  <td>
+                      <div class="bottom_why_us_content">
+                      <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-1.png" alt="1-to-1 Expert Planning" class="img-responsive">
+          <h3>1-to-1 Expert Planning</h3>
+          <p>Your tour will be tailor-made by your personal travel advisor — a destination expert. Every reply will be within 24 hours.</p>
+                      </div>
+                  </td>
+                  <td>
+                      <div class="bottom_why_us_content">
+                      <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-2.png" alt="Personal Journeys" class="img-responsive">
+          <h3>Personal Journeys</h3>
+          <p>Enjoy your personal local guide and ride. Explore destinations at your own pace. Have unparalleled flexibility, which is impossible on a group tour.</p>
+                      </div>
+                  </td>
+                  <td>
+                      <div class="bottom_why_us_content">
+                      <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-3.png" alt="Well-Selected Local Guides" class="img-responsive">
+          <h3>Well-Selected Local Guides</h3>
+          <p>Knowledgeable, enthusiastic, and attentive — your personal local guides will share interesting stories, insider information, and even create unexpected highlights!</p>
+                      </div>
+                  </td>
+                  <td>
+                      <div class="bottom_why_us_content">
+                      <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-4.png" alt="Authentic Experiences" class="img-responsive">
+          <h3>Authentic Experiences</h3>
+          <p>Discover the hidden gems. Experience local culture by practicing it. Try new and exciting activities, and unveil the stories behind the sights and people. </p>
+                      </div>
+                  </td>
+              </tr>
+          </tbody>
+          </table>
+          </div>
           
+      </div>
     <div class="infobottom">
 
         <img src="https://data.chinahighlights.com/pic/logo/bottom-logo-b.png" alt="China Highlights Logo" width="152px" height="108" class="bottomlogocenter"> <div class="bottomlogoinfo">China Highlights tailor-makes China tours to help travelers discover China

application/views/mobile_first/chinatravel-cruisedetails-form.php

@@ -0,0 +1,78 @@
+<script id="curiseform" type="text/html">
+		  <div class="topcruise-list">
+			  <span class="topcruise-type">Departures:</span>
+			  <div id="get_form_cruiseinfo"></div>	
+		  </div>
+		  <div class="topcruise-list"> 
+		  	<span class="topcruise-type">Room Types:</span>
+		  	<div id="get_form_RoomType"></div>	
+	      </div>
+		  <div class="topcruise-list">
+		  	<span class="topcruise-type">Year:</span>
+		    <div id="get_form_year"></div>
+	      </div>
+		  <div class="topcruise-list"> 
+		  	<span class="topcruise-type">Month:</span>
+		  	<div id="get_form_month"></div>		    
+	      </div>
+		  <div class="topcruise-list">
+		   <span class="topcruise-type">Dates:</span>
+		   <div id="get_form_days"></div>
+	      </div>
+		  <div class="topcruise-pice">price from <strong class="font30 orange" id="js_showprice">$0</strong> per person</div>  
+		<div class="topcruise-btn">
+			<button class="btn btn-disabled" type="submit" id="btnCruise" data="">Inquiry <i aria-hidden="true" class="fa fa-angle-right"></i></button>
+			</div>
+</script>
+
+<script type="text/html" id="form_cruiseinfo">
+	{{ each CruiseInfo item }}
+	<div class="col-label">
+		<input name="cruiseinfo" type="radio"  onchange="selectchange(this);" class="mgc" id="ci_{{item.CRI_SN}}" value="{{item.CRI_SN}}">
+		<label for="ci_{{item.CRI_SN}}">{{item.CRI_From}} - {{item.CRI_To}}</label>
+	  </div>
+	{{ /each }}
+</script>
+
+<script type="text/html" id="form_RoomType">
+	{{ each RoomType item }}
+	 <div class="col-label">
+		      <input name="roomtype" type="radio"  onchange="selectchange(this);" class="mgc" id="rt_{{item.CRT_SN}}" value="{{item.CRT2_RoomType}}">
+		      <label for="rt_{{item.CRT_SN}}">{{item.CRT2_RoomType}}</label>
+	        </div>
+	{{ /each }}
+</script>
+
+
+<script type="text/html" id="form_year">
+	{{ each yearList value i }}
+	<div class="col-label">
+	  <input name="year" type="radio"  onchange="selectchange(this);" class="mgc" id="y_{{value}}" value="{{value}}">
+	  <label for="y_{{value}}">{{value}}</label>
+	</div>
+	{{ /each }}
+</script>
+
+<script type="text/html" id="form_month">
+	{{ each monthList item }}
+	<div class="col-label">
+	  <input name="month" type="radio"  onchange="selectchange(this);" class="mgc" id="m_{{ item.month}}" value="{{ item.month}}">
+	  {{if item.show}}
+	  	<label for="m_{{item.month}}">{{item.monthEn}}</label>
+	  {{else}}
+	  	 <label for="" class="disable">{{item.monthEn}}</label>
+	   {{/if}}
+	</div>
+	{{ /each }}
+</script>
+
+<script type="text/html" id="form_days">
+	{{ each DayList item }}
+	<div class="col-label">
+	  <input name="days" type="radio" onchange="selectchange(this);" class="mgc" id="d_{{ item.StartDate }}" value="{{ item.StartDate }}">
+	  <label for="d_{{ item.StartDate }}">{{ item.DateText }}</label>
+	</div>
+	{{ /each }}
+</script>
+<input type="hidden" name="jsShipName" id="jsShipName" value="<?php echo $shipname; ?>" />
+<script type="text/javascript" src="https://data.chinatravel.com/js/mobile-first/cruise-details.min.js" async defer></script>

application/views/mobile_first/chinatravel-pc.php

@@ -7,7 +7,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta content="yes" name="apple-mobile-web-app-capable">
         <meta name="apple-mobile-web-app-title" content="<?php echo $TITLE ?>">
-        <?php if (in_array($productType,array("customize","contactus"))) { // 预订表单不显示 ?>
+        <?php if (in_array($productType,array("customize","contactus","cruiseform"))) { // 预订表单不显示 ?>
         <meta name="robots" content="noindex,nofollow">
         <?php } else { ?>
         <meta name="keywords" content="<?php echo $KEYWORDS ?>">
@@ -139,8 +139,8 @@
 <main id="main">
 <?php echo $CUSTOMCONENT ?>
 <?php if ($productType == "daytripdetail") {  // 一日游表单?>
-  <a id="iqnuirybutton"></a>
   <div class="inquirybutton"><a href="#iqnuirybutton">Inquire This Tour <i class="fa fa-angle-down font20" aria-hidden="true"></i> </a></div>
+  <a id="iqnuirybutton"></a>
 <div class="container-details">
   <div class="bookingbox">
         <div class="booking">
@@ -187,7 +187,12 @@
 </div>
 <?php } ?>
 <?php if ($productType == "tourdetail") {  // 线路?>
+  <div class="inquirybutton"><a href="#iqnuirybutton">Inquire This Tour <i class="fa fa-angle-down font20" aria-hidden="true"></i> </a></div>
+  <a id="iqnuirybutton"></a>
   <?php echo $template_form_tourqi;  } ?>
+  <?php if ($productType == "cruisedetails") {  // 游船?>
+    <div class="topicon"><a href="#"><img src="https://data.chinatravel.com/images/icon/top-icon.jpg" alt="top" /></a></div> 
+  <?php } ?>
 </main>
 <!---mian end----> 
 <?php if (!in_array($productType,array("customize","contactus"))) { // 预订表单不显示 ?>
@@ -279,3 +284,5 @@ eval(function(p,a,c,k,e,d){e=function(c){return(c<a?"":e(parseInt(c/a)))+((c=c%a
 <!--@PASSPARAM@--><?php echo $passParam  ?>
 </body>
 </html>
+<?php if ($productType == "cruisedetails") {  // 游船?>
+  <?php echo $template_curisedetails;  } ?>

application/views/mobile_first/chinatravel.php

@@ -7,7 +7,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta content="yes" name="apple-mobile-web-app-capable">
 <meta name="apple-mobile-web-app-title" content="<?php echo $TITLE ?>">
-<?php if (in_array($productType,array("customize","contactus"))) { // 预订表单不显示 ?>
+<?php if (in_array($productType,array("customize","contactus","cruiseform"))) { // 预订表单不显示 ?>
 <meta name="robots" content="noindex,nofollow">
 <?php } else { ?>
 <meta name="keywords" content="<?php echo $KEYWORDS ?>">
@@ -136,8 +136,8 @@
 <main id="main">
   <?php echo $CUSTOMCONENT ?>
   <?php if ($productType == "daytripdetail") {  // 一日游表单?>
-  <a id="iqnuirybutton"></a>
     <div class="inquirybutton"><a href="#iqnuirybutton">Inquire This Tour <i class="fa fa-angle-down font20" aria-hidden="true"></i> </a></div>
+  <a id="iqnuirybutton"></a>
 <div class="container-details">
   <div class="bookingbox">
         <div class="booking">
@@ -185,7 +185,12 @@
 <?php } ?>
 
 <?php if ($productType == "tourdetail") {  // 线路?>
+  <div class="inquirybutton"><a href="#iqnuirybutton">Inquire This Tour <i class="fa fa-angle-down font20" aria-hidden="true"></i> </a></div>
+  <a id="iqnuirybutton"></a>
   <?php echo $template_form_tourqi;  } ?>
+  <?php if ($productType == "cruisedetails") {  // 游船?>
+    <div class="topicon"><a href="#"><img src="https://data.chinatravel.com/images/icon/top-icon.jpg" alt="top" /></a></div> 
+  <?php } ?>
 </main>
 <!--main end--> 
 <?php if (!in_array($productType,array("customize","contactus"))) { // 预订表单不显示 ?>
@@ -274,3 +279,5 @@
 <!--@PASSPARAM@--><?php echo $passParam  ?>
 </body>
 </html>
+<?php if ($productType == "cruisedetails") {  // 游船?>
+  <?php echo $template_curisedetails;  } ?>

application/views/mobile_first/gh-pc.php

@@ -209,20 +209,20 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         </div>
     </div>
     <p class="contactus">Or send an inquiry below</p>
-    <form action="/form/save" method="post">
+    <form action="/forms/inquiry_save" method="post">
       <div class="InquiryFormBox">
         <div class="FieldSet">
           <p><input class="FullName" data-required="Please enter your fullname" id="realname" name="realname"
-              placeholder="Full name" required="" type="text"></p>
+              placeholder="Your name" required="" type="text"></p>
           <p><input class="EmailAddress" data-required="Please enter your e-mail address"
               data-pattern="Expecting an e-mail address" id="email" name="email" pattern="^[\w\-\.]+@[\w\-\.]+(\.\w+)+$"
               placeholder="Email" required type="text"></p>
           <p><input class="InquiryCalendar" data-min-date="7" id="starting_date" name="starting_date"
               placeholder="Starting date" required type="date"></p>
-          <p><input class="Inquiryphone" name="phone" placeholder="Phone or other ways to contact you"
+          <p><input class="Inquiryphone" name="phone" placeholder="Phone or other ways to contact you (optional)"
               type="text"> </p>
           <textarea id="additionalrequirements" name="additionalrequirements"
-            placeholder="How many people, hotel style and changes to make... " style="margin-bottom:20px;"></textarea>
+            placeholder="Anniversary, honeymoon, family trip, birthday travel, beach, food..." style="margin-bottom:20px;"></textarea>
           <input name="nullemail" placeholder="Your alternative email?" type="hidden">
           <input id="url" name="url" type="hidden">
           <!--@INPUT_PRODUCT_CODE@-->
@@ -269,41 +269,48 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
     
     
         </div>
-
+        <div class="infotailor">
+ We are here to help you...<br> start planning your tailor-made trip with 1-1 help from our travel advisors.
+    <div class="tourbutton"><a href="/forms/tailormade" >Create Your Trip </a></div>
+</div>
 <div id="footer">
         <div class="footerContent">
-
+        <h2>The Global Highlights Experience</h2>
             <div class="footerFeatures">
 
                
 
                         <div class=" whyuscontent">
-                            <div class="featureTitle">100% Tailor-made</div>
+                        <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-1.png" alt="1-to-1 Expert Planning" class="img-responsive">
+                            <div class="featureTitle">1-to-1 Expert Planning</div>
                             <ul>
 
-                                <li>Your timetable, your pace, unlimited changes without charge.</li>
+                                <li>Your tour will be tailor-made to suit you by a destination expert. Your personal travel advisor will always reply within 24 hours.</li>
                             </ul>
                         </div>
                         <div class=" whyuscontent">
-                            <div class="featureTitle">Authentic</div>
+                        <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-2.png" alt="Personal Journeys" class="img-responsive">
+                            <div class="featureTitle">Personal Journeys</div>
                             <ul>
 
-                                <li>Visit local families. rural farmers, and experience local life.</li>
+                                <li>Enjoy having your own personal local guide and ride. Explore destinations at your own pace. Have as much flexibility as possible.</li>
                             </ul>
                         </div>
                   
                         <div class=" whyuscontent">
-                            <div class="featureTitle">Quality</div>
+                        <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-3.png" alt="Authentic Experiences" class="img-responsive">
+                            <div class="featureTitle">Authentic Experiences</div>
                             <ul>
 
-                                <li>Our award winning service is backed up by a money back guarantee. We constantly review, inspect, and train our handpicked team.</li>
+                                <li>Go beyond the sightseeing. Understand the destinations by practicing the local culture and interacting with local people.</li>
                             </ul>
                         </div>
                         <div class=" whyuscontent">
-                            <div class="featureTitle">Top Reviews</div>
+                        <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-4.png" alt="One-Stop Service" class="img-responsive">
+                            <div class="featureTitle">One-Stop Service</div>
                             <ul>
 
-                                <li>Over 10,000 travelers choose us per year, including celebrities, royalty and Australian Geographic Magazines team. And TripAdvisor Certificate of Excellence Winner Year on Year. </li>
+                                <li>Leave all the booking work to us, including international and internal transportation, visas, hotels, meals, and activities. </li>
                             </ul>
                         </div>  
 

application/views/mobile_first/gh-tour-form.php

@@ -11,7 +11,7 @@
     </ul>
   </div>
   <div class="ghwhyus">
-    <form action="/form/save" method="post">
+    <form action="/forms/inquiry_save" method="post">
       <div class="InquiryFormBox">
         <div class="FieldSet">
           <p><input class="FullName" data-required="Please enter your fullname" id="realname" name="realname"

application/views/mobile_first/gh-why-us-covid-list-pc.php

@@ -0,0 +1,4 @@
+<div class="why_us_covid hidden-xs">
+<div class="infoimage">
+<img src="https://data.globalhighlights.com/image/aboutus/gh-covid-why-us-pc.jpg" class="img-responsive" alt="travel with confidence despite covid">
+</div></div>

application/views/mobile_first/gh-why-us-covid-mobile.php

@@ -0,0 +1,4 @@
+
+    <div class="infoimage visible-xs">
+    <img src="https://data.globalhighlights.com/image/aboutus/gh-covid-why-us-mobile.jpg" class="img-responsive" alt="travel with confidence despite covid">
+    </div>

application/views/mobile_first/gh.php

@@ -171,24 +171,24 @@ aria-label="festival">
   <div class="contactwechat">       <a id="scrollAnchor"></a>
    <img alt="global highlights' wechat code" height="100px" src="https://data.globalhighlights.com/image/aboutus/gh-whatsapp-qr-code.jpg" width="100px">
         <div class="wechatinfo">Scan and add us on WhatsApp: <span class="wechatred">+86 15807734776</span>
-        Email: contact@globalhighlights.com
+        contact@globalhighlights.com
         </div>
     </div>
     <p class="contactus">Or send an inquiry below</p>
-    <form action="/form/save" method="post">
+    <form action="/forms/inquiry_save" method="post">
       <div class="InquiryFormBox">
         <div class="FieldSet">
           <p><input class="FullName" data-required="Please enter your fullname" id="realname" name="realname"
-              placeholder="Full name" required="" type="text"></p>
+              placeholder="Your name" required="" type="text"></p>
           <p><input class="EmailAddress" data-required="Please enter your e-mail address"
               data-pattern="Expecting an e-mail address" id="email" name="email" pattern="^[\w\-\.]+@[\w\-\.]+(\.\w+)+$"
               placeholder="Email" required type="text"></p>
           <p><input class="InquiryCalendar" data-min-date="7" id="starting_date" name="starting_date"
               placeholder="Starting date" required type="date"></p>
-          <p><input class="Inquiryphone" name="phone" placeholder="Phone or other ways to contact you"
+          <p><input class="Inquiryphone" name="phone" placeholder="Other ways to contact you (optional)"
               type="text"> </p>
           <textarea id="additionalrequirements" name="additionalrequirements"
-            placeholder="How many people, hotel style and changes to make... " style="margin-bottom:20px;"></textarea>
+            placeholder="Anniversary, honeymoon, family trip, birthday travel, beach, food..." style="margin-bottom:20px;"></textarea>
           <input name="nullemail" placeholder="Your alternative email?" type="hidden">
           <input id="url" name="url" type="hidden">
           <!--@INPUT_PRODUCT_CODE@-->
@@ -233,43 +233,50 @@ aria-label="festival">
 })();
 </script>    
     
-    
+<div class="infotailor">
+ We are here to help you...<br> start planning your tailor-made tour with 1-1 help from our travel advisors.
+    <div class="tourbutton"><a href="/forms/tailormade" >Create Your Trip </a></div>
+</div>
 <footer>
 
     <div id="footer">
         <div class="footerContent">
-
+        <h2>The Global Highlights Experience</h2>
             <div class="footerFeatures">
 
 
 
                         <div class="whyuscontent">
-                            <span class="featureTitle">100% Tailor-made</span>
+                        <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-1.png" alt="1-to-1 Expert Planning" class="img-responsive">
+                            <span class="featureTitle">1-to-1 Expert Planning</span>
                             <ul>
 
-                                <li>Your timetable, your pace, unlimited changes without charge.</li>
+                                <li>Your tour will be tailor-made to suit you by a destination expert. Your personal travel advisor will always reply within 24 hours.</li>
                             </ul>
                         </div>
                         <div class=" whyuscontent">
-                            <span class="featureTitle">Authentic</span>
+                        <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-2.png" alt="Personal Journeys" class="img-responsive">
+                            <span class="featureTitle">Personal Journeys</span>
                             <ul>
 
-                                <li>Visit local families. rural farmers, and experience local life.</li>
+                                <li>Enjoy having your own personal local guide and ride. Explore destinations at your own pace. Have as much flexibility as possible.</li>
                             </ul>
                         </div>
 
                         <div class=" whyuscontent">
-                            <span class="featureTitle">Quality</span>
+                        <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-3.png" alt="Authentic Experiences" class="img-responsive">
+                            <span class="featureTitle">Authentic Experiences</span>
                             <ul>
 
-                                <li>Our award winning service is backed up by a money back guarantee. We constantly review, inspect, and train our handpicked team.</li>
+                                <li>Go beyond the sightseeing. Understand the destinations by practicing the local culture and interacting with local people.</li>
                             </ul>
                         </div>
                         <div class=" whyuscontent">
-                            <span class="featureTitle">Top Reviews</span>
+                        <img src="https://data.globalhighlights.com/image/aboutus/ah-bottom-why-us-tag-4.png" alt="One-Stop Service" class="img-responsive">
+                            <span class="featureTitle">One-Stop Service</span>
                             <ul>
 
-                                <li>Over 10,000 travelers choose us per year, including celebrities, royalty and Australian Geographic Magazines team. And TripAdvisor Certificate of Excellence Winner Year on Year. </li>
+                                <li>Leave all the booking work to us, including international and internal transportation, visas, hotels, meals, and activities.</li>
                             </ul>
                         </div>