From f7525405256a5315ff7972129d7ffa1fa68f7abb Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 27 May 2021 14:46:50 +0800
Subject: [PATCH 01/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index 86380085..a2b8f911 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -15,9 +15,10 @@
                         id="realname_errmsg" style="display: none"><span class="requiredArea">Please enter your full name</span></span>
             </p>
 
-            <p><input class="EmailAddress" id="email" name="email" placeholder="Email" type="text"/> <span
-                        id="email_errmsg" style="display: none"><span
-                            class="requiredArea">Please enter your email</span></span></p>
+            <p><input class="EmailAddress" id="email" name="email" placeholder="Email" type="text"/>
+                <span id="email_errmsg" style="display: none"><span class="requiredArea">Please enter your email</span></span>
+                <span id="email_verify_errmsg" style="display: none"><span class="requiredArea">Please verify your email</span></span>
+            </p>
 
             <p><input class="Inquiryphone" id="PhoneNo" name="PhoneNo"
                       placeholder="Any other way to reach you (optional)" style="padding-left: 50px;" type="tel"/></p>
@@ -25,7 +26,7 @@
             <p class="InquiryDate"><input class="InquiryCalendar" data-min-date="7" id="starting_date"
                                           name="starting_date" placeholder="Starting date" readonly="readonly"
                                           type="text"/><span id="starting_date_errmsg" style="display: none"><span
-                            class="requiredArea">Please verify your email</span></span></p>
+                            class="requiredArea">Please enter your starting date</span></span></p>
 
             <p>
                 <textarea id="form_additionalrequirements" name="form_additionalrequirements"

From 20a9de0ffef47ff7b9bc289cfa96ff8280118fd0 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 27 May 2021 16:43:51 +0800
Subject: [PATCH 02/16] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/libraries/testdeploybot.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 application/libraries/testdeploybot.txt

diff --git a/application/libraries/testdeploybot.txt b/application/libraries/testdeploybot.txt
deleted file mode 100644
index e69de29b..00000000

From be2b43d66b267960e7199ab9dfae5418d0cb3b15 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Fri, 28 May 2021 10:01:49 +0800
Subject: [PATCH 03/16] 11

---
 .../views/mobile_first/ch-inquiry-form.php       | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index a2b8f911..48e4b677 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -11,19 +11,27 @@
     <form action="https://www.chinahighlights.com/secureforms/qi_save" id="quick_inquiry_form" method="post"
           name="quick_inquiry_form" novalidate="" onsubmit="return validateQuickInquiryForm()">
         <div class="InquiryBox">
-            <p><input class="FullName" id="realname" name="realname" placeholder="Full name" type="text"/> <span
+            <p>
+            <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/input-name.png"></span>    
+            <input class="FullName" id="realname" name="realname" placeholder="Full name" type="text"/> <span
                         id="realname_errmsg" style="display: none"><span class="requiredArea">Please enter your full name</span></span>
             </p>
 
-            <p><input class="EmailAddress" id="email" name="email" placeholder="Email" type="text"/>
+            <p>
+            <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/input-email.png"></span>     
+            <input class="EmailAddress" id="email" name="email" placeholder="Email" type="text"/>
                 <span id="email_errmsg" style="display: none"><span class="requiredArea">Please enter your email</span></span>
                 <span id="email_verify_errmsg" style="display: none"><span class="requiredArea">Please verify your email</span></span>
             </p>
 
-            <p><input class="Inquiryphone" id="PhoneNo" name="PhoneNo"
+            <p>
+            <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/top10/tour-form-phone-tag-bg.png"></span>     
+            <input class="Inquiryphone" id="PhoneNo" name="PhoneNo"
                       placeholder="Any other way to reach you (optional)" style="padding-left: 50px;" type="tel"/></p>
 
-            <p class="InquiryDate"><input class="InquiryCalendar" data-min-date="7" id="starting_date"
+            <p class="InquiryDate">
+            <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/top10/tour-calendar.png"></span>     
+            <input class="InquiryCalendar" data-min-date="7" id="starting_date"
                                           name="starting_date" placeholder="Starting date" readonly="readonly"
                                           type="text"/><span id="starting_date_errmsg" style="display: none"><span
                             class="requiredArea">Please enter your starting date</span></span></p>

From 33c5958e4b2c67bf6acd0679bd0f87d1de96af44 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Fri, 28 May 2021 10:13:05 +0800
Subject: [PATCH 04/16] 11

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

diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index 48e4b677..55884846 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -11,35 +11,35 @@
     <form action="https://www.chinahighlights.com/secureforms/qi_save" id="quick_inquiry_form" method="post"
           name="quick_inquiry_form" novalidate="" onsubmit="return validateQuickInquiryForm()">
         <div class="InquiryBox">
-            <p>
+            <p >
             <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/input-name.png"></span>    
             <input class="FullName" id="realname" name="realname" placeholder="Full name" type="text"/> <span
                         id="realname_errmsg" style="display: none"><span class="requiredArea">Please enter your full name</span></span>
             </p>
 
-            <p>
+            <p >
             <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/input-email.png"></span>     
             <input class="EmailAddress" id="email" name="email" placeholder="Email" type="text"/>
                 <span id="email_errmsg" style="display: none"><span class="requiredArea">Please enter your email</span></span>
                 <span id="email_verify_errmsg" style="display: none"><span class="requiredArea">Please verify your email</span></span>
             </p>
 
-            <p>
+            <p >
             <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/top10/tour-form-phone-tag-bg.png"></span>     
             <input class="Inquiryphone" id="PhoneNo" name="PhoneNo"
-                      placeholder="Any other way to reach you (optional)" style="padding-left: 50px;" type="tel"/></p>
+                      placeholder="Any other way to reach you (optional)" type="tel"/></p>
 
-            <p class="InquiryDate">
+            <p >
             <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/top10/tour-calendar.png"></span>     
             <input class="InquiryCalendar" data-min-date="7" id="starting_date"
                                           name="starting_date" placeholder="Starting date" readonly="readonly"
                                           type="text"/><span id="starting_date_errmsg" style="display: none"><span
                             class="requiredArea">Please enter your starting date</span></span></p>
 
-            <p>
+         
                 <textarea id="form_additionalrequirements" name="form_additionalrequirements"
                           placeholder="Tell us your travel ideas/interests, how many people, your hotel style…"></textarea>
-            </p>
+         
             <input type="hidden" name="nullemail">
             <input name="cli_no" type="hidden" value="<?php echo $meta_product_code; ?>"/>
             <button class="sendButton" id="quick_inquiry_button" name="quick_inquiry_button" type="submit">Send My

From de59da674e5caf7d13f9c8f8102a11d791a48bb3 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Fri, 28 May 2021 16:41:32 +0800
Subject: [PATCH 05/16] 11

---
 application/views/mobile_first/ch-inquiry-form.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index 55884846..6ec2f858 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -12,13 +12,16 @@
           name="quick_inquiry_form" novalidate="" onsubmit="return validateQuickInquiryForm()">
         <div class="InquiryBox">
             <p >
-            <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/input-name.png"></span>    
+            <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
                         id="realname_errmsg" style="display: none"><span class="requiredArea">Please enter your full name</span></span>
             </p>
 
             <p >
-            <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/input-email.png"></span>     
+            <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/input-email.png">
+                <span class="form_required">*</span></span>     
             <input class="EmailAddress" id="email" name="email" placeholder="Email" type="text"/>
                 <span id="email_errmsg" style="display: none"><span class="requiredArea">Please enter your email</span></span>
                 <span id="email_verify_errmsg" style="display: none"><span class="requiredArea">Please verify your email</span></span>
@@ -27,10 +30,11 @@
             <p >
             <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/top10/tour-form-phone-tag-bg.png"></span>     
             <input class="Inquiryphone" id="PhoneNo" name="PhoneNo"
-                      placeholder="Any other way to reach you (optional)" type="tel"/></p>
+                      placeholder="Any other way to reach you" type="tel"/></p>
 
             <p >
-            <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/top10/tour-calendar.png"></span>     
+            <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/top10/tour-calendar.png">
+                <span class="form_required">*</span></span>     
             <input class="InquiryCalendar" data-min-date="7" id="starting_date"
                                           name="starting_date" placeholder="Starting date" readonly="readonly"
                                           type="text"/><span id="starting_date_errmsg" style="display: none"><span

From 4f35f71dee2777fb48fb47ffdd319a0af96ff4f8 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Fri, 28 May 2021 16:59:36 +0800
Subject: [PATCH 06/16] 11

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

diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index 6ec2f858..91757723 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -28,7 +28,7 @@
             </p>
 
             <p >
-            <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/top10/tour-form-phone-tag-bg.png"></span>     
+            <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/top10/tour-form-phone-tag-bg.png" style="    margin-left: -13px;"></span>     
             <input class="Inquiryphone" id="PhoneNo" name="PhoneNo"
                       placeholder="Any other way to reach you" type="tel"/></p>
 

From 187678c378d5b947417649a5ca77ead4983fd1f3 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Fri, 28 May 2021 18:31:07 +0800
Subject: [PATCH 07/16] ok

---
 application/views/bootstrap3/information_edit.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index f062f76e..6ded952e 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -2098,7 +2098,14 @@
                     <label>标题图片<a href="javascript:void(0);" onclick="delete_root_image();" title="删除图片"><i
                                     class="text-muted glyphicon glyphicon-remove"></i></a></label>
                     <a href="javascript:void(0);" onclick="openKCFinder_Root();">
-                        <img src="<?php echo $information->ic_photo ? $this->config->item('media_image_url') . $information->ic_photo : '/css/images/uploadPic.jpg'; ?>"
+                        <?php 
+                            if (stripos($information->ic_photo, 'http:') === false) {
+                                $list_picture = $information->ic_photo ? $this->config->item('media_image_url') . $information->ic_photo : '/css/images/uploadPic.jpg';
+                            } else {
+                                $list_picture = $information->ic_photo;
+                            }
+                        ?>
+                        <img src="<?php echo $list_picture; ?>"
                              name="ic_photo_img" id="ic_photo_img" class="img-polaroid col-xs-24 nopadding"
                              height="115"/>
                     </a>

From 6ab6efba43f71e04362a979d3049f6f6ec6f51c9 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Fri, 28 May 2021 18:32:44 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E5=BF=BD=E7=95=A5=20JHTPP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/bootstrap3/information_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php
index 6ded952e..8d8744d8 100644
--- a/application/views/bootstrap3/information_edit.php
+++ b/application/views/bootstrap3/information_edit.php
@@ -2099,7 +2099,7 @@
                                     class="text-muted glyphicon glyphicon-remove"></i></a></label>
                     <a href="javascript:void(0);" onclick="openKCFinder_Root();">
                         <?php 
-                            if (stripos($information->ic_photo, 'http:') === false) {
+                            if (stripos($information->ic_photo, '//') === false) {
                                 $list_picture = $information->ic_photo ? $this->config->item('media_image_url') . $information->ic_photo : '/css/images/uploadPic.jpg';
                             } else {
                                 $list_picture = $information->ic_photo;

From b8172ef2897e3a46dd9021686b0b760ddcfd8c3f Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Sat, 29 May 2021 00:27:11 +0800
Subject: [PATCH 09/16] ok

---
 application/views/bootstrap3/header.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php
index 7b0880cc..6ffb06d1 100644
--- a/application/views/bootstrap3/header.php
+++ b/application/views/bootstrap3/header.php
@@ -163,9 +163,9 @@
                             <span class="input-group-btn">
                                 <button class="btn btn-default btn-sm" type="submit">搜索</button>
                                 <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?>
-                                <a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" class="btn btn-default btn-sm" title="图片管理"  ><span class="glyphicon glyphicon-picture"></span></a>
+                                    <a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" target="_blank" class="btn" title="图片上传管理"><i class="icon-picture"></i></a>
                                 <?php } else { ?>
-                                    <a href="#" onclick="openKCFinder_singleFile_res();" class="btn btn-default btn-sm" title="快速上传图片"  ><span class="glyphicon glyphicon-picture"></span></a>
+                                    <a href="#" onclick="openKCFinder_singleFile_res();" class="btn" title="快速上传图片"  ><i class="icon-picture"></i></a>
                                 <?php } ?>
                                 <a href="#" onclick="openKCFinder_fast();" class="btn btn-default btn-sm" title="多媒体中心"  ><span class="glyphicon glyphicon-folder-open"></span></a>
                                 <a href="#" title="静态化更新" class="btn btn-default btn-sm"  data-toggle="modal" data-target="#cache_refresh_modal" ><span class="glyphicon glyphicon-repeat"></span></a>

From e6071931c913cf217743a4627de2a508ab66a054 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Sat, 29 May 2021 00:32:24 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/bootstrap3/header.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php
index 6ffb06d1..d48a127f 100644
--- a/application/views/bootstrap3/header.php
+++ b/application/views/bootstrap3/header.php
@@ -163,9 +163,9 @@
                             <span class="input-group-btn">
                                 <button class="btn btn-default btn-sm" type="submit">搜索</button>
                                 <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?>
-                                    <a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" target="_blank" class="btn" title="图片上传管理"><i class="icon-picture"></i></a>
+                                    <a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" target="_blank" class="btn" title="图片上传管理"><span class="glyphicon glyphicon-picture"></span></a>
                                 <?php } else { ?>
-                                    <a href="#" onclick="openKCFinder_singleFile_res();" class="btn" title="快速上传图片"  ><i class="icon-picture"></i></a>
+                                    <a href="#" onclick="openKCFinder_singleFile_res();" class="btn" title="快速上传图片"><span class="glyphicon glyphicon-picture"></span></a>
                                 <?php } ?>
                                 <a href="#" onclick="openKCFinder_fast();" class="btn btn-default btn-sm" title="多媒体中心"  ><span class="glyphicon glyphicon-folder-open"></span></a>
                                 <a href="#" title="静态化更新" class="btn btn-default btn-sm"  data-toggle="modal" data-target="#cache_refresh_modal" ><span class="glyphicon glyphicon-repeat"></span></a>

From 1fa7e20bc9ba72e5950344c3b03960b8f94f534a Mon Sep 17 00:00:00 2001
From: "59361885@qq.com" <59361885@qq.com>
Date: Sat, 29 May 2021 00:37:03 +0800
Subject: [PATCH 11/16] ok

---
 application/views/bootstrap3/header.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php
index d48a127f..5b9075e0 100644
--- a/application/views/bootstrap3/header.php
+++ b/application/views/bootstrap3/header.php
@@ -163,9 +163,9 @@
                             <span class="input-group-btn">
                                 <button class="btn btn-default btn-sm" type="submit">搜索</button>
                                 <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) {?>
-                                    <a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" target="_blank" class="btn" title="图片上传管理"><span class="glyphicon glyphicon-picture"></span></a>
+                                    <a href="https://cdn.chinarundreisen.com/#/picture-manager/picture-storehouse" target="_blank" class="btn btn-default btn-sm" title="图片上传管理"><span class="glyphicon glyphicon-picture"></span></a>
                                 <?php } else { ?>
-                                    <a href="#" onclick="openKCFinder_singleFile_res();" class="btn" title="快速上传图片"><span class="glyphicon glyphicon-picture"></span></a>
+                                    <a href="#" onclick="openKCFinder_singleFile_res();" class="btn btn-default btn-sm" title="快速上传图片"><span class="glyphicon glyphicon-picture"></span></a>
                                 <?php } ?>
                                 <a href="#" onclick="openKCFinder_fast();" class="btn btn-default btn-sm" title="多媒体中心"  ><span class="glyphicon glyphicon-folder-open"></span></a>
                                 <a href="#" title="静态化更新" class="btn btn-default btn-sm"  data-toggle="modal" data-target="#cache_refresh_modal" ><span class="glyphicon glyphicon-repeat"></span></a>

