From ec750c6d97c6350b13f402d5582b848a2008f659 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 12 Jul 2022 09:53:40 +0800
Subject: [PATCH 01/20] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ah-inquiry-form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 232c18b3..25e9fc1a 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -4,7 +4,7 @@
 <h3 style="text-align: center;
     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="contactwechat"><img alt="Asia Highlights' wechat code" height="100px" src="https://data.asiahighlights.com/image/forms/inquiry-form-whatsapp-code.jpg" width="100px" >
     <div class="wechatinfo"><span class="wechatred">+8615807734776</span><br>
     Email: <span class="wechatred">contact@asiahighlights.com</span></div>
     </div>

From bbe8271a5d5ccb9b1dfb3bd5135bf1d80bdf8ee7 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 12 Jul 2022 09:59:41 +0800
Subject: [PATCH 02/20] 11

---
 .../views/mobile_first/ah-inquiry-form.php        | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 25e9fc1a..2d694817 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -1,13 +1,7 @@
 
 
 <div class="tmbottom">
-<h3 style="text-align: center;
-    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.asiahighlights.com/image/forms/inquiry-form-whatsapp-code.jpg" width="100px" >
-    <div class="wechatinfo"><span class="wechatred">+8615807734776</span><br>
-    Email: <span class="wechatred">contact@asiahighlights.com</span></div>
-    </div>
+
     <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">
@@ -595,4 +589,11 @@
     <button class="sendButton" id="submit_booking_form_inquiry" name="booking_form_inquiry_list" type="submit">Inquire Now</button> <input name="cli_no" type="hidden" value="<?php echo $meta_product_code; ?>"/> 
     <input name="ic_title" type="hidden" value="<?php echo $ic_seo_title; ?>" />
     </form>
+    <h3 style="text-align: center;
+    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.asiahighlights.com/image/forms/inquiry-form-whatsapp-code.jpg" width="100px" >
+    <div class="wechatinfo"><span class="wechatred">+8615807734776</span><br>
+    Email: <span class="wechatred">contact@asiahighlights.com</span></div>
+    </div>
 </div>
\ No newline at end of file

From 18426854f0854d48480a4821588655cc892158fa Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 12 Jul 2022 10:05:10 +0800
Subject: [PATCH 03/20] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=92=8C?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=8D=A2=EF=BC=8C?=
 =?UTF-8?q?=20=E5=87=BA=E5=8F=91=E6=97=A5=E6=9C=9F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=87=B3=E9=9C=80=E6=B1=82=E6=A1=86=E4=B8=8A=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ah-inquiry-form.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 2d694817..2ae0937e 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -14,9 +14,7 @@
     <div id="email_verify_errmsg" style="display: none">
     <div class="requiredArea" style="margin-top:-10px;">Please verify your email.</div>
     </div>
-    <input class="InquiryCalendar datepicker" id="starting_date" name="starting_date" placeholder="Starting date" readonly="readonly" type="text" value="" />
-    <div id="starting_date_errmsg" style="display: none">
-    <div class="requiredArea" style="margin-top:-10px;">Please enter your starting date.</div> </div>
+    
     <select name="country_code" class="country_code">
 
 
@@ -585,6 +583,9 @@
 					</div>
     <div id="contact_errmsg" style="display: none">
     <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div>
+    <input class="InquiryCalendar datepicker" id="starting_date" name="starting_date" placeholder="Starting date" readonly="readonly" type="text" value="" />
+    <div id="starting_date_errmsg" style="display: none">
+    <div class="requiredArea" style="margin-top:-10px;">Please enter your starting date.</div> </div>
     <textarea id="form_additionalrequirements" name="form_additionalrequirements" placeholder="Tell us your travel requirements here: anniversary, honeymoon, family trip, birthday travel, beach, food... (optional)" style="height:100px;"></textarea>
     <button class="sendButton" id="submit_booking_form_inquiry" name="booking_form_inquiry_list" type="submit">Inquire Now</button> <input name="cli_no" type="hidden" value="<?php echo $meta_product_code; ?>"/> 
     <input name="ic_title" type="hidden" value="<?php echo $ic_seo_title; ?>" />

From e37d2e751de3902bd7f0d5bf6de3df2bd7080ede Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 12 Jul 2022 10:08:02 +0800
Subject: [PATCH 04/20] 11

---
 application/views/mobile_first/ah-inquiry-form.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 2ae0937e..09b6ad81 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -577,9 +577,7 @@
 ">WhatsApp / iMessage is SUPER helpful to ensure you not miss any important info.</p>
 <div class="checkYes" style="margin-bottom: 15px;">
 						<input type="checkbox" value="Available on WhatsApp" name="whatsapp" id="whatsapp" class="checkBorder" style="  width: 22px; margin: 0;">
-						<label for="whatsapp">
-							This number is available on WhatsApp.
-						</label>
+						<label for="whatsapp">This number is available on WhatsApp.</label>
 					</div>
     <div id="contact_errmsg" style="display: none">
     <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div>

From 8f8afcae57a5f3017c95670d476298fe3d399893 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 12 Jul 2022 10:11:45 +0800
Subject: [PATCH 05/20] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=A1=86=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E5=88=B0=E7=AC=AC=E4=B8=80=E4=BD=8D=EF=BC=8C=E5=87=BA?=
 =?UTF-8?q?=E5=8F=91=E6=97=A5=E6=9C=9F=E6=9B=B4=E6=8D=A2=E5=88=B0=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E6=A1=86=E4=B8=8B=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/ah-inquiry-form.php       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 09b6ad81..6451c48e 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -3,11 +3,15 @@
 <div class="tmbottom">
 
     <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="" />
+    <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="" />
+        <textarea id="form_additionalrequirements" name="form_additionalrequirements" placeholder="Tell us your travel requirements here: anniversary, honeymoon, family trip, birthday travel, beach, food... (optional)" style="height:100px;"></textarea>
+        <input class="InquiryCalendar datepicker" id="starting_date" name="starting_date" placeholder="Starting date *" readonly="readonly" type="text" value="" />
+        <div id="starting_date_errmsg" style="display: none">
+        <div class="requiredArea" style="margin-top:-10px;">Please enter your starting date.</div> </div>
     <div id="realname_errmsg" style="display: none">
     <div class="requiredArea" style="margin-top:-10px;">Please enter your name.</div>
     </div>
