From ec46db2e5b7f594c51d93dc0fe6cb2b527bba2e5 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Sun, 8 Oct 2023 13:54:07 +0800
Subject: [PATCH 1/5] =?UTF-8?q?AH=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E5=AF=BC=E8=88=AA=E5=A2=9E=E5=8A=A0=E6=B5=AE=E5=8A=A8?=
 =?UTF-8?q?=E5=92=8C=E5=9B=BA=E5=AE=9A=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php
index 99374c77..434f7b88 100644
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@@ -654,6 +654,21 @@
         return result;
       }
     </script>
+  <script>
+    (function (w, d, i) {
+      var navbar = d.getElementById(i);
+      var prevScrollpos = w.pageYOffset;
+      w.onscroll = function() {
+        var currentScrollPos = w.pageYOffset;
+        if (prevScrollpos > currentScrollPos) {
+          navbar.style.top = '0';
+        } else {
+          navbar.style.top = '-100px';
+        }
+        prevScrollpos = currentScrollPos;
+      }
+    })(window, document, 'header');
+  </script>
 
   </footer>
   <!--移动底部 结束-->

From d839f712a125c4844f51321ac970e5af4805156f Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Sun, 8 Oct 2023 15:05:45 +0800
Subject: [PATCH 2/5] fix usr

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

diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php
index b771c020..23418a8c 100644
--- a/application/views/bootstrap3/header.php
+++ b/application/views/bootstrap3/header.php
@@ -203,7 +203,10 @@
             <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://multimedia.mycht.cn/" target="_blank" class="btn btn-default btn-sm" title="图片上传管理"><span
+                <a href="<?php
+                $admin_info = $this->session->userdata('session_admin');
+                echo 'https://multimedia.mycht.cn/authorise/' . $admin_info['OPI_SN'] . '/' . $this->config->item('site_code') ?>"
+                  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 btn-default btn-sm" title="快速上传图片"><span

From 9f3021160ae757c02f7e94a5cde0a12c8a30eebb Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Sun, 8 Oct 2023 15:07:17 +0800
Subject: [PATCH 3/5] fix

---
 application/views/bootstrap/header.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php
index 950d6ff4..8dc25d1d 100644
--- a/application/views/bootstrap/header.php
+++ b/application/views/bootstrap/header.php
@@ -140,7 +140,9 @@
                 value="<?php echo isset($keywords) ? $keywords : false; ?>">
               <button class="btn">搜索</button>
               <?php if (in_array($this->config->item('site_code'), array('jp', 'gm', 'vc', 'vac', 'ru', 'it'))) { ?>
-              <a href="https://multimedia.mycht.cn/" target="_blank"
+              <a href="<?php
+                  $admin_info = $this->session->userdata('session_admin');
+                  echo 'https://multimedia.mycht.cn/authorise/' . $admin_info['OPI_SN'] . '/' . $this->config->item('site_code') ?>" target="_blank"
                 class="btn" title="图片上传管理"><i class="icon-picture"></i></a>
               <?php } else { ?>
               <a href="#" onclick="openKCFinder_singleFile_res();" class="btn" title="快速上传图片"><i

From f1da41d6e312cc7f178ffe81b22c384a270d71b3 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Mon, 9 Oct 2023 10:18:16 +0800
Subject: [PATCH 4/5] =?UTF-8?q?GP=E7=BA=BF=E8=B7=AF=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=92=A4=E4=B8=8B=E5=9C=A8=E7=BA=BF=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/views/mobile_first/ah-gp-form.php b/application/views/mobile_first/ah-gp-form.php
index df6af466..7ee040af 100644
--- a/application/views/mobile_first/ah-gp-form.php
+++ b/application/views/mobile_first/ah-gp-form.php
@@ -363,7 +363,7 @@
     margin-bottom: -30px; padding: 0;">We require a USD 300 deposit per adult or child charged at adult rates. For single room requests or if traveling with children, please inform us. Additional costs will be added to your balance.</p>
     <button class="sendButton" id="submit_gp_form" type="button">Inquire Now</button>
     <input name="total_price" id="totalPriceHidden" type="hidden" value="10000" />
-    <input name="payment_required" id="payment_required" type="hidden" value="required" />
+    <input name="payment_required" id="payment_required" type="hidden" value="" />
     <input name="product_code" type="hidden" value="<?php echo $meta_product_code; ?>"/> 
     <input name="itinerary" type="hidden" value="<?php echo $information->ic_title; ?>" />
     </form>

From 36416ca065655f6e7d27a819cdde20c558d101e1 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Mon, 9 Oct 2023 10:45:17 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=BC=95=E5=AF=BC=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ah-gp-form.php               | 5 +----
 .../views/mobile_first/ah-lantern-festival-gp-form.php      | 6 ------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/application/views/mobile_first/ah-gp-form.php b/application/views/mobile_first/ah-gp-form.php
index 7ee040af..8b839027 100644
--- a/application/views/mobile_first/ah-gp-form.php
+++ b/application/views/mobile_first/ah-gp-form.php
@@ -357,10 +357,7 @@
 						<input type="checkbox" value="yes" name="contact_via_video_appointment" id="Video" class="checkBorder" >
 						<label for="Video">Video appointment</label>
 					</div> 
-   
-   <p style="    clear: both;
-    margin-top: 60px;
-    margin-bottom: -30px; padding: 0;">We require a USD 300 deposit per adult or child charged at adult rates. For single room requests or if traveling with children, please inform us. Additional costs will be added to your balance.</p>
+
     <button class="sendButton" id="submit_gp_form" type="button">Inquire Now</button>
     <input name="total_price" id="totalPriceHidden" type="hidden" value="10000" />
     <input name="payment_required" id="payment_required" type="hidden" value="" />
diff --git a/application/views/mobile_first/ah-lantern-festival-gp-form.php b/application/views/mobile_first/ah-lantern-festival-gp-form.php
index 28838f4d..470f6153 100644
--- a/application/views/mobile_first/ah-lantern-festival-gp-form.php
+++ b/application/views/mobile_first/ah-lantern-festival-gp-form.php
@@ -333,12 +333,6 @@
 						<label for="Video">Video appointment</label>
 					</div> 
    
-                    <p style="
-    clear: both;
-    margin: 40px 0 -30px 0;
-    font-style: italic;
-    color: #333;
-">A USD 200 deposit is required for each adult/child over 8. Please let us know if you need a single room or if you're traveling with children under 8. Any additional costs will be added to your balance.</p>
     <button class="sendButton" id="submit_gp_form" type="button">Inquire</button>
         <input name="total_price" id="totalPriceHidden" type="hidden" value="10000" />
         <input name="payment_description" type="hidden" value="Booking Yi Peng Festival Mini-Group Tour" />