From 772b4b8176cf550637cf4a63f6479bb9e64ed461 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 31 May 2021 10:14:19 +0800
Subject: [PATCH 12/16] =?UTF-8?q?CH=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=9B=B4=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index 91757723..a56e95fa 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -28,7 +28,7 @@
             </p>
 
             <p >
-            <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/top10/tour-form-phone-tag-bg.png" style="    margin-left: -13px;"></span>     
+            <span class="inquiry_form_tag"><img src="https://data.chinahighlights.com/pic/top10/tour-form-phone-tag-bg.png" style="margin-left: -13px;"></span>     
             <input class="Inquiryphone" id="PhoneNo" name="PhoneNo"
                       placeholder="Any other way to reach you" type="tel"/></p>
 
diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 40b2cbf8..9744b709 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -57,7 +57,7 @@
                             <li class="start-nav-item"><a href="/tour/year.htm">China Tours 2021</a></li>
                             <li class="start-nav-item"><a href="/tour/china-panda-tours/">Panda Tours</a></li>
                             <li class="start-nav-item"><a href="/greatwall/hiking.htm">Great Wall Hiking</a></li>
-                            <li class="start-nav-item"><a href="/tour/china-nature-tours/">Nature Tours</a></li>
+                            <li class="start-nav-item"><a href="/tour/china-hiking-tours/">Hiking Tours</a></li>
                             <li class="start-nav-item"><a href="/tour/silk-road-tours/">Silk Road Tours</a></li>
                             <li class="start-nav-item"><a href="/tour/expats-tours.htm">China Expats Tours</a></li>
                             <li class="start-nav-item"><a href="/yangtzecruise/">Yangtze River Cruise</a></li>
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index f27b8343..255b8c62 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -82,8 +82,7 @@
             </li>
             <li class="menu__item" role="menuitem"><a class="menu__link" href="/greatwall/hiking.htm">Great Wall
                     Hiking</a></li>