-    <input class="EmailAddress" id="email" name="email" placeholder="Email" required="" type="text" value="" />
+    <input class="EmailAddress" id="email" name="email" placeholder="Email *" required="" type="text" value="" />
     <div id="email_errmsg" style="display: none">
     <div class="requiredArea" style="margin-top:-10px;">Please enter your email.</div>
     </div>  
@@ -567,7 +571,7 @@
 
     <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+358</option>
 </select>
-    <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number (We'll only call if you ask.)" type="tel" value="" /> 
+    <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number (We'll only call if you ask.) *" type="tel" value="" /> 
     <p style="
     font-size: 17px;
     color: #555;
@@ -581,10 +585,8 @@
 					</div>
     <div id="contact_errmsg" style="display: none">
     <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div>
-    <input class="InquiryCalendar datepicker" id="starting_date" name="starting_date" placeholder="Starting date" readonly="readonly" type="text" value="" />
-    <div id="starting_date_errmsg" style="display: none">
-    <div class="requiredArea" style="margin-top:-10px;">Please enter your starting date.</div> </div>
-    <textarea id="form_additionalrequirements" name="form_additionalrequirements" placeholder="Tell us your travel requirements here: anniversary, honeymoon, family trip, birthday travel, beach, food... (optional)" style="height:100px;"></textarea>
+   
+   
     <button class="sendButton" id="submit_booking_form_inquiry" name="booking_form_inquiry_list" type="submit">Inquire Now</button> <input name="cli_no" type="hidden" value="<?php echo $meta_product_code; ?>"/> 
     <input name="ic_title" type="hidden" value="<?php echo $ic_seo_title; ?>" />
     </form>

From 5890fe743408445d3dffbd727a8f718aa055f211 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 12 Jul 2022 10:13:32 +0800
Subject: [PATCH 06/20] 11

---
 application/views/mobile_first/ah-inquiry-form.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 6451c48e..8b3f4623 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -17,11 +17,8 @@
     </div>  
     <div id="email_verify_errmsg" style="display: none">
     <div class="requiredArea" style="margin-top:-10px;">Please verify your email.</div>
-    </div>
-    
+    </div>   
     <select name="country_code" class="country_code">
-
-
     <option value="United States +1" style="font-weight: 600;">United States&nbsp; &nbsp;+1</option>
     <option value="United Kingdom +44" style="font-weight: 600;">United Kingdom&nbsp; &nbsp;+44</option>
     <option value="Australia +61" style="font-weight: 600;">Australia&nbsp; &nbsp;+61</option>

From d689329d519fbf20ff615050682a5f477770aed3 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 12 Jul 2022 10:15:02 +0800
Subject: [PATCH 07/20] 11

---
 application/views/mobile_first/ah-inquiry-form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 8b3f4623..76f30039 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -3,11 +3,12 @@
 <div class="tmbottom">
 
     <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="" />
+    <form action="/orders/quick_inquiry_save" method="post" novalidate="" onsubmit="return validateQuickInquiryForm()">
         <textarea id="form_additionalrequirements" name="form_additionalrequirements" placeholder="Tell us your travel requirements here: anniversary, honeymoon, family trip, birthday travel, beach, food... (optional)" style="height:100px;"></textarea>
         <input class="InquiryCalendar datepicker" id="starting_date" name="starting_date" placeholder="Starting date *" readonly="readonly" type="text" value="" />
         <div id="starting_date_errmsg" style="display: none">
         <div class="requiredArea" style="margin-top:-10px;">Please enter your starting date.</div> </div>
+        <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>
     </div>

From 3ae95385125aea0dce4b3d2b21fce9a717f8b290 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Tue, 12 Jul 2022 10:26:10 +0800
Subject: [PATCH 08/20] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=80=81=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E6=B5=B7=E5=A4=96=E7=AB=99=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwlog/models/wwwlogs_model.php           |  2 +-
 echarts/views/echarts/inchina_customers.php   |  6 +++-
 echarts/views/echarts/mobile_deal.php         | 35 +++++++++++++++++--
 echarts/views/echarts/potential_customers.php |  6 +++-
 echarts/views/echarts/regular_customers.php   |  6 +++-
 5 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/application/third_party/wwwlog/models/wwwlogs_model.php b/application/third_party/wwwlog/models/wwwlogs_model.php
index aecc5535..54e5f6d0 100644
--- a/application/third_party/wwwlog/models/wwwlogs_model.php
+++ b/application/third_party/wwwlog/models/wwwlogs_model.php
@@ -55,7 +55,7 @@ class wwwlogs_model extends CI_Model {
         $sql .= "    
                 COLI_SN,COLI_ID, COLI_WebCode,COLI_Name, COLI_OrderDetailText, COLI_OrderStartDate,COLI_SenderIP,COLI_WebCode,COLI_ApplyDate from ConfirmLineInfo
                 where 1=1 
-                and COLI_WebCode in ('cht','ah','ct','yz','sht','gl','gm')
+                and COLI_WebCode in ('cht','ah','gh','ct','yz','sht','gl','gm','jp','ru','it','vac','vc')
                 and not exists (select top 1 1 from InfoManager.dbo.wwwlogs where wl_COLI_SN=COLI_SN )
                 and COLI_SenderIP is not null
                 and DeleteFlag=0
diff --git a/echarts/views/echarts/inchina_customers.php b/echarts/views/echarts/inchina_customers.php
index c3104c6b..0822b48b 100644
--- a/echarts/views/echarts/inchina_customers.php
+++ b/echarts/views/echarts/inchina_customers.php
@@ -17,7 +17,11 @@
                     </label>
                 </li>
                 <li><label class="checkbox-inline">
-                        <input type="checkbox" id="website_GHKHYY" name="website" value="GHKHYY"> GH客户运营中心
+                        <input type="checkbox" id="website_GHKYZG" name="website" value="GHKYZG"> 客运中心中国
+                    </label>
+                </li>
+                <li><label class="checkbox-inline">
+                        <input type="checkbox" id="website_GHKYHW" name="website" value="GHKYHW"> 客运中心海外
                     </label>
                 </li>
                 <li><label class="checkbox-inline">
diff --git a/echarts/views/echarts/mobile_deal.php b/echarts/views/echarts/mobile_deal.php
index 5997deec..62a70716 100644
--- a/echarts/views/echarts/mobile_deal.php
+++ b/echarts/views/echarts/mobile_deal.php
@@ -85,7 +85,7 @@
     <div class="row">
         <div class="col-sm-4 col-md-4">
             <label class="checkbox-inline">
-                <input type="checkbox" checked disabled value="1">预定日期
+                <input type="checkbox" name="mobile_deal_ApplydateCheck" id="mobile_deal_ApplydateCheck" value="1">预定日期
             </label>
         </div>
         <div class="col-sm-8 col-md-8">
@@ -100,6 +100,29 @@
             <button class="btn btn-default" type="button" onclick="updateMobileDeal();">统计</button>
         </div>
     </div>
+
+    <div class="row">
+        <div class="col-sm-4 col-md-4">
+            <label class="checkbox-inline">
+                <input type="checkbox" name="OrderStartdateCheck" id="mobile_deal_OrderStartdateCheck" checked
+                       value="1">出发日期
+            </label>
+        </div>
+        <div class="col-sm-8 col-md-8">
+            <input name="mobile_deal_OrderStartdateStart" id="mobile_deal_OrderStartdateStart" type="text"
+                   placeholder="开始日期"
+                   class="form-control ShowMeTheDatePicker_cn" value="<?php echo date('Y-m-01', time()); ?>">
+        </div>
+        <div class="col-sm-8 col-md-8">
+            <input name="mobile_deal_OrderStartdateEnd" id="mobile_deal_OrderStartdateEnd" type="text"
+                   placeholder="截至日期"
+                   class="form-control ShowMeTheDatePicker_cn" value="<?php echo date('Y-m-t', time()); ?>">
+        </div>
+        <div class="col-sm-4 col-md-4">
+
+        </div>
+    </div>
+
     <div class="row">
         <div class="col-sm-24 col-md-24">
             <div class="table-responsive">
@@ -123,12 +146,16 @@
 </div>
 <script type="text/javascript">
     function updateMobileDeal() {
+        let ApplydateCheck = $('#mobile_deal_ApplydateCheck').prop("checked") ? $('#mobile_deal_ApplydateCheck').val() : 0;
         let ApplydateStart = $('#mobile_deal_ApplydateStart').val();
         let ApplydateEnd = $('#mobile_deal_ApplydateEnd').val();
+        let OrderStartdateCheck = $('#mobile_deal_OrderStartdateCheck').prop("checked") ? $('#mobile_deal_OrderStartdateCheck').val() : 0;
+        let OrderStartdateStart = $('#mobile_deal_OrderStartdateStart').val();
+        let OrderStartdateEnd = $('#mobile_deal_OrderStartdateEnd').val();
         let DEI_SNList = $('#module_mobile_meal input[name="DEI_SNList"]:checked').map(function (index, element) {
             return $(element).val();
         }).get().join(',');//将数组元素连接起来转化为字符串
-        if (ApplydateStart == '' || ApplydateEnd == '' || DEI_SNList == '') {
+        if (ApplydateStart == '' || ApplydateEnd == '' || OrderStartdateStart == '' || OrderStartdateEnd == '' || DEI_SNList == '') {
             $.modaldialog.error("请检查必填项");
             return false;
         }
@@ -138,7 +165,9 @@
             dataType: "json",
             url: "<?php echo site_url('welcome/show_me_the_data')?>",
             data: {
-                "url": '/service-tourdesign/CountYDOrder?ApplydateStart=' + ApplydateStart + '&ApplydateEnd=' + ApplydateEnd + '%2023:59&DEI_SNList=' + DEI_SNList,
+                "url": '/service-tourdesign/CountYDOrder?ApplydateCheck=' + ApplydateCheck + '&ApplydateStart=' + ApplydateStart + '&ApplydateEnd=' + ApplydateEnd + '%2023:59'
+                    + '&OrderStartdateCheck=' + OrderStartdateCheck + '&OrderStartdateStart=' + OrderStartdateStart + '&OrderStartdateEnd=' + OrderStartdateEnd + '%2023:59'
+                    + '&DEI_SNList=' + DEI_SNList,
             },
             success: function (data, textStatus) {
                 document.getElementById('mobile_deal').innerHTML = '';
diff --git a/echarts/views/echarts/potential_customers.php b/echarts/views/echarts/potential_customers.php
index e58ac124..e9ec0c05 100644
--- a/echarts/views/echarts/potential_customers.php
+++ b/echarts/views/echarts/potential_customers.php
@@ -17,7 +17,11 @@
                     </label>
                 </li>
                 <li><label class="checkbox-inline">
-                        <input type="checkbox" id="website_GHKHYY" name="website" value="GHKHYY" checked> GH客户运营中心
+                        <input type="checkbox" id="website_GHKYZG" name="website" value="GHKYZG" > 客运中心中国
+                    </label>
+                </li>
+                <li><label class="checkbox-inline">
+                        <input type="checkbox" id="website_GHKYHW" name="website" value="GHKYHW" > 客运中心海外
                     </label>
                 </li>
                 <li><label class="checkbox-inline">
diff --git a/echarts/views/echarts/regular_customers.php b/echarts/views/echarts/regular_customers.php
index 3f93134a..3674e5d9 100644
--- a/echarts/views/echarts/regular_customers.php
+++ b/echarts/views/echarts/regular_customers.php
@@ -17,7 +17,11 @@
                     </label>
                 </li>
                 <li><label class="checkbox-inline">
-                        <input type="checkbox" id="website_GHKHYY" name="website" value="GHKHYY"> GH客户运营中心
+                        <input type="checkbox" id="website_GHKYZG" name="website" value="GHKYZG" > 客运中心中国
+                    </label>
+                </li>
+                <li><label class="checkbox-inline">
+                        <input type="checkbox" id="website_GHKYHW" name="website" value="GHKYHW" > 客运中心海外
                     </label>
                 </li>
                 <li><label class="checkbox-inline">

From a5144d7e3d0020f31e2c72a258c4aaf1386ed8e2 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 12 Jul 2022 10:31:23 +0800
Subject: [PATCH 09/20] 11

---
 application/views/mobile_first/ah-inquiry-form.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 76f30039..549c7734 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -571,11 +571,12 @@
 </select>
     <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number (We'll only call if you ask.) *" type="tel" value="" /> 
     <p style="
-    font-size: 17px;
+        font-size: 17px;
     color: #555;
     margin-top: -10px;
     margin-bottom: 5px;
     font-style: italic;
+    padding-left: 0;
 ">WhatsApp / iMessage is SUPER helpful to ensure you not miss any important info.</p>
 <div class="checkYes" style="margin-bottom: 15px;">
 						<input type="checkbox" value="Available on WhatsApp" name="whatsapp" id="whatsapp" class="checkBorder" style="  width: 22px; margin: 0;">

From 34324c6e4eaae188e8005ae2a3c922b8bd6ed879 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 12 Jul 2022 10:31:53 +0800
Subject: [PATCH 10/20] 11

---
 application/views/mobile_first/ah-inquiry-form.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index 549c7734..d7a28c22 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -570,8 +570,7 @@
     <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+358</option>
 </select>
     <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number (We'll only call if you ask.) *" type="tel" value="" /> 
-    <p style="
-        font-size: 17px;
+    <p style="font-size: 17px;
     color: #555;
     margin-top: -10px;
     margin-bottom: 5px;

From 27941778de71a96daa88b39f64326fa9e7242df5 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Tue, 12 Jul 2022 10:51:33 +0800
Subject: [PATCH 11/20] 11

---
 application/views/mobile_first/ah-inquiry-form.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php
index d7a28c22..2e3006c6 100644
--- a/application/views/mobile_first/ah-inquiry-form.php
+++ b/application/views/mobile_first/ah-inquiry-form.php
@@ -570,6 +570,8 @@
     <option value="Åland Islands +385">Åland Islands&nbsp; &nbsp;+358</option>
 </select>
     <input class="Inquiryphone" id="PhoneNo" name="PhoneNo" placeholder="Phone number (We'll only call if you ask.) *" type="tel" value="" /> 
+    <div id="contact_errmsg" style="display: none">
+        <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div>
     <p style="font-size: 17px;
     color: #555;
     margin-top: -10px;
@@ -581,8 +583,7 @@
 						<input type="checkbox" value="Available on WhatsApp" name="whatsapp" id="whatsapp" class="checkBorder" style="  width: 22px; margin: 0;">
 						<label for="whatsapp">This number is available on WhatsApp.</label>
 					</div>
-    <div id="contact_errmsg" style="display: none">
-    <div class="requiredArea" style="margin-top:-10px;">Please enter your phone number.</div> </div>
+   
    
    
     <button class="sendButton" id="submit_booking_form_inquiry" name="booking_form_inquiry_list" type="submit">Inquire Now</button> <input name="cli_no" type="hidden" value="<?php echo $meta_product_code; ?>"/> 

From de257ac648cda1e87a45ccf26739e4a028b13c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Tue, 12 Jul 2022 10:59:23 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=80=81=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E6=B5=B7=E5=A4=96=E7=AB=99=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 echarts/views/echarts/inchina_customers.php   | 2 +-
 echarts/views/echarts/potential_customers.php | 4 ++--
 echarts/views/echarts/regular_customers.php   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/echarts/views/echarts/inchina_customers.php b/echarts/views/echarts/inchina_customers.php
index 0822b48b..6a719ef4 100644
--- a/echarts/views/echarts/inchina_customers.php
+++ b/echarts/views/echarts/inchina_customers.php
@@ -92,7 +92,7 @@
                 </li>
                 <li>
                     <label class="checkbox-inline">
-                        <input type="checkbox" id="DEI_SNList_28" name="DEI_SNList" value="28"> AH亚洲项目组
+                        <input type="checkbox" id="DEI_SNList_28" name="DEI_SNList" value="28" checked> AH亚洲项目组
                     </label>
                 </li>
 
diff --git a/echarts/views/echarts/potential_customers.php b/echarts/views/echarts/potential_customers.php
index e9ec0c05..f4014cdc 100644
--- a/echarts/views/echarts/potential_customers.php
+++ b/echarts/views/echarts/potential_customers.php
@@ -21,7 +21,7 @@
                     </label>
                 </li>
                 <li><label class="checkbox-inline">
-                        <input type="checkbox" id="website_GHKYHW" name="website" value="GHKYHW" > 客运中心海外
+                        <input type="checkbox" id="website_GHKYHW" name="website" value="GHKYHW" checked > 客运中心海外
                     </label>
                 </li>
                 <li><label class="checkbox-inline">
@@ -92,7 +92,7 @@
                 </li>
                 <li>
                     <label class="checkbox-inline">
-                        <input type="checkbox" id="DEI_SNList_28" name="DEI_SNList" value="28"> AH亚洲项目组
+                        <input type="checkbox" id="DEI_SNList_28" name="DEI_SNList" value="28" checked> AH亚洲项目组
                     </label>
                 </li>
 
diff --git a/echarts/views/echarts/regular_customers.php b/echarts/views/echarts/regular_customers.php
index 3674e5d9..b81e9baa 100644
--- a/echarts/views/echarts/regular_customers.php
+++ b/echarts/views/echarts/regular_customers.php
@@ -92,7 +92,7 @@
                 </li>
                 <li>
                     <label class="checkbox-inline">
-                        <input type="checkbox" id="DEI_SNList_28" name="DEI_SNList" value="28"> AH亚洲项目组
+                        <input type="checkbox" id="DEI_SNList_28" name="DEI_SNList" value="28" checked> AH亚洲项目组
                     </label>
                 </li>
 

From 587f2c2f289bf5e6d7a3f8636c5103afbe1ac671 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 15 Jul 2022 13:37:03 +0800
Subject: [PATCH 13/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20Cookie=20=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch-pc.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 8b0a1f0f..1541d8c9 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -333,13 +333,9 @@ Corporate Number: 914503003486045699
         console.info('If you continue browsing, you agree to the use of cookies.');
     } else {
         document.getElementById('gotIdArea').style.display = '';
-        var gotItBtn = document.getElementById('gotItBtn');
-        gotItBtn.addEventListener('click', function (evt) {
-            if (window.localStorage) {
-                localStorage.setItem(GOT_IT_KEY, '1');
-            }
-            document.getElementById('gotIdArea').style.display = 'none';
-        });
+        if (window.localStorage) {
+            localStorage.setItem(GOT_IT_KEY, '1');
+        }
     }
 </script>
 <!--@PRODUCT-JS@-->

From 241a4bcba6e7db1843a57a18f0f5e995ad0719d9 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Fri, 15 Jul 2022 13:40:56 +0800
Subject: [PATCH 14/20] 11

---
 application/views/mobile_first/ch-pc.php | 2 +-
 application/views/mobile_first/ch.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 1541d8c9..509f3990 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -326,7 +326,7 @@ Corporate Number: 914503003486045699
         <img src="https://data.chinahighlights.com/pic/guide/info-template-bottom-logo.jpg" width="114" height="71" class="img-responsive bottomlogopc">
         <span class="bottomcopyright">© 1998-2022 China Highlights — Discovery Your Way!  </span>
 </div></div>
-<div class="web_cookie" style='display: none;' id='gotIdArea'><p>China Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy.htm">privacy policy</a>.</p> <button class="cookie_button" id='gotItBtn'>Got It</button></div>
+<div class="web_cookie" style='display: none;' id='gotIdArea'><p>China Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy.htm">privacy policy</a>.</p></div>
 <script>
     var GOT_IT_KEY = '__china_highlights_you_agree_to_use_of_cookies__';
     if (window.localStorage && localStorage.getItem(GOT_IT_KEY)) {
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index c82de353..0abefaaf 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -327,7 +327,7 @@
     </div>
 
 </footer>
-
+<div class="web_cookie" style='display: none;' id='gotIdArea'><p>China Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy.htm">privacy policy</a>.</p></div>
 <script>/* memu js https://data.chinahighlights.com/js/mobile-menu.js */
     (function(window){function classReg(className){return new RegExp("(^|\\s+)"+className+"(\\s+|$)")}var hasClass,addClass,removeClass;if("classList" in document.documentElement){hasClass=function(elem,c){return elem.classList.contains(c)};addClass=function(elem,c){elem.classList.add(c)};removeClass=function(elem,c){elem.classList.remove(c)}}else{hasClass=function(elem,c){return classReg(c).test(elem.className)};addClass=function(elem,c){if(!hasClass(elem,c)){elem.className=elem.className+" "+c}};removeClass=function(elem,c){elem.className=elem.className.replace(classReg(c)," ")}}function toggleClass(elem,c){var fn=hasClass(elem,c)?removeClass:addClass;fn(elem,c)}var classie={hasClass:hasClass,addClass:addClass,removeClass:removeClass,toggleClass:toggleClass,has:hasClass,add:addClass,remove:removeClass,toggle:toggleClass};if(typeof define==="function"&&define.amd){define(classie)}else{if(typeof exports==="object"){module.exports=classie}else{window.classie=classie}}})(window);
     !function(e,n,t){function r(e,n){return typeof e===n}function o(){var e,n,t,o,i,s,a;for(var f in C){if(C.hasOwnProperty(f)){if(e=[],n=C[f],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length)){for(t=0;t<n.options.aliases.length;t++){e.push(n.options.aliases[t].toLowerCase())}}for(o=r(n.fn,"function")?n.fn():n.fn,i=0;i<e.length;i++){s=e[i],a=s.split("."),1===a.length?Modernizr[a[0]]=o:(!Modernizr[a[0]]||Modernizr[a[0]] instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=o),g.push((o?"":"no-")+a.join("-"))}}}}function i(e){var n=w.className,t=Modernizr._config.classPrefix||"";if(x&&(n=n.baseVal),Modernizr._config.enableJSClass){var r=new RegExp("(^|\\s)"+t+"no-js(\\s|$)");n=n.replace(r,"$1"+t+"js$2")}Modernizr._config.enableClasses&&(n+=" "+t+e.join(" "+t),x?w.className.baseVal=n:w.className=n)}function s(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^-/,"")}function a(e,n){return !!~(""+e).indexOf(n)}function f(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):x?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function l(e,n){return function(){return e.apply(n,arguments)}}function u(e,n,t){var o;for(var i in e){if(e[i] in n){return t===!1?e[i]:(o=n[e[i]],r(o,"function")?l(o,t||n):o)}}return !1}function p(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function d(){var e=n.body;return e||(e=f(x?"svg":"body"),e.fake=!0),e}function c(e,t,r,o){var i,s,a,l,u="modernizr",p=f("div"),c=d();if(parseInt(r,10)){for(;r--;){a=f("div"),a.id=o?o[r]:u+(r+1),p.appendChild(a)}}return i=f("style"),i.type="text/css",i.id="s"+u,(c.fake?c:p).appendChild(i),c.appendChild(p),i.styleSheet?i.styleSheet.cssText=e:i.appendChild(n.createTextNode(e)),p.id=u,c.fake&&(c.style.background="",c.style.overflow="hidden",l=w.style.overflow,w.style.overflow="hidden",w.appendChild(c)),s=t(p,e),c.fake?(c.parentNode.removeChild(c),w.style.overflow=l,w.offsetHeight):p.parentNode.removeChild(p),!!s}function m(n,r){var o=n.length;if("CSS" in e&&"supports" in e.CSS){for(;o--;){if(e.CSS.supports(p(n[o]),r)){return !0}}return !1}if("CSSSupportsRule" in e){for(var i=[];o--;){i.push("("+p(n[o])+":"+r+")")}return i=i.join(" or "),c("@supports ("+i+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return t}function v(e,n,o,i){function l(){p&&(delete z.style,delete z.modElem)}if(i=r(i,"undefined")?!1:i,!r(o,"undefined")){var u=m(e,o);if(!r(u,"undefined")){return u}}for(var p,d,c,v,h,y=["modernizr","tspan"];!z.style;){p=!0,z.modElem=f(y.shift()),z.style=z.modElem.style}for(c=e.length,d=0;c>d;d++){if(v=e[d],h=z.style[v],a(v,"-")&&(v=s(v)),z.style[v]!==t){if(i||r(o,"undefined")){return l(),"pfx"==n?v:!0}try{z.style[v]=o}catch(g){}if(z.style[v]!=h){return l(),"pfx"==n?v:!0}}}return l(),!1}function h(e,n,t,o,i){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+b.join(s+" ")+s).split(" ");return r(n,"string")||r(n,"undefined")?v(a,n,o,i):(a=(e+" "+N.join(s+" ")+s).split(" "),u(a,n,t))}function y(e,n,r){return h(e,t,t,n,r)}var g=[],C=[],_={_version:"3.2.0",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){C.push({name:e,fn:n,options:t})},addAsyncTest:function(e){C.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=_,Modernizr=new Modernizr;var w=n.documentElement,x="svg"===w.nodeName.toLowerCase(),S="Moz O ms Webkit",b=_._config.usePrefixes?S.split(" "):[];

From 869faa7f6f777dfa05156b8d2a6ae521eda1483e Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 15 Jul 2022 13:57:54 +0800
Subject: [PATCH 15/20] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20Cookie=20=E6=8F=90=E7=A4=BA=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ch.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 0abefaaf..79af2143 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -328,6 +328,17 @@
 
 </footer>
 <div class="web_cookie" style='display: none;' id='gotIdArea'><p>China Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy.htm">privacy policy</a>.</p></div>
+<script>
+    var GOT_IT_KEY = '__china_highlights_you_agree_to_use_of_cookies__';
+    if (window.localStorage && localStorage.getItem(GOT_IT_KEY)) {
+        console.info('If you continue browsing, you agree to the use of cookies.');
+    } else {
+        document.getElementById('gotIdArea').style.display = '';
+        if (window.localStorage) {
+            localStorage.setItem(GOT_IT_KEY, '1');
+        }
+    }
+</script>
 <script>/* memu js https://data.chinahighlights.com/js/mobile-menu.js */
     (function(window){function classReg(className){return new RegExp("(^|\\s+)"+className+"(\\s+|$)")}var hasClass,addClass,removeClass;if("classList" in document.documentElement){hasClass=function(elem,c){return elem.classList.contains(c)};addClass=function(elem,c){elem.classList.add(c)};removeClass=function(elem,c){elem.classList.remove(c)}}else{hasClass=function(elem,c){return classReg(c).test(elem.className)};addClass=function(elem,c){if(!hasClass(elem,c)){elem.className=elem.className+" "+c}};removeClass=function(elem,c){elem.className=elem.className.replace(classReg(c)," ")}}function toggleClass(elem,c){var fn=hasClass(elem,c)?removeClass:addClass;fn(elem,c)}var classie={hasClass:hasClass,addClass:addClass,removeClass:removeClass,toggleClass:toggleClass,has:hasClass,add:addClass,remove:removeClass,toggle:toggleClass};if(typeof define==="function"&&define.amd){define(classie)}else{if(typeof exports==="object"){module.exports=classie}else{window.classie=classie}}})(window);
     !function(e,n,t){function r(e,n){return typeof e===n}function o(){var e,n,t,o,i,s,a;for(var f in C){if(C.hasOwnProperty(f)){if(e=[],n=C[f],n.name&&(e.push(n.name.toLowerCase()),n.options&&n.options.aliases&&n.options.aliases.length)){for(t=0;t<n.options.aliases.length;t++){e.push(n.options.aliases[t].toLowerCase())}}for(o=r(n.fn,"function")?n.fn():n.fn,i=0;i<e.length;i++){s=e[i],a=s.split("."),1===a.length?Modernizr[a[0]]=o:(!Modernizr[a[0]]||Modernizr[a[0]] instanceof Boolean||(Modernizr[a[0]]=new Boolean(Modernizr[a[0]])),Modernizr[a[0]][a[1]]=o),g.push((o?"":"no-")+a.join("-"))}}}}function i(e){var n=w.className,t=Modernizr._config.classPrefix||"";if(x&&(n=n.baseVal),Modernizr._config.enableJSClass){var r=new RegExp("(^|\\s)"+t+"no-js(\\s|$)");n=n.replace(r,"$1"+t+"js$2")}Modernizr._config.enableClasses&&(n+=" "+t+e.join(" "+t),x?w.className.baseVal=n:w.className=n)}function s(e){return e.replace(/([a-z])-([a-z])/g,function(e,n,t){return n+t.toUpperCase()}).replace(/^-/,"")}function a(e,n){return !!~(""+e).indexOf(n)}function f(){return"function"!=typeof n.createElement?n.createElement(arguments[0]):x?n.createElementNS.call(n,"http://www.w3.org/2000/svg",arguments[0]):n.createElement.apply(n,arguments)}function l(e,n){return function(){return e.apply(n,arguments)}}function u(e,n,t){var o;for(var i in e){if(e[i] in n){return t===!1?e[i]:(o=n[e[i]],r(o,"function")?l(o,t||n):o)}}return !1}function p(e){return e.replace(/([A-Z])/g,function(e,n){return"-"+n.toLowerCase()}).replace(/^ms-/,"-ms-")}function d(){var e=n.body;return e||(e=f(x?"svg":"body"),e.fake=!0),e}function c(e,t,r,o){var i,s,a,l,u="modernizr",p=f("div"),c=d();if(parseInt(r,10)){for(;r--;){a=f("div"),a.id=o?o[r]:u+(r+1),p.appendChild(a)}}return i=f("style"),i.type="text/css",i.id="s"+u,(c.fake?c:p).appendChild(i),c.appendChild(p),i.styleSheet?i.styleSheet.cssText=e:i.appendChild(n.createTextNode(e)),p.id=u,c.fake&&(c.style.background="",c.style.overflow="hidden",l=w.style.overflow,w.style.overflow="hidden",w.appendChild(c)),s=t(p,e),c.fake?(c.parentNode.removeChild(c),w.style.overflow=l,w.offsetHeight):p.parentNode.removeChild(p),!!s}function m(n,r){var o=n.length;if("CSS" in e&&"supports" in e.CSS){for(;o--;){if(e.CSS.supports(p(n[o]),r)){return !0}}return !1}if("CSSSupportsRule" in e){for(var i=[];o--;){i.push("("+p(n[o])+":"+r+")")}return i=i.join(" or "),c("@supports ("+i+") { #modernizr { position: absolute; } }",function(e){return"absolute"==getComputedStyle(e,null).position})}return t}function v(e,n,o,i){function l(){p&&(delete z.style,delete z.modElem)}if(i=r(i,"undefined")?!1:i,!r(o,"undefined")){var u=m(e,o);if(!r(u,"undefined")){return u}}for(var p,d,c,v,h,y=["modernizr","tspan"];!z.style;){p=!0,z.modElem=f(y.shift()),z.style=z.modElem.style}for(c=e.length,d=0;c>d;d++){if(v=e[d],h=z.style[v],a(v,"-")&&(v=s(v)),z.style[v]!==t){if(i||r(o,"undefined")){return l(),"pfx"==n?v:!0}try{z.style[v]=o}catch(g){}if(z.style[v]!=h){return l(),"pfx"==n?v:!0}}}return l(),!1}function h(e,n,t,o,i){var s=e.charAt(0).toUpperCase()+e.slice(1),a=(e+" "+b.join(s+" ")+s).split(" ");return r(n,"string")||r(n,"undefined")?v(a,n,o,i):(a=(e+" "+N.join(s+" ")+s).split(" "),u(a,n,t))}function y(e,n,r){return h(e,t,t,n,r)}var g=[],C=[],_={_version:"3.2.0",_config:{classPrefix:"",enableClasses:!0,enableJSClass:!0,usePrefixes:!0},_q:[],on:function(e,n){var t=this;setTimeout(function(){n(t[e])},0)},addTest:function(e,n,t){C.push({name:e,fn:n,options:t})},addAsyncTest:function(e){C.push({name:null,fn:e})}},Modernizr=function(){};Modernizr.prototype=_,Modernizr=new Modernizr;var w=n.documentElement,x="svg"===w.nodeName.toLowerCase(),S="Moz O ms Webkit",b=_._config.usePrefixes?S.split(" "):[];

From 4f5a3a0f11a79dbdfe131666a2a0c070c7c96ffd Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Fri, 15 Jul 2022 14:19:01 +0800
Subject: [PATCH 16/20] =?UTF-8?q?cookie=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ah-pc.php | 2 +-
 application/views/mobile_first/ah.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index 0a5af4cd..837d8c2a 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -357,7 +357,7 @@
 
     </div>
 </div>
-<div class="web_cookie" style='display: none;' id='gotIdArea'><p>Asia Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy">privacy policy</a>.</p> <button class="cookie_button" id='gotItBtn'>Got It</button></div>
+<div class="web_cookie" id='gotIdArea'><p>Asia Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy">privacy policy</a>.</p> </div>
 <script>
     var GOT_IT_KEY = '__asia_highlights_you_agree_to_use_of_cookies__';
     if (window.localStorage && localStorage.getItem(GOT_IT_KEY)) {
diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php
index 7e5edd4b..b930cd36 100644
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@@ -306,7 +306,7 @@
     <div class="bottomlogo">
         © 2016-2022 Asia Highlights <br>— Discovery Your Way!
     </div>
-
+    <div class="web_cookie" id='gotIdArea'><p>Asia Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy">privacy policy</a>.</p> </div>
 </footer>
 <!--移动底部 结束-->
 

From 878fd9a89620affd1d770a5a086c8ff371b6aa60 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 15 Jul 2022 14:22:05 +0800
Subject: [PATCH 17/20] =?UTF-8?q?AH=20=E4=BF=AE=E6=94=B9=20Cookie=20?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ah-pc.php | 10 +++-------
 application/views/mobile_first/ah.php    | 11 +++++++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index 837d8c2a..9c195ead 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -364,13 +364,9 @@
         console.info('If you continue browsing, you agree to the use of cookies.');
     } else {
         document.getElementById('gotIdArea').style.display = '';
-        var gotItBtn = document.getElementById('gotItBtn');
-        gotItBtn.addEventListener('click', function (evt) {
-            if (window.localStorage) {
-                localStorage.setItem(GOT_IT_KEY, '1');
-            }
-            document.getElementById('gotIdArea').style.display = 'none';
-        });
+        if (window.localStorage) {
+            localStorage.setItem(GOT_IT_KEY, '1');
+        }
     }
 </script>
 <!--PC底部 结束-->
diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php
index b930cd36..d93e4f84 100644
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@@ -307,6 +307,17 @@
         © 2016-2022 Asia Highlights <br>— Discovery Your Way!
     </div>
     <div class="web_cookie" id='gotIdArea'><p>Asia Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy">privacy policy</a>.</p> </div>
+    <script>
+      var GOT_IT_KEY = '__asia_highlights_you_agree_to_use_of_cookies__';
+      if (window.localStorage && localStorage.getItem(GOT_IT_KEY)) {
+          console.info('If you continue browsing, you agree to the use of cookies.');
+      } else {
+          document.getElementById('gotIdArea').style.display = '';
+          if (window.localStorage) {
+              localStorage.setItem(GOT_IT_KEY, '1');
+          }
+      }
+  </script>
 </footer>
 <!--移动底部 结束-->
 

From 95220d92e915f9ef39881b636ab9dfd08b6e407f Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Fri, 15 Jul 2022 14:43:08 +0800
Subject: [PATCH 18/20] 11

---
 application/views/mobile_first/ah-pc.php | 2 +-
 application/views/mobile_first/ah.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index 9c195ead..d6d49f2c 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -357,7 +357,7 @@
 
     </div>
 </div>
-<div class="web_cookie" id='gotIdArea'><p>Asia Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy">privacy policy</a>.</p> </div>
+<div class="web_cookie" id='gotIdArea' style='display: none;'><p>Asia Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy">privacy policy</a>.</p> </div>
 <script>
     var GOT_IT_KEY = '__asia_highlights_you_agree_to_use_of_cookies__';
     if (window.localStorage && localStorage.getItem(GOT_IT_KEY)) {
diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php
index d93e4f84..344569f2 100644
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@@ -306,7 +306,7 @@
     <div class="bottomlogo">
         © 2016-2022 Asia Highlights <br>— Discovery Your Way!
     </div>
-    <div class="web_cookie" id='gotIdArea'><p>Asia Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy">privacy policy</a>.</p> </div>
+    <div class="web_cookie" id='gotIdArea' style='display: none;'><p>Asia Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy">privacy policy</a>.</p> </div>
     <script>
       var GOT_IT_KEY = '__asia_highlights_you_agree_to_use_of_cookies__';
       if (window.localStorage && localStorage.getItem(GOT_IT_KEY)) {

From fa40f7dd7333664fc3374efacad55920b363ff2d Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Fri, 15 Jul 2022 14:50:18 +0800
Subject: [PATCH 19/20] =?UTF-8?q?cookie=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/gh-pc.php | 2 +-
 application/views/mobile_first/gh.php    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php
index ebdb155d..561e3864 100644
--- a/application/views/mobile_first/gh-pc.php
+++ b/application/views/mobile_first/gh-pc.php
@@ -365,7 +365,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 
     </div>
 </div>
-<div class="web_cookie" style='display: none;' id='gotIdArea'><p>Global Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy.htm">privacy policy</a>.</p> <button class="cookie_button" id='gotItBtn'>Got It</button></div>
+<div class="web_cookie" style='display: none;' id='gotIdArea'><p>Global Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy.htm">privacy policy</a>.</p></div>
 <script>
     var GOT_IT_KEY = '__global_highlights_you_agree_to_use_of_cookies__';
     if (window.localStorage && localStorage.getItem(GOT_IT_KEY)) {
diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php
index 9f211225..10d2baa8 100644
--- a/application/views/mobile_first/gh.php
+++ b/application/views/mobile_first/gh.php
@@ -316,6 +316,7 @@ aria-label="festival">
     © 2018-2022 Global Highlights <br>— Discovery Your Way!
 </div>
 </footer>
+<div class="web_cookie" style='display: none;' id='gotIdArea'><p>Global Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy.htm">privacy policy</a>.</p></div>
 <!--移动底部 结束-->
 <script>/* memu js https://data.chinahighlights.com/js/mobile-menu.js */
     (function(window){function classReg(className){return new RegExp("(^|\\s+)"+className+"(\\s+|$)")}var hasClass,addClass,removeClass;if("classList" in document.documentElement){hasClass=function(elem,c){return elem.classList.contains(c)};addClass=function(elem,c){elem.classList.add(c)};removeClass=function(elem,c){elem.classList.remove(c)}}else{hasClass=function(elem,c){return classReg(c).test(elem.className)};addClass=function(elem,c){if(!hasClass(elem,c)){elem.className=elem.className+" "+c}};removeClass=function(elem,c){elem.className=elem.className.replace(classReg(c)," ")}}function toggleClass(elem,c){var fn=hasClass(elem,c)?removeClass:addClass;fn(elem,c)}var classie={hasClass:hasClass,addClass:addClass,removeClass:removeClass,toggleClass:toggleClass,has:hasClass,add:addClass,remove:removeClass,toggle:toggleClass};if(typeof define==="function"&&define.amd){define(classie)}else{if(typeof exports==="object"){module.exports=classie}else{window.classie=classie}}})(window);

From 52a36a693e1e12de52e7f8804c5d05648a0f79a4 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 15 Jul 2022 14:54:14 +0800
Subject: [PATCH 20/20] =?UTF-8?q?GH=20=E4=BF=AE=E6=94=B9=20Cookie=20?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/gh-pc.php | 10 +++-------
 application/views/mobile_first/gh.php    | 11 +++++++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/application/views/mobile_first/gh-pc.php b/application/views/mobile_first/gh-pc.php
index 561e3864..400a488c 100644
--- a/application/views/mobile_first/gh-pc.php
+++ b/application/views/mobile_first/gh-pc.php
@@ -372,13 +372,9 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
         console.info('If you continue browsing, you agree to the use of cookies.');
     } else {
         document.getElementById('gotIdArea').style.display = '';
-        var gotItBtn = document.getElementById('gotItBtn');
-        gotItBtn.addEventListener('click', function (evt) {
-            if (window.localStorage) {
-                localStorage.setItem(GOT_IT_KEY, '1');
-            }
-            document.getElementById('gotIdArea').style.display = 'none';
-        });
+        if (window.localStorage) {
+            localStorage.setItem(GOT_IT_KEY, '1');
+        }
     }
 </script>
 <!--PC底部 结束-->
diff --git a/application/views/mobile_first/gh.php b/application/views/mobile_first/gh.php
index 10d2baa8..2f28a7e3 100644
--- a/application/views/mobile_first/gh.php
+++ b/application/views/mobile_first/gh.php
@@ -317,6 +317,17 @@ aria-label="festival">
 </div>
 </footer>
 <div class="web_cookie" style='display: none;' id='gotIdArea'><p>Global Highlights uses cookies to give you the best possible service. If you continue browsing, you agree to the use of cookies. More details can be found in our <a href="/privacy.htm">privacy policy</a>.</p></div>
+<script>
+    var GOT_IT_KEY = '__global_highlights_you_agree_to_use_of_cookies__';
+    if (window.localStorage && localStorage.getItem(GOT_IT_KEY)) {
+        console.info('If you continue browsing, you agree to the use of cookies.');
+    } else {
+        document.getElementById('gotIdArea').style.display = '';
+        if (window.localStorage) {
+            localStorage.setItem(GOT_IT_KEY, '1');
+        }
+    }
+</script>
 <!--移动底部 结束-->
 <script>/* memu js https://data.chinahighlights.com/js/mobile-menu.js */
     (function(window){function classReg(className){return new RegExp("(^|\\s+)"+className+"(\\s+|$)")}var hasClass,addClass,removeClass;if("classList" in document.documentElement){hasClass=function(elem,c){return elem.classList.contains(c)};addClass=function(elem,c){elem.classList.add(c)};removeClass=function(elem,c){elem.classList.remove(c)}}else{hasClass=function(elem,c){return classReg(c).test(elem.className)};addClass=function(elem,c){if(!hasClass(elem,c)){elem.className=elem.className+" "+c}};removeClass=function(elem,c){elem.className=elem.className.replace(classReg(c)," ")}}function toggleClass(elem,c){var fn=hasClass(elem,c)?removeClass:addClass;fn(elem,c)}var classie={hasClass:hasClass,addClass:addClass,removeClass:removeClass,toggleClass:toggleClass,has:hasClass,add:addClass,remove:removeClass,toggle:toggleClass};if(typeof define==="function"&&define.amd){define(classie)}else{if(typeof exports==="object"){module.exports=classie}else{window.classie=classie}}})(window);