-            <li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/china-nature-tours/">Nature
-                    Tours</a></li>
+            <li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/china-hiking-tours/">Hiking Tours</a></li>
             <li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/silk-road-tours/">Silk Road
                     Tours</a></li>
             <li class="menu__item" role="menuitem"><a class="menu__link" href="/tour/expats-tours.htm">China Expats

From 75df6a8a64a5eecc5badde64e7996b48d6f8722e 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, 1 Jun 2021 10:45:39 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E5=8F=96=E6=B6=88=20gogole=20reCaptcha?=
 =?UTF-8?q?=20V3=EF=BC=8C=E8=87=AA=E5=B7=B1=E5=BC=80=E5=8F=91=E4=B8=BB?=
 =?UTF-8?q?=E5=8A=A8=E9=98=B2=E5=BE=A1=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=E4=B9=8B=E5=89=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=9A=90=E8=97=8F=E8=A1=A8=E5=8D=95=E7=9A=84=E5=80=BC?=
 =?UTF-8?q?=E6=9D=A5=E5=88=A4=E6=96=AD=E5=AF=B9=E6=96=B9=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=98=AF=E6=9C=BA=E5=99=A8=E6=8F=90=E4=BA=A4=EF=BC=8C=E5=8E=9F?=
 =?UTF-8?q?=E7=90=86=E6=98=AF=E6=9C=BA=E5=99=A8=E6=8F=90=E4=BA=A4=E6=98=AF?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E6=89=A7=E8=A1=8C=E6=9C=AC=E5=9C=B0js?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/views/mobile_first/ch-inquiry-form.php b/application/views/mobile_first/ch-inquiry-form.php
index a56e95fa..e208bcf9 100644
--- a/application/views/mobile_first/ch-inquiry-form.php
+++ b/application/views/mobile_first/ch-inquiry-form.php
@@ -50,6 +50,4 @@
                 Inquiry <i aria-hidden="true" class="fa fa-angle-right"></i></button>
         </div>
     </form>
-</div>
-
-<script async src="https://www.recaptcha.net/recaptcha/api.js?render=6Lf4bfAaAAAAAEZZ9rX0ZIYfPAqACtRldSOFzl9b"></script>
\ No newline at end of file
+</div>
\ No newline at end of file

From 7e8874dc62a429c26bd08dc3e0d738cb7cae99a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Wed, 2 Jun 2021 14:42:48 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E5=92=8C=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E9=80=89=E6=8B=A9=E7=9A=84=E4=BE=BF=E6=8D=B7=E5=8C=96?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/recommend/controllers/tips.php      |  2 +-
 application/third_party/recommend/views/welcome.php | 13 ++++---------
 application/views/bootstrap3/header.php             |  4 ++--
 wysiwyg/config.js                                   |  4 ++--
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/application/third_party/recommend/controllers/tips.php b/application/third_party/recommend/controllers/tips.php
index 42ca9e1c..304cad97 100644
--- a/application/third_party/recommend/controllers/tips.php
+++ b/application/third_party/recommend/controllers/tips.php
@@ -26,7 +26,7 @@ class Tips extends CI_Controller
         $infoTip = new StdClass;
         $infoTip->it_title = '新广告';
         $infoTip->it_expires = time();
-        $infoTip->it_content = '';
+        $infoTip->it_content = $this->load->view('templates', false,true);;
         $infoTip->it_code = '<!--@TIPS--@-->';
         $infoTip->it_datetime = time();
         $infoTip->it_sitecode = $this->config->item('site_code');
diff --git a/application/third_party/recommend/views/welcome.php b/application/third_party/recommend/views/welcome.php
index 4c8efefa..eb10a2b1 100644
--- a/application/third_party/recommend/views/welcome.php
+++ b/application/third_party/recommend/views/welcome.php
@@ -4,7 +4,7 @@
 
         </div>
         <div class="col-md-9">
-            <h4>广告管理</h4>
+            <h4>广告管理   <small><a href="<?php echo site_url('thirdparty/recommend/tips/add'); ?>">添加广告</a></small></h4>
             <table class="table table-striped">
 
                 <thead>
@@ -16,8 +16,9 @@
                 </tr>
                 </thead>
                 <tbody>
+
                 <?php foreach ($tipsList as $key=>$item){ ?>
-                <tr>
+                <tr class="<?php if($item->it_expires<time()){echo 'warning';} ?>">
                     <td><?php echo ++$key; ?></td>
                     <td>
                         <a href="<?php echo site_url('thirdparty/recommend/tips/edit/'.$item->it_id); ?>"><?php echo $item->it_title; ?></a>
@@ -26,13 +27,7 @@
                     <td><?php echo date('m/d/Y', $item->it_expires); ?></td>
                 </tr>
             <?php } ?>
-                <tr>
-                    <td></td>
-                    <td></td>
-                    <td></td>
-                    <td><a href="<?php echo site_url('thirdparty/recommend/tips/add'); ?>">添加广告</a></td>
-                </tr>
-                <tr>
+
 
 
                 </tbody>
diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php
index 5b9075e0..86d3f99b 100644
--- a/application/views/bootstrap3/header.php
+++ b/application/views/bootstrap3/header.php
@@ -89,8 +89,8 @@
             var use_pictures = $("#use_pictures").val();
             if (result != null) {
                 for (var key in result.Pinfo) {
-                    if ('<?php echo $this->config->item('site_code') ?>' == 'cht') {
-                        editor.insertHtml('<div class="photoBlock300 autowidht" id="yonglaidingweitupian"> <img class="img-responsive" src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' + result.Pinfo[key].Sinfo + '" width="' + result.Pinfo[key].Width + '" height="' + result.Pinfo[key].Height + '" />' + result.Pinfo[key].Sinfo + '</div>');
+                    if ('<?php echo $this->config->item('site_code') ?>' == 'ah') {
+                        editor.insertHtml('<div class="infoimage"> <img alt="' + result.Pinfo[key].Sinfo + '" class="img-responsive" loader="lazy" originalsrc="' + site_image_url + result.Pinfo[key].PUrl + '" src="https://data.asiahighlights.com/image/grey.gif" /> <span class="photoTxt">' + result.Pinfo[key].Sinfo + '</span></div>');
                     } else if ('<?php echo $this->config->item('site_code') ?>' == 'ch') {
                         editor.insertHtml('<div class="infoimage"><img src="' + site_image_url + result.Pinfo[key].PUrl + '" alt="' + result.Pinfo[key].Sinfo + '" class="img-responsive" width="' + result.Pinfo[key].Width + '" height="' + result.Pinfo[key].Height + '"><span class="infoimagetitle">' + result.Pinfo[key].Sinfo + '</span></div>');
                     } else {
diff --git a/wysiwyg/config.js b/wysiwyg/config.js
index bb7b49d7..1c29a191 100644
--- a/wysiwyg/config.js
+++ b/wysiwyg/config.js
@@ -42,8 +42,8 @@ CKEDITOR.editorConfig = function( config ) {
 		{ name: 'others', groups: [ 'others' ] },
 		{ name: 'about', groups: [ 'about' ] }
 	];
-//,NumberedList,BulletedList,SpecialChar
-	config.removeButtons = 'Print,Preview,NewPage,Save,Templates,SelectAll,TextField,Textarea,Select,Button,HiddenField,Form,Checkbox,Radio,CreateDiv,Language,Anchor,Flash,HorizontalRule,Smiley,PageBreak,Iframe,ShowBlocks,About,BidiLtr,BidiRtl,searchCode,Copy,Cut';
+//,NumberedList,BulletedList,SpecialChar ,Templates
+	config.removeButtons = 'Print,Preview,NewPage,Save,SelectAll,TextField,Textarea,Select,Button,HiddenField,Form,Checkbox,Radio,CreateDiv,Language,Anchor,Flash,HorizontalRule,Smiley,PageBreak,Iframe,ShowBlocks,About,BidiLtr,BidiRtl,searchCode,Copy,Cut';
 
 
 

From 5b824b07a9a5185c4c94c4485a3ba84a9c55caec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Wed, 2 Jun 2021 14:44:50 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E6=8F=90=E9=86=92=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/recommend/views/welcome.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/third_party/recommend/views/welcome.php b/application/third_party/recommend/views/welcome.php
index eb10a2b1..161f894d 100644
--- a/application/third_party/recommend/views/welcome.php
+++ b/application/third_party/recommend/views/welcome.php
@@ -18,7 +18,7 @@
                 <tbody>
 
                 <?php foreach ($tipsList as $key=>$item){ ?>
-                <tr class="<?php if($item->it_expires<time()){echo 'warning';} ?>">
+                <tr class="<?php if($item->it_expires<time()){echo 'danger';} ?>">
                     <td><?php echo ++$key; ?></td>
                     <td>
                         <a href="<?php echo site_url('thirdparty/recommend/tips/edit/'.$item->it_id); ?>"><?php echo $item->it_title; ?></a>

From d1bf4718eaf5d20448e9c93c2f11e4c448691918 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 2 Jun 2021 14:53:59 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BB=A4=E7=89=8C=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 40b2cbf8..44213b61 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -152,7 +152,7 @@
                 <input type="hidden" value="FORID:9" name="cof">
                 <input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search" name="q">
                 <input type="image" class="submits" src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png" width="25px">
-                <input type="hidden" name="__ftoken__" value="MTU5ODMzNDc2NDQ0NA==.3664784f0395175e7de44382781cd7f7cb647e2a"></form>
+            </form>
         </div>
 
         <div class="topnavitailor">
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index f27b8343..98482f57 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -49,8 +49,7 @@
             <input type="hidden" value="FORID:9" name="cof">
             <input type="text" onfocus="this.value = ''" class="strkeys" placeholder="site search" name="q">
             <input type="image" class="submits" src="https://data.chinahighlights.com/pic/pc-top-navigation-web-search-bg.png">
-            <input type="hidden" name="__ftoken__"
-                   value="MTU5ODMzNDc2NDQ0NA==.3664784f0395175e7de44382781cd7f7cb647e2a"></form>
+        </form>
     </div>