From 7261dd0937a1c92c6ef942b5eb8165352bb9fe8b Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Sat, 6 May 2023 09:23:35 +0800
Subject: [PATCH 01/28] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=A8=A1=E6=9D=BFabout?=
 =?UTF-8?q?=20us=E6=96=87=E5=AD=97=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 d2d9514e..f42f676e 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -393,7 +393,7 @@
 
                 <div class="bottomaboutus">
                     <div class="bottompctitle">About Us</div>
-                    <div class="aboutusinfo">At Asia Highlights, we are committed to providing you an affordable,
+                    <div class="aboutusinfo">At Asia Highlights, we are committed to providing you a premium,
                         quality private tour, whether it's a milestone trip, family trip, or bucketlist trip — your
                         planning will be made easy with just one specialist throughout. <a href="/about-us">Know more
                             ...</a>
diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php
index 061a6615..9caf07f9 100644
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@@ -344,7 +344,7 @@
 
 
     <div class="infobottom">
-      <div class="bottomlogoinfo">At Asia Highlights, we are committed to providing you an affordable, quality private
+      <div class="bottomlogoinfo">At Asia Highlights, we are committed to providing you a premium, quality private
         tour, whether it's a milestone trip, family trip, or bucketlist trip — your planning will be made easy with
         just one specialist throughout. <a href="/about-us">Know more...</a>
         <img src="https://data.asiahighlights.com/grey.gif"

From 6d25e65d019e6fc3f50f1e1acbc79a4e17baca0d Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Sat, 6 May 2023 09:29:25 +0800
Subject: [PATCH 02/28] 11

---
 application/views/mobile_first/ah-pc.php | 2 --
 application/views/mobile_first/ah.php    | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index f42f676e..fe61848f 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -388,9 +388,7 @@
 
     <div class="infobottom">
         <div class="footerbox">
-
             <div class="aboutusleft">
-
                 <div class="bottomaboutus">
                     <div class="bottompctitle">About Us</div>
                     <div class="aboutusinfo">At Asia Highlights, we are committed to providing you a premium,
diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php
index 9caf07f9..fbb73b07 100644
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@@ -335,10 +335,8 @@
                   <li><a href="/srilanka">Sri Lanka</a></li>                     
                   <li><a href="https://www.chinahighlights.com/tour/" target="_blank">China Tours</a></li>    
                 </ul>           
-              </div>
-              
+              </div>          
           </div>
-
       </div>
   </div>
 

From 41d953f4d9efc61e8f27f041b688e4c0db40b7d7 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Sat, 6 May 2023 10:12:42 +0800
Subject: [PATCH 03/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=92=8C=E7=9B=B8=E5=BA=94JS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/ah-tour-list-form.php  | 393 +++++++++++-------
 1 file changed, 235 insertions(+), 158 deletions(-)

diff --git a/application/views/mobile_first/ah-tour-list-form.php b/application/views/mobile_first/ah-tour-list-form.php
index 0f28d8b3..18a18057 100644
--- a/application/views/mobile_first/ah-tour-list-form.php
+++ b/application/views/mobile_first/ah-tour-list-form.php
@@ -147,7 +147,41 @@
 					</div>
 
 				</div>
-
+				<div class="selectionBlock">
+					<h4>
+						When would you travel?
+					</h4>
+					<div id="date_error_msg" style="display: none">
+						<div class="requiredArea" style="margin-top:-10px;">Select your travel data.</div>
+					</div>
+					<div class="travel_group date_select">
+						<input type="radio" value="exact travel dates" id="exact" name="trip_date">
+						<label for="exact" class="family">
+							I have exact travel dates.
+						</label>
+					</div>
+					<div class="travel_group date_select">
+						<input type="radio" value="approximate travel dates" id="approximate" name="trip_date">
+						<label for="approximate" class="couple">
+							I have approximate travel dates.
+						</label>
+					</div>
+					<div class="travel_group date_select">
+						<input type="radio" value="haven't decided travel dates" id="yet" name="trip_date">
+						<label for="yet" class="solo">
+							I haven't decided my travel dates.
+						</label>
+					</div>
+					<div class="trip_date_length" id="tripDateBlock" style="display: none">
+						<p style="clear: both;margin-bottom: 10px;" id="trip_date_tip">Select your travel date.</p>
+						<div id="dateSelectionBlock">
+						  <div id='flatpickrBlock'>
+							<input class="InquiryCalendar datepicker" id="starting_date" name="date_start" placeholder="Starting date *" readonly="readonly" type="text" value="" />
+						  </div>
+							<input type="month" id="expectedMonth" name="expected_month" placeholder="Select your expected travel date.">
+						</div>
+					</div>
+				</div>
 				<input class="FullName" id="realname" name="name" placeholder="Your name *" required="" type="text"
 					value="" />
 				<div id="realname_errmsg" style="display: none">
@@ -475,178 +509,221 @@
 
 <script src="https://data.asiahighlights.com/min/?f=/js/jquery-1.8.2.min.js,/js/flatpickr-4.6.1.min.js"></script>
 <script>
-	document.addEventListener('DOMContentLoaded', () => {
-		flatpickr("#starting_date", {
-			dateFormat: "Y-m-d",
-			altInput: true,
-			altFormat: "F j, Y",
-			disableMobile: true,
-			minDate: "today"
-		});
-
-		var tour_list_button = document.getElementById("tour_list_button");
-		var tour_list_form = document.getElementById("tour_list_form");
+  
+  var selectedExpectedDate = '';
+document.addEventListener('DOMContentLoaded', () => {
+    flatpickr("#starting_date", {
+        dateFormat: "Y-m-d",
+        altInput: true,
+        altFormat: "F j, Y",
+        disableMobile: true,
+        minDate: "today"
+    });
 
-		tour_list_button.addEventListener('click', function (event) {
-			var validateResult = validateQuickInquiryForm();
-			if (validateResult) {
-				if (typeof (grecaptcha) === "undefined") {
-					console.warn('grecaptcha is disabled.');
-					tour_list_form.submit();
-				} else {
-					grecaptcha.enterprise.ready(async () => {
-						const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', { action: 'ADD_TO_CART' });
-						var el = document.createElement("input");
-						el.type = "hidden";
-						el.name = "__grecaptcha_token__";
-						el.value = token;
-						tour_list_form.appendChild(el);
-						tour_list_form.submit();
-						tour_list_button.innerText = "Submitted successfully";
-					});
-				}
-			}
-		});
+    var quick_inquiry_button = document.getElementById("quick_inquiry_button");
+    var quick_inquiry_form = document.getElementById("quick_inquiry_form");
+    
+    quick_inquiry_button.addEventListener('click', function(event) {
+        var validateResult = validateQuickInquiryForm();
+        if (validateResult) {
+          if (typeof(grecaptcha) === "undefined") {
+            console.warn('grecaptcha is disabled.');
+            quick_inquiry_form.submit();
+          } else {
+            grecaptcha.enterprise.ready(async () => {
+              const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', {action: 'ADD_TO_CART'});
+              var el = document.createElement("input");
+              el.type = "hidden";
+              el.name = "__grecaptcha_token__";
+              el.value = token;
+              quick_inquiry_form.appendChild(el);
+              quick_inquiry_form.submit();
+              quick_inquiry_button.innerText = "Submitted successfully";
+            });
+          }
+        }  
+    });
+});
 
-	});
+function validateQuickInquiryForm() {
+    var result = true;
+    var realnameVal = document.getElementById("realname").value;
+    var emailVal = document.getElementById("email").value;
+    var expectedDateVal = document.getElementById("starting_date").value;
+    var expectedMonthVal = document.getElementById("expectedMonth").value;
+    var contactVal = document.getElementById("PhoneNo").value;
 
-	function validateQuickInquiryForm() {
-		var result = true;
-		var realnameVal = document.getElementById("realname").value;
-		var emailVal = document.getElementById("email").value;
-		var startingDateVal = document.getElementById("starting_date").value;
-		var contactVal = document.getElementById("PhoneNo").value;
+    var realnameErrEl = document.getElementById("realname_errmsg");
+    var emailErrEl = document.getElementById("email_errmsg");
+    var emailVerifyErrEl = document.getElementById("email_verify_errmsg");
+    var startingDateErrEl = document.getElementById("date_error_msg");
+    var contactErrEl = document.getElementById("contact_errmsg");
+    var groupErrEl = document.getElementById("group_error_msg");
 
-		var realnameErrEl = document.getElementById("realname_errmsg");
-		var emailErrEl = document.getElementById("email_errmsg");
-		var emailVerifyErrEl = document.getElementById("email_verify_errmsg");
-		var startingDateErrEl = document.getElementById("starting_date_errmsg");
-		var contactErrEl = document.getElementById("contact_errmsg");
-		var groupErrEl = document.getElementById("group_error_msg");
+    realnameErrEl.style.display = 'none';
+    emailErrEl.style.display = 'none';
+    emailVerifyErrEl.style.display = 'none';
+    startingDateErrEl.style.display = 'none';
+    contactErrEl.style.display = 'none';
+    groupErrEl.style.display = 'none';
 
-		realnameErrEl.style.display = 'none';
-		emailErrEl.style.display = 'none';
-		emailVerifyErrEl.style.display = 'none';
-		startingDateErrEl.style.display = 'none';
-		contactErrEl.style.display = 'none';
-		groupErrEl.style.display = 'none';
+    var travel_group_is_checked = false;
+    document.querySelectorAll('input[name="travel_group"]').forEach(function(groupNode) {
+      if (groupNode.checked) {
+        travel_group_is_checked = true;
+      }
+    });
 
-		var travel_group_is_checked = false;
-		document.querySelectorAll('input[name="travel_group"]').forEach(function (groupNode) {
-			if (groupNode.checked) {
-				travel_group_is_checked = true;
-			}
-		});
+    if (travel_group_is_checked === false) {
+      groupErrEl.style.display = '';
+      result = false;
+    }
 
-		if (travel_group_is_checked === false) {
-			groupErrEl.style.display = '';
-			result = false;
-		}
+    var tripDate_is_checked = false;
+      if (selectedExpectedDate === 'exact') {
+        tripDate_is_checked = expectedDateVal !== '';
+      } else if (selectedExpectedDate === 'approximate') {
+        tripDate_is_checked = expectedMonthVal !== '';
+      } else if (selectedExpectedDate === 'yet') {
+        tripDate_is_checked = true;
+      }
 
-		if (realnameVal === '') {
-			realnameErrEl.style.display = '';
-			result = false;
-		}
-		if (emailVal === '') {
-			emailErrEl.style.display = '';
-			result = false;
-		} else {
-			var emailPattern = /^[\w\-\.]+@[\w\-\.]+(\.\w+)+$/;
-			if (!emailPattern.test(emailVal)) {
-				emailVerifyErrEl.style.display = '';
-				result = false;
+			//时间选择
+			if (!tripDate_is_checked) {
+        startingDateErrEl.style.display = '';
+        result = false;
 			}
-		}
-		if (startingDateVal === '') {
-			startingDateErrEl.style.display = '';
-			result = false;
-		}
-		if (contactVal === '') {
-			contactErrEl.style.display = '';
-			result = false;
-		}
-		return result;
-	}
-</script>
-
 
+    if (realnameVal === '') {
+        realnameErrEl.style.display = '';
+        result = false;
+    }
+    if (emailVal === '') {
+        emailErrEl.style.display = '';
+        result = false;
+    } else {
+        var emailPattern = /^[\w\-\.]+@[\w\-\.]+(\.\w+)+$/;
+        if (!emailPattern.test(emailVal)) {
+            emailVerifyErrEl.style.display = '';
+            result = false;
+        }
+    }
+    if (contactVal === '') {
+        contactErrEl.style.display = '';
+        result = false;
+    }
+    return result;
+}
+</script>
 <script>
-	var $adultBlock = $('#adultBlock');
-	var $childrenBlock = $('#childrenBlock');
-	var $adultNumberInput = $('#adultNumber');
-	var adultNumber = $adultNumberInput.val();
-	var $teenagerNumberInput = $('#teenagerNumber');
-	var teenagerNumber = $teenagerNumberInput.val();
-	var $childrenNumberInput = $('#childrenNumber');
-	var childrenNumber = $childrenNumberInput.val();
-	var $infantNumberInput = $('#infantNumber');
-	var infantNumber = $infantNumberInput.val();
-	$('input[name="travel_group"]').each((i, groupEle) => {
-		$(groupEle).click(function (e) {
+  
+	$(function () {
+        	var $adultBlock = $('#adultBlock');
+    var $childrenBlock = $('#childrenBlock');
+    var $adultNumberInput = $('#adultNumber');
+    var adultNumber = $adultNumberInput.val();
+    var $teenagerNumberInput = $('#teenagerNumber');
+    var teenagerNumber = $teenagerNumberInput.val();
+    var $childrenNumberInput = $('#childrenNumber');
+    var childrenNumber = $childrenNumberInput.val();
+    var $infantNumberInput = $('#infantNumber');
+    var infantNumber = $infantNumberInput.val();
+    $('input[name="travel_group"]').each((i, groupEle) => {
+			$(groupEle).click(function (e) {
+        
+        $teenagerNumberInput.val(0);
+        $childrenNumberInput.val(0);
+        $infantNumberInput.val(0);
 
-			$teenagerNumberInput.val(0);
-			$childrenNumberInput.val(0);
-			$infantNumberInput.val(0);
-
-			var currentTarget = e.currentTarget;
-			if (currentTarget.id === 'Family' || currentTarget.id === 'Other') {
-				$adultBlock.show();
-				$childrenBlock.show();
-			} else {
-				$adultBlock.show();
-				$childrenBlock.hide();
-			}
-			if (currentTarget.id === 'Couple') {
-				$adultNumberInput.val(2);
-			} else if (currentTarget.id === 'Solo') {
-				$adultNumberInput.val(1);
-			}
-		})
-	});
+				var currentTarget = e.currentTarget;
+        if (currentTarget.id === 'Family' || currentTarget.id === 'Other' ) {
+          $adultBlock.show();
+          $childrenBlock.show();
+        } else {
+          $adultBlock.show();
+          $childrenBlock.hide();
+        }
+        if (currentTarget.id === 'Couple') {
+          $adultNumberInput.val(2);
+        } else if (currentTarget.id === 'Solo') {
+          $adultNumberInput.val(1);
+        }
+			})
+		});
 
+    var $tripDateBlock = $('#tripDateBlock');
+    var $expectedDate = $('#flatpickrBlock');
+    var $expectedMonth = $('#expectedMonth');
+    var $dateSelectionBlock = $('#dateSelectionBlock');
+    var $tripDateTip = $('#trip_date_tip');
+    
+    $('input[name="trip_date"]').each((i, tripDateEle) => {
+			$(tripDateEle).click(function (e) {
+        $expectedDate.val('');
+        $expectedMonth.val('');
+        $tripDateBlock.show();
+        var selectedTripDate = e.currentTarget;
+        selectedExpectedDate = selectedTripDate.id;
+        if (selectedTripDate.id === 'exact') {
+          $dateSelectionBlock.show();
+          $expectedMonth.hide();
+          $expectedDate.show();
+          $tripDateTip.show();
+        } else if (selectedTripDate.id === 'approximate') {
+          $dateSelectionBlock.show();
+          $expectedDate.hide();
+          $expectedMonth.show();
+          $tripDateTip.show();
+        } else if (selectedTripDate.id === 'yet') {
+          $dateSelectionBlock.hide();
+          $tripDateTip.hide();
+        }
+      })
+    });
 
-	//成人
-	$('#plusAdult').click(function () {
-		adultNumber++;
-		$adultNumberInput.val(adultNumber);
-	});
-	$('#minusAdult').click(function () {
-		if (adultNumber > 1) {
-			adultNumber--;
+//成人
+    $('#plusAdult').click(function () {
+			adultNumber++;
 			$adultNumberInput.val(adultNumber);
-		}
-	});
-	// 青少年
-	$('#plusTeenager').click(function () {
-		teenagerNumber++;
-		$teenagerNumberInput.val(teenagerNumber);
-	});
-	$('#minusTeenager').click(function () {
-		if (teenagerNumber > 0) {
-			teenagerNumber--;
+		});
+		$('#minusAdult').click(function () {
+			if (adultNumber > 1) {
+				adultNumber--;
+				$adultNumberInput.val(adultNumber);
+			}
+		});    
+    // 青少年
+    $('#plusTeenager').click(function () {
+			teenagerNumber++;
 			$teenagerNumberInput.val(teenagerNumber);
-		}
-	});
-	// 儿童
-	$('#plusChildren').click(function () {
-		childrenNumber++;
-		$childrenNumberInput.val(childrenNumber);
-	});
-	$('#minusChildren').click(function () {
-		if (childrenNumber > 0) {
-			childrenNumber--;
+		});
+		$('#minusTeenager').click(function () {
+			if (teenagerNumber > 0) {
+				teenagerNumber--;
+				$teenagerNumberInput.val(teenagerNumber);
+			}
+		});
+    // 儿童
+    $('#plusChildren').click(function () {
+			childrenNumber++;
 			$childrenNumberInput.val(childrenNumber);
-		}
-	});
-	// 婴儿
-	$('#plusInfant').click(function () {
-		infantNumber++;
-		$infantNumberInput.val(infantNumber);
-	});
-	$('#minusInfant').click(function () {
-		if (infantNumber > 0) {
-			infantNumber--;
+		});
+		$('#minusChildren').click(function () {
+			if (childrenNumber > 0) {
+				childrenNumber--;
+				$childrenNumberInput.val(childrenNumber);
+			}
+		});
+    // 婴儿
+    $('#plusInfant').click(function () {
+			infantNumber++;
 			$infantNumberInput.val(infantNumber);
-		}
-	});
-</script>
\ No newline at end of file
+		});
+		$('#minusInfant').click(function () {
+			if (infantNumber > 0) {
+				infantNumber--;
+				$infantNumberInput.val(infantNumber);
+			}
+		});
+  })
+    </script>
\ No newline at end of file

From d8abc8b2a0d8b53a512445b8240a2278d1598461 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Sat, 6 May 2023 10:18:12 +0800
Subject: [PATCH 04/28] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ah-tour-list-form.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/application/views/mobile_first/ah-tour-list-form.php b/application/views/mobile_first/ah-tour-list-form.php
index 18a18057..9469bac4 100644
--- a/application/views/mobile_first/ah-tour-list-form.php
+++ b/application/views/mobile_first/ah-tour-list-form.php
@@ -726,4 +726,12 @@ function validateQuickInquiryForm() {
 			}
 		});
   })
-    </script>
\ No newline at end of file
+    </script>
+	 <style>
+		.date_select {width: 27.5% !important;}
+		@media (max-width: 750px){
+		.date_select {
+			width: 93% !important;
+		}
+		}
+				</style>
\ No newline at end of file

From c48f810199f140893028d382c36a4230a4256678 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Sat, 6 May 2023 10:23:12 +0800
Subject: [PATCH 05/28] 11

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

diff --git a/application/views/mobile_first/ah-tour-list-form.php b/application/views/mobile_first/ah-tour-list-form.php
index 9469bac4..bc60e7f7 100644
--- a/application/views/mobile_first/ah-tour-list-form.php
+++ b/application/views/mobile_first/ah-tour-list-form.php
@@ -728,7 +728,7 @@ function validateQuickInquiryForm() {
   })
     </script>
 	 <style>
-		.date_select {width: 27.5% !important;}
+		.date_select {width: 28% !important;}
 		@media (max-width: 750px){
 		.date_select {
 			width: 93% !important;

From 3000b5cbc54f30f87c94f8c7d6f38eca0d468cf4 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Sat, 6 May 2023 10:45:57 +0800
Subject: [PATCH 06/28] 11

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

diff --git a/application/views/mobile_first/ah-tour-list-form.php b/application/views/mobile_first/ah-tour-list-form.php
index bc60e7f7..9c2dc68d 100644
--- a/application/views/mobile_first/ah-tour-list-form.php
+++ b/application/views/mobile_first/ah-tour-list-form.php
@@ -11,7 +11,7 @@
 					placeholder="Tell us your travel requirements here: anniversary, honeymoon, family trip, birthday travel, beach, food... (optional)"
 					style="height:80px;"></textarea>
 
-				<div class="selectionBlock">
+				<div class="selectionBlock" style="margin-bottom: 0;">
 					<h4 style="margin-top: 0; margin-bottom: 0px;">
 						Number in your group
 					</h4>

From a6a5c27f25d904c315b41715d8835bfd1f5a2220 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Sat, 6 May 2023 11:50:11 +0800
Subject: [PATCH 07/28] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8E=9F=E6=97=A5?=
 =?UTF-8?q?=E5=8F=91=E6=97=A5=E6=9C=9F=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/mobile_first/ah-tour-list-form.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/mobile_first/ah-tour-list-form.php b/application/views/mobile_first/ah-tour-list-form.php
index 9c2dc68d..9f94f2f0 100644
--- a/application/views/mobile_first/ah-tour-list-form.php
+++ b/application/views/mobile_first/ah-tour-list-form.php
@@ -196,11 +196,11 @@
 				<div id="email_verify_errmsg" style="display: none">
 					<div class="requiredArea" style="margin-top:-10px;">Please verify your email</div>
 				</div>
-				<input class="InquiryCalendar" id="starting_date" name="date_start" placeholder="Starting date *"
+			<!--	<input class="InquiryCalendar" id="starting_date" name="date_start" placeholder="Starting date *"
 					readonly="readonly" />
 				<div id="starting_date_errmsg" style="display: none">
 					<div class="requiredArea" style="margin-top:-10px;">Please enter your starting date</div>
-				</div>
+				</div>-->
 				<p style="font-size: 17px;
     color: #555;
     margin-top: -5px;

From 515742d0f9ce2e4bf43b5e91b08f0a430db6da96 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Sat, 6 May 2023 11:58:29 +0800
Subject: [PATCH 08/28] =?UTF-8?q?=E6=8C=89=E9=92=AEJS=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mobile_first/ah-tour-list-form.php  | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/application/views/mobile_first/ah-tour-list-form.php b/application/views/mobile_first/ah-tour-list-form.php
index 9f94f2f0..7c898d4c 100644
--- a/application/views/mobile_first/ah-tour-list-form.php
+++ b/application/views/mobile_first/ah-tour-list-form.php
@@ -520,29 +520,29 @@ document.addEventListener('DOMContentLoaded', () => {
         minDate: "today"
     });
 
-    var quick_inquiry_button = document.getElementById("quick_inquiry_button");
-    var quick_inquiry_form = document.getElementById("quick_inquiry_form");
-    
-    quick_inquiry_button.addEventListener('click', function(event) {
-        var validateResult = validateQuickInquiryForm();
-        if (validateResult) {
-          if (typeof(grecaptcha) === "undefined") {
-            console.warn('grecaptcha is disabled.');
-            quick_inquiry_form.submit();
-          } else {
-            grecaptcha.enterprise.ready(async () => {
-              const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', {action: 'ADD_TO_CART'});
-              var el = document.createElement("input");
-              el.type = "hidden";
-              el.name = "__grecaptcha_token__";
-              el.value = token;
-              quick_inquiry_form.appendChild(el);
-              quick_inquiry_form.submit();
-              quick_inquiry_button.innerText = "Submitted successfully";
-            });
-          }
-        }  
-    });
+    var tour_list_button = document.getElementById("tour_list_button");
+		var tour_list_form = document.getElementById("tour_list_form");
+
+		tour_list_button.addEventListener('click', function (event) {
+			var validateResult = validateQuickInquiryForm();
+			if (validateResult) {
+				if (typeof (grecaptcha) === "undefined") {
+					console.warn('grecaptcha is disabled.');
+					tour_list_form.submit();
+				} else {
+					grecaptcha.enterprise.ready(async () => {
+						const token = await grecaptcha.enterprise.execute('6Lf828MhAAAAANNetijCXKwW5ARyhcJ-b1Hhslja', { action: 'ADD_TO_CART' });
+						var el = document.createElement("input");
+						el.type = "hidden";
+						el.name = "__grecaptcha_token__";
+						el.value = token;
+						tour_list_form.appendChild(el);
+						tour_list_form.submit();
+						tour_list_button.innerText = "Submitted successfully";
+					});
+				}
+			}
+		});
 });
 
 function validateQuickInquiryForm() {

From a64db9a37c26ab4b80c930fde0ce3cbeb089bfea Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Sat, 6 May 2023 15:03:02 +0800
Subject: [PATCH 09/28] 11

---
 .../views/mobile_first/ah-feedback-list.php   | 34 ++++---------------
 .../views/mobile_first/ah-feedback-newest.php | 10 +++---
 .../views/mobile_first/ch-feedback-list.php   | 10 +++---
 .../views/mobile_first/ch-feedback-newest.php |  4 +--
 4 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/application/views/mobile_first/ah-feedback-list.php b/application/views/mobile_first/ah-feedback-list.php
index a8660595..bdd5600e 100644
--- a/application/views/mobile_first/ah-feedback-list.php
+++ b/application/views/mobile_first/ah-feedback-list.php
@@ -1,16 +1,8 @@
 
-<div style="text-align:center;font-weight: 600; font-size:18px;  margin-top: 50px; font-style: italic;" class="visible-xs">
-  <img src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="
-      margin: 0 auto 10px auto;
-      display: block;
-      width: 200px;
-  ">
-  Rated 4.9 out of 5 |
-  Excellent
-  <br>
-  Based on 10,000+ reviews
-  
-</div>
+<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
+  <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; " width="1133">
+    98.8% positive customer reviews among 10,000+</div>
+  </div>
 <p class="visible-xs" style="margin-bottom: 0; ">
   <img alt="Tour Review" class="img-responsive" src="https://data.asiahighlights.com/image/about/logo-black.png"
     style="width: 180px; margin: 0 auto 10px auto">
@@ -20,21 +12,9 @@
     <tbody>
       <tr>
         <td class="hidden-xs">
-          <div class="feedback_logo">
-
-
-            <img src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="
-    margin: 0 auto 10px auto;
-    display: block;
-    width: 200px;
-">
-            <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;">Rated 4.9 out of 5 |
-              Excellent<br>Based on 10,000+ reviews</div>
-            <img alt="Tour Review" class="img-responsive"
-              src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px;
-              display: block;
-              margin: 20px auto 0 auto;">
-          </div>
+          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
+            <div style="text-align:center;font-weight: 600;font-size:18px;font-style: italic;line-height: 18px;margin-top: 25px;">98.8% positive customer reviews among 10,000+</div>
+            </div>
         </td>
         <?php foreach ($feedback_list as $index => $feedback) {?>
         <td>
diff --git a/application/views/mobile_first/ah-feedback-newest.php b/application/views/mobile_first/ah-feedback-newest.php
index 87a75b1f..bdd5600e 100644
--- a/application/views/mobile_first/ah-feedback-newest.php
+++ b/application/views/mobile_first/ah-feedback-newest.php
@@ -1,7 +1,7 @@
 
-<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="175" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="211" loader="lazy" originalsrc="https://data.asiahighlights.com/pic/trustpilot-new-icon.png">
-  <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="1133" loader="lazy" originalsrc="https://data.asiahighlights.com/image/about/logo-black.png">
-  Based on 10,000+ reviews </div>
+<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
+  <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; " width="1133">
+    98.8% positive customer reviews among 10,000+</div>
   </div>
 <p class="visible-xs" style="margin-bottom: 0; ">
   <img alt="Tour Review" class="img-responsive" src="https://data.asiahighlights.com/image/about/logo-black.png"
@@ -12,8 +12,8 @@
     <tbody>
       <tr>
         <td class="hidden-xs">
-          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="175" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="1133" loader="lazy" originalsrc="https://data.asiahighlights.com/image/about/logo-black.png"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="211" loader="lazy" originalsrc="https://data.asiahighlights.com/pic/trustpilot-new-icon.png">
-            <div style="text-align:center;font-weight: 600;font-size:18px;font-style: italic;line-height: 18px;margin-top: 25px;">Based on 10,000+ reviews</div>
+          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
+            <div style="text-align:center;font-weight: 600;font-size:18px;font-style: italic;line-height: 18px;margin-top: 25px;">98.8% positive customer reviews among 10,000+</div>
             </div>
         </td>
         <?php foreach ($feedback_list as $index => $feedback) {?>
diff --git a/application/views/mobile_first/ch-feedback-list.php b/application/views/mobile_first/ch-feedback-list.php
index 8d403591..71cd72b5 100644
--- a/application/views/mobile_first/ch-feedback-list.php
+++ b/application/views/mobile_first/ch-feedback-list.php
@@ -1,14 +1,14 @@
-<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="175" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="211" loader="lazy" originalsrc="https://data.asiahighlights.com/pic/trustpilot-new-icon.png">
-  <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="1133" loader="lazy" originalsrc="https://data.asiahighlights.com/image/about/logo-black.png">
-  Based on 10,000+ reviews </div>
+<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
+  <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; " width="1133">
+    98.8% positive customer reviews among 10,000+</div>
   </div>
 <div class="table-responsive">
   <table>
     <tbody>
       <tr>
         <td class="hidden-xs">
-          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="175" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="1133" loader="lazy" originalsrc="https://data.asiahighlights.com/image/about/logo-black.png"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="211" loader="lazy" originalsrc="https://data.asiahighlights.com/pic/trustpilot-new-icon.png">
-            <div style="text-align:center;font-weight: 600;font-size:18px;font-style: italic;line-height: 18px;margin-top: 25px;">Based on 10,000+ reviews</div>
+          <div style="text-align:center;font-weight: 600;font-size:18px;font-style: italic;line-height: 18px;margin-top: 25px;">98.8% positive customer reviews among 10,000+</div>
+          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">      
             </div>
         </td>
         <?php foreach ($feedback_list as $index => $feedback) {?>
diff --git a/application/views/mobile_first/ch-feedback-newest.php b/application/views/mobile_first/ch-feedback-newest.php
index 8d403591..21f69040 100644
--- a/application/views/mobile_first/ch-feedback-newest.php
+++ b/application/views/mobile_first/ch-feedback-newest.php
@@ -1,6 +1,6 @@
 <div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="175" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="211" loader="lazy" originalsrc="https://data.asiahighlights.com/pic/trustpilot-new-icon.png">
   <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="1133" loader="lazy" originalsrc="https://data.asiahighlights.com/image/about/logo-black.png">
-  Based on 10,000+ reviews </div>
+  98.8% positive customer reviews among 10,000+</div>
   </div>
 <div class="table-responsive">
   <table>
@@ -8,7 +8,7 @@
       <tr>
         <td class="hidden-xs">
           <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="175" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="1133" loader="lazy" originalsrc="https://data.asiahighlights.com/image/about/logo-black.png"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="211" loader="lazy" originalsrc="https://data.asiahighlights.com/pic/trustpilot-new-icon.png">
-            <div style="text-align:center;font-weight: 600;font-size:18px;font-style: italic;line-height: 18px;margin-top: 25px;">Based on 10,000+ reviews</div>
+            <div style="text-align:center;font-weight: 600;font-size:18px;font-style: italic;line-height: 18px;margin-top: 25px;">98.8% positive customer reviews among 10,000+</div>
             </div>
         </td>
         <?php foreach ($feedback_list as $index => $feedback) {?>

From 945657665ef31baf2ad7061bbd3b64738fb1a713 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Sat, 6 May 2023 15:06:54 +0800
Subject: [PATCH 10/28] 11

---
 .../views/mobile_first/ah-feedback-list.php        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/views/mobile_first/ah-feedback-list.php b/application/views/mobile_first/ah-feedback-list.php
index bdd5600e..1e9e6ff2 100644
--- a/application/views/mobile_first/ah-feedback-list.php
+++ b/application/views/mobile_first/ah-feedback-list.php
@@ -1,19 +1,19 @@
 
-<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
+<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;">
+  98.8% positive customer reviews among 10,000+
+  <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
   <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; " width="1133">
-    98.8% positive customer reviews among 10,000+</div>
+    </div>
   </div>
-<p class="visible-xs" style="margin-bottom: 0; ">
-  <img alt="Tour Review" class="img-responsive" src="https://data.asiahighlights.com/image/about/logo-black.png"
-    style="width: 180px; margin: 0 auto 10px auto">
-</p>
 <div class="table-responsive">
   <table>
     <tbody>
       <tr>
         <td class="hidden-xs">
-          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
+          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;">
             <div style="text-align:center;font-weight: 600;font-size:18px;font-style: italic;line-height: 18px;margin-top: 25px;">98.8% positive customer reviews among 10,000+</div>
+            <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
+            
             </div>
         </td>
         <?php foreach ($feedback_list as $index => $feedback) {?>

From 6a4b7aaf31b33954d47c98b83e20612fb5c91db8 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Sat, 6 May 2023 15:23:14 +0800
Subject: [PATCH 11/28] 11

---
 .../views/mobile_first/ah-feedback-list.php      |  2 +-
 .../views/mobile_first/ah-feedback-newest.php    | 12 ++++++++----
 .../views/mobile_first/ch-feedback-list.php      | 12 ++++++++----
 .../views/mobile_first/ch-feedback-newest.php    | 16 ++++++++++------
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/application/views/mobile_first/ah-feedback-list.php b/application/views/mobile_first/ah-feedback-list.php
index 1e9e6ff2..bb279bc8 100644
--- a/application/views/mobile_first/ah-feedback-list.php
+++ b/application/views/mobile_first/ah-feedback-list.php
@@ -11,7 +11,7 @@
       <tr>
         <td class="hidden-xs">
           <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;">
-            <div style="text-align:center;font-weight: 600;font-size:18px;font-style: italic;line-height: 18px;margin-top: 25px;">98.8% positive customer reviews among 10,000+</div>
+            <div style="text-align:center;font-weight: 600;font-size:19px;font-style: italic;line-height: 20px;margin-top: 25px; margin-bottom: 15px;">98.8% positive customer reviews among 10,000+</div>
             <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
             
             </div>
diff --git a/application/views/mobile_first/ah-feedback-newest.php b/application/views/mobile_first/ah-feedback-newest.php
index bdd5600e..d9e4fc11 100644
--- a/application/views/mobile_first/ah-feedback-newest.php
+++ b/application/views/mobile_first/ah-feedback-newest.php
@@ -1,7 +1,9 @@
 
-<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
+<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;">
+  98.8% positive customer reviews among 10,000+
+  <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
   <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; " width="1133">
-    98.8% positive customer reviews among 10,000+</div>
+    </div>
   </div>
 <p class="visible-xs" style="margin-bottom: 0; ">
   <img alt="Tour Review" class="img-responsive" src="https://data.asiahighlights.com/image/about/logo-black.png"
@@ -12,8 +14,10 @@
     <tbody>
       <tr>
         <td class="hidden-xs">
-          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
-            <div style="text-align:center;font-weight: 600;font-size:18px;font-style: italic;line-height: 18px;margin-top: 25px;">98.8% positive customer reviews among 10,000+</div>
+          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;">
+            <div style="text-align:center;font-weight: 600;font-size:19px;font-style: italic;line-height: 20px;margin-top: 25px; margin-bottom: 15px;">98.8% positive customer reviews among 10,000+</div>
+            <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
+            
             </div>
         </td>
         <?php foreach ($feedback_list as $index => $feedback) {?>
diff --git a/application/views/mobile_first/ch-feedback-list.php b/application/views/mobile_first/ch-feedback-list.php
index 71cd72b5..82567ae5 100644
--- a/application/views/mobile_first/ch-feedback-list.php
+++ b/application/views/mobile_first/ch-feedback-list.php
@@ -1,14 +1,18 @@
-<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
+<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;">
+  98.8% positive customer reviews among 10,000+
+  <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
   <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; " width="1133">
-    98.8% positive customer reviews among 10,000+</div>
+    </div>
   </div>
 <div class="table-responsive">
   <table>
     <tbody>
       <tr>
         <td class="hidden-xs">
-          <div style="text-align:center;font-weight: 600;font-size:18px;font-style: italic;line-height: 18px;margin-top: 25px;">98.8% positive customer reviews among 10,000+</div>
-          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">      
+          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;">
+            <div style="text-align:center;font-weight: 600;font-size:19px;font-style: italic;line-height: 20px;margin-top: 25px; margin-bottom: 15px;">98.8% positive customer reviews among 10,000+</div>
+            <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
+            
             </div>
         </td>
         <?php foreach ($feedback_list as $index => $feedback) {?>
diff --git a/application/views/mobile_first/ch-feedback-newest.php b/application/views/mobile_first/ch-feedback-newest.php
index 21f69040..1cbf9286 100644
--- a/application/views/mobile_first/ch-feedback-newest.php
+++ b/application/views/mobile_first/ch-feedback-newest.php
@@ -1,14 +1,18 @@
-<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="175" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="211" loader="lazy" originalsrc="https://data.asiahighlights.com/pic/trustpilot-new-icon.png">
-  <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="1133" loader="lazy" originalsrc="https://data.asiahighlights.com/image/about/logo-black.png">
-  98.8% positive customer reviews among 10,000+</div>
+<div class="visible-xs" style="font-size: 18px;font-weight: 600;text-align: center;font-style: italic;margin-top: 50px;">
+  98.8% positive customer reviews among 10,000+
+  <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 10px auto 5px; " width="104" height="20"><img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 15px auto 5px; display: block; width: 150px; height: auto; " width="211">
+  <div style="text-align:center; font-weight: 600;font-size:18px; font-style: italic;"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 0px auto; " width="1133">
+    </div>
   </div>
 <div class="table-responsive">
   <table>
     <tbody>
       <tr>
-        <td class="hidden-xs">
-          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;"><img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="175" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png"> <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" loader="lazy" originalsrc="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="1133" loader="lazy" originalsrc="https://data.asiahighlights.com/image/about/logo-black.png"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; opacity: 1; transition: opacity 0.5s ease-in-out 0s;" width="211" loader="lazy" originalsrc="https://data.asiahighlights.com/pic/trustpilot-new-icon.png">
-            <div style="text-align:center;font-weight: 600;font-size:18px;font-style: italic;line-height: 18px;margin-top: 25px;">98.8% positive customer reviews among 10,000+</div>
+      <td class="hidden-xs">
+          <div class="feedback_logo" style="font-size: 18px; font-weight: 600; text-align: center; font-style: italic;">
+            <div style="text-align:center;font-weight: 600;font-size:19px;font-style: italic;line-height: 20px;margin-top: 25px; margin-bottom: 15px;">98.8% positive customer reviews among 10,000+</div>
+            <img alt="" class="img-responsive" height="69" src="https://data.chinahighlights.com/image/aboutus/awards/china-highlights-ta-2022-certificate.png" style="margin: 0px auto; width: 160px; " width="175" > <img alt="" src="https://data.chinahighlights.com/image/aboutus/feedback/five-star.png" style="display: block; margin: 5px auto; " width="104" height="20"><img alt="Tour Review" class="img-responsive" height="278" src="https://data.asiahighlights.com/image/about/logo-black.png" style="width: 150px; display: block; margin: 10px auto 0px; " width="1133"> <img alt="" height="40" src="https://data.asiahighlights.com/pic/trustpilot-new-icon.png" style="margin: 10px auto; display: block; width: 150px; height: auto; " width="211">
+            
             </div>
         </td>
         <?php foreach ($feedback_list as $index => $feedback) {?>

From df496ec5d1df5444ab0c0f192e5f06334664c2e9 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 10 May 2023 09:52:18 +0800
Subject: [PATCH 12/28] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=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-pc.php | 121 +++++++++++++----------
 application/views/mobile_first/ah.php    | 117 +++++++++-------------
 2 files changed, 117 insertions(+), 121 deletions(-)

diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index fe61848f..75a55ef9 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -55,7 +55,43 @@
                     alt="Asiahighlights logo" class="asiahighlightslogo img-responsive"></a>
             <div class="p_topnavigation">
                 <ul class="pctopnavi">
-                    <li class="dropdown"><a href="/japan/tours" class="p_topnavilink">Japan</a></li>
+                    <li class="dropdown"><a href="/japan/tours" class="p_topnavilink">Japan</a>
+                        <div class=" dropdown-content">
+                            <div class="inspirationinfo">
+                                <div class="inspirationlist topthings">
+                                    <span class="inspirationtitle">Itinerary Ideas</span>
+                                    <div class="listtour">
+                                        <ul class="inspiration">
+                                            <li><a href="/japan/tours/tokyo-highlights">5 Days</a></li>
+                                            <li><a href="/japan/1-week-itinerary">7 Days</a></li>    
+                                            <li><a href="/japan/tours/mountain-and-sea">8 Days</a></li>
+                                            <li><a href="/japan/tours/japan-highlights">9 Days</a></li> 
+                                            <li><a href="/japan/tours/cherry-blossom-spring-mini-group">10 Days</a></li>
+                                            <li><a href="/japan/tours/classic-japan">11 Days</a></li> 
+                                            <li><a href="/japan/tours/family-vacation">14 Days</a></li>
+                                            <li><a href="/japan/tours/summer-family-vacation">17 Days</a></li> 
+                                            <li><a href="/japan/3-week-itineraries">3 Weeks</a></li>   
+                                        </ul>                                      
+                                    </div>
+                                </div>
+                                <div class="inspirationlist topthings">
+                                    <span class="inspirationtitle">Trip Plan</span>
+                                    <div class="listtour">
+                                        <ul class="inspiration">
+                                            <li><a href="/japan/plan-a-trip">Bucket List Trip</a></li>
+                                            <li><a href="/japan/how-to-plan-a-family-trip-to-japan">Family Trip</a></li> 
+                                            <li><a href="/japan/plan-a-cherry-blossom-trip">Cherry Blossom Trip</a></li>    
+                                            <li><a href="/japan/planning-a-summer-trip">Summer Trip</a></li>
+                                            <li><a href="/japan/plan-a-winter-trip">Winter Trip</a></li> 
+                                            <li><a href="/asia/plan-a-two-week-itinerary-in-japan-and-south-korea">Japan-South Korea Trip</a></li>
+                                            <li><a href="/asia/plan-a-trip-to-china-and-japan">Japan-China Trip</a></li> 
+                                            <li><a href="/asia/plan-a-trip-to-japan-and-thailand">Japan-Thailand Trip</a></li>
+                                        </ul>                                      
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </li>
                     <li class="dropdown"><a href="/southeast-asia/tours/thailand-cambodia-and-vietnam"
                             class="p_topnavilink" id="thailand_vietnam_cambodia_pc">Thailand-Vietnam-Cambodia</a>
                         <div class=" dropdown-content">
@@ -144,80 +180,59 @@
                             </div>
                         </div>
                     </li>
-                    <li class="dropdown"><a class="p_topnavilink">Inspiration</a>
+                    <li class="dropdown"><a class="p_topnavilink">Itinerary Ideas</a>
                         <div class=" dropdown-content">
                             <div class="inspirationinfo">
                                 <div class="inspirationlist topthings">
-                                    <span class="inspirationtitle">How to Plan a Trip:</span>
+                                    <span class="inspirationtitle">1-Week Itinerary</span>
                                     <div class="listtour">
                                         <ul class="inspiration">
-                                            <li><a href="/japan/plan-a-trip">Japan</a></li>
-                                            <li><a href="/southeast-asia/plan-first-trip">Southeast Asia</a></li>
-                                            <li><a href="/thailand/plan-your-trip">Thailand</a></li>
-                                            <li><a href="/vietnam/planning-a-vietnam-trip">Vietnam</a></li>
-                                            <li><a href="/indonesia/bali/trip-plan">Indonesia</a></li>
-                                            <li><a href="/india/plan-a-trip">India</a></li>
-                                            <li><a href="https://www.chinahighlights.com/travelguide/plan-first-trip.htm"
-                                                    target="_blank">China</a></li>
-                                        </ul>
+                                            <li><a href="/japan/1-week-itinerary">Japan</a></li>
+                                            <li><a href="/vietnam/7-days-itinerary">Vietnam</a></li>            
+                                        </ul>                                      
+                                    </div>
+                                </div>
+                                <div class="inspirationlist topthings">
+                                    <span class="inspirationtitle">10-Day Itinerary</span>
+                                    <div class="listtour">
                                         <ul class="inspiration">
-                                            <li><a href="/nepal/plan-a-trip">Nepal</a></li>
-                                            <li><a href="/bhutan/plan-a-trip">Bhutan</a></li>
-                                            <li><a href="/cambodia/top-things-to-do-in-siem-reap">Cambodia</a></li>
-                                            <li><a href="/laos/trip-plan">Laos</a></li>
-                                            <li><a href="/myanmar/how-to-plan-a-trip">Myanmar</a></li>
-                                            <li><a href="/singapore/plan-your-trip">Singapore</a></li>
-                                        </ul>
+                                            <li><a href="/japan/10-day-itineraries">Japan</a></li>
+                                            <li><a href="/vietnam/10-days-itinerary">Japan</a></li>              
+                                        </ul>                                      
                                     </div>
                                 </div>
-
                                 <div class="inspirationlist besttime">
-                                    <span class="inspirationtitle">Best Time to Visit</span>
+                                    <span class="inspirationtitle">2-Week Itinerary</span>
                                     <div class="listtour">
                                         <ul class="inspiration">
-                                            <li><a href="/japan/best-time-to-visit">Japan</a></li>
-                                            <li><a href="/southeast-asia/best-time-to-visit">Southeast Asia</a></li>
-                                            <li><a href="/thailand/best-time-to-visit"> Thailand</a></li>
-                                            <li><a href="/vietnam/climate-and-weather">Vietnam</a></li>
-                                            <li><a href="/cambodia/best-time-to-visit">Cambodia</a></li>
-                                            <li><a href="https://www.chinahighlights.com/weather/china-best-times.htm"
-                                                    target="_blank">China</a></li>
-                                        </ul>
-                                        <ul class="inspiration">
-                                            <li><a href="/india/best-time-to-visit">India</a></li>
-                                            <li><a href="/bhutan/best-time-to-visit">Bhutan</a></li>
-                                            <li><a href="/laos/best-time-to-visit">Laos</a></li>
-                                            <li><a href="/myanmar/best-time-to-visit">Myanmar</a></li>
-                                            <li><a href="/nepal/best-time-to-visit">Nepal</a></li>
-                                        </ul>
+                                            <li><a href="/southeast-asia/2-weeks-itinerary ">Southeast Asia</a></li>
+                                            <li><a href="/japan/2-week-itineraries">Japan</a></li>
+                                            <li><a href="/asia/plan-a-two-week-itinerary-in-japan-and-south-korea"> Japan and South Korea</a></li>
+                                            <li><a href="/thailand/2-weeks-in-thailand">Thailand</a></li>
+                                            <li><a href="/vietnam/2-weeks-itinerary">Vietnam</a></li>
+                                            <li><a href="/india/2-week-itinerary">India</a></li>
+                                        </ul>                                      
                                     </div>
                                 </div>
 
 
                                 <div class="inspirationlist vacationtype">
-                                    <span class="inspirationtitle">Vacation Type</span>
+                                    <span class="inspirationtitle">3-Week Itinerary</span>
                                     <ul class="inspiration">
-                                        <li><a href="/southeast-asia/multi-generational-family-trip-planner">Family
-                                                Tours</a></li>
-                                        <li><a href="/asia/romantic-trip/how-to-plan">Anniversary/Honeymoon</a></li>
-                                        <li><a href="/southeast-asia/top-beaches">Beach Relaxation</a></li>
-                                        <li><a href="/thailand/trekking">Trekking Tours</a></li>
-                                        <li><a href="/myanmar/tours/myanmar-photography">Photography Tours</a></li>
+                                        <li><a href="/southeast-asia/3-weeks-itinerary">Southeast Asia</a></li>
+                                        <li><a href="/japan/3-week-itineraries">Japan</a></li>
+                                        <li><a href="/southeast-asia/trip-to-thailand-cambodia-vietnam">Thailand, Cambodia, Vietnam</a></li>
+                                        <li><a href="/asia/tours/china-and-vietnam">China, Vietnam</a></li>
+                                        <li><a href="/asia/tours/china-nepal-and-india">China, Nepal, India</a></li>
+                                        <li><a href="/asia/tours/china-laos-thailand">China, Laos, Thailand</a></li>
                                     </ul>
                                 </div>
 
                                 <div class="inspirationlist festival">
-                                    <span class="inspirationtitle">Festivals & Events</span>
+                                    <span class="inspirationtitle">4-Week Itinerary</span>
                                     <ul class="inspiration">
-                                        <li><a href="/thailand/light-festivals">Thailand Lantern Festival</a></li>
-                                        <li><a href="/india/when-is-diwali">Diwali in India</a></li>
-                                        <li><a href="/vietnam/new-year">Tet in Vietnam</a></li>
-                                        <li><a href="/india/holi/date">Holi in India</a></li>
-                                        <li><a href="/thailand/songkran-festival">Thai New Year (Water Festival)</a>
-                                        </li>
-                                        <li><a href="https://www.chinahighlights.com/travelguide/special-report/chinese-new-year/"
-                                                target="_blank">Chinese New Year</a>
-                                        </li>
+                                        <li><a href="/southeast-asia/4-weeks-itinerary">Southeast Asia</a></li>
+                                        
                                     </ul>
                                 </div>
                             </div>
diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php
index fbb73b07..a0ccf956 100644
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@@ -80,22 +80,19 @@
     <div class="menu__wrap">
       <ul data-menu="main" class="menu__level menu__level--current" tabindex="-1" role="menu" aria-label="All">
         <li class="menu__item" role="menuitem"><a class="menu__link" href="/">Home</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/tours">Japan</a></li>
+        <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/tours" data-submenu="submenu-7" aria-owns="submenu-7">Japan</a></li>
         <li class="menu__item" role="menuitem"><a class="menu__link" id="thailand_vietnam_cambodia_mobile"
             data-submenu="submenu-6" aria-owns="submenu-6">Thailand-Vietnam-Cambodia</a></li>
         <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-1"
             aria-owns="submenu-1">Destinations</a></li>
-            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-4" aria-owns="submenu-4">How
-            to Plan a Trip</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-2" aria-owns="submenu-2">Best
-            Time to Visit</a></li>
-        
+            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-4" aria-owns="submenu-4">1-Week Itinerary</a></li>
+        <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-2" aria-owns="submenu-2">10-Day Itinerary</a></li>     
         <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-5"
-            aria-owns="submenu-5">Vacation
-            Type</a></li>
+            aria-owns="submenu-5">2-Week Itinerary</a></li>
         <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-3"
-            aria-owns="submenu-3">Festival
-            & Events</a></li>
+            aria-owns="submenu-3">3-Week Itinerary</a></li>
+            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-8"
+            aria-owns="submenu-8">4-Week Itinerary</a></li>
         <li class="menu__item" role="menuitem"><a class="menu__link" href="/about-us">About Us</a></li>
       </ul>
       <!-- Thailand-Vietnam-Cambodia -->
@@ -146,77 +143,61 @@
       </ul>
       <!-- Best-time -->
       <ul data-menu="submenu-2" id="submenu-2" class="menu__level" tabindex="-1" role="menu" aria-label="Best-time">
-      <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/best-time-to-visit">Japan</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/southeast-asia/best-time-to-visit">Southeast
-            Asia</a></li>
-            
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/thailand/best-time-to-visit">Thailand</a>
-        </li>
-       
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/vietnam/climate-and-weather">Vietnam</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/cambodia/best-time-to-visit">Cambodia</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/india/best-time-to-visit">India</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/bhutan/best-time-to-visit">Bhutan</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/laos/best-time-to-visit">Laos</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/myanmar/best-time-to-visit">Myanmar</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/nepal/best-time-to-visit">Nepal</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.chinahighlights.com/weather/china-best-times.htm" target="_blank">China</a></li>
+      <li class="menu__item" role="menuitem"><a href="/japan/10-day-itineraries" class="menu__link">Japan</a></li>
+<li class="menu__item" role="menuitem"><a href="/vietnam/10-days-itinerary" class="menu__link">Japan</a></li>
       </ul>
 
       <!-- festival -->
       <ul data-menu="submenu-3" id="submenu-3" class="menu__level" tabindex="-1" role="menu" aria-label="festival">
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/thailand/light-festivals">Thailand
-            Lantern Festival</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/india/when-is-diwali">Diwali in
-            India</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/vietnam/new-year">Tet in Vietnam</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a href="/india/holi/date" class="menu__link">Holi in India</a></li>
-        <li class="menu__item" role="menuitem"><a href="/thailand/songkran-festival" class="menu__link">Thai New Year
-            (Water Festival)</a></li>
+      <li class="menu__item" role="menuitem"><a href="/southeast-asia/3-weeks-itinerary" class="menu__link">Southeast Asia</a></li>
+<li class="menu__item" role="menuitem"><a href="/japan/3-week-itineraries" class="menu__link">Japan</a></li>
+<li class="menu__item" role="menuitem"><a href="/southeast-asia/trip-to-thailand-cambodia-vietnam" class="menu__link">Thailand, Cambodia, Vietnam</a></li>
+<li class="menu__item" role="menuitem"><a href="/asia/tours/china-and-vietnam" class="menu__link">China, Vietnam</a></li>
+<li class="menu__item" role="menuitem"><a href="/asia/tours/china-nepal-and-india" class="menu__link">China, Nepal, India</a></li>
+<li class="menu__item" role="menuitem"><a href="/asia/tours/china-laos-thailand" class="menu__link">China, Laos, Thailand</a></li>
       </ul>
 
       <!-- top things to do -->
       <ul data-menu="submenu-4" id="submenu-4" class="menu__level" tabindex="-1" role="menu" aria-label="topthingstodo">
-      <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/plan-a-trip">Japan</a></li>
-        <li class="menu__item" role="menuitem"><a href="/southeast-asia/plan-first-trip" class="menu__link">Southeast
-            Asia</a></li>
-        
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/thailand/plan-your-trip">Thailand</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/vietnam/planning-a-vietnam-trip">Vietnam</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/indonesia/bali/trip-plan">Indonesia</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/india/plan-a-trip">India</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/nepal/plan-a-trip">Nepal</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/bhutan/plan-a-trip">Bhutan</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="/cambodia/top-things-to-do-in-siem-reap">Cambodia</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/laos/trip-plan">Laos</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/myanmar/how-to-plan-a-trip">Myanmar</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/singapore/plan-your-trip">Singapore</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="https://www.chinahighlights.com/travelguide/plan-first-trip.htm" target="_blank">China</a></li>
+      <li class="menu__item" role="menuitem"><a href="/japan/1-week-itinerary" class="menu__link">Japan</a></li>
+<li class="menu__item" role="menuitem"><a href="/vietnam/7-days-itinerary" class="menu__link">Vietnam</a></li> 
       </ul>
 
       <ul data-menu="submenu-5" id="submenu-5" class="menu__level" tabindex="-1" role="menu" aria-label="vacation">
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/asia/family-trip/top-destinations">Family
-            Tours</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/asia/romantic-trip/how-to-plan">Honeymoon
-            Ideas</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/southeast-asia/top-beaches">Beach
-            Relaxation</a></li>
-        <li class="menu__item" role="menuitem"><a class="menu__link" href="/thailand/trekking">Trekking Tours</a>
-        </li>
-        <li class="menu__item" role="menuitem"><a class="menu__link"
-            href="/myanmar/tours/myanmar-photography">Photography
-            Tours</a></li>
+      <li class="menu__item" role="menuitem"><a href="/southeast-asia/2-weeks-itinerary" class="menu__link">Southeast Asia</a></li>
+<li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/2-week-itineraries">Japan</a></li>
+<li class="menu__item" role="menuitem"><a class="menu__link" href="/asia/plan-a-two-week-itinerary-in-japan-and-south-korea"> Japan and South Korea</a></li>
+<li class="menu__item" role="menuitem"><a class="menu__link" href="/thailand/2-weeks-in-thailand">Thailand</a></li>
+<li class="menu__item" role="menuitem"><a  class="menu__link" href="/vietnam/2-weeks-itinerary">Vietnam</a></li>
+<li class="menu__item" role="menuitem"><a  class="menu__link" href="/india/2-week-itinerary">India</a></li>
       </ul>
 
+      <ul data-menu="submenu-8" id="submenu-8" class="menu__level" tabindex="-1" role="menu" aria-label="topthingstodo">
+      <li class="menu__item" role="menuitem"><a class="menu__link" href="/southeast-asia/4-weeks-itinerary">Southeast Asia</a></li>
+      </ul>
+
+      <ul data-menu="submenu-7" id="submenu-7" class="menu__level" tabindex="-1" role="menu" aria-label="japan">
+      <li><a href="/japan/tours/tokyo-highlights">5 Days</a></li>
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/1-week-itinerary">7 Days</a></li>    
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/tours/mountain-and-sea">8 Days</a></li>
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/tours/japan-highlights">9 Days</a></li> 
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/tours/cherry-blossom-spring-mini-group">10 Days</a></li>
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/tours/classic-japan">11 Days</a></li> 
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/tours/family-vacation">14 Days</a></li>
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/tours/summer-family-vacation">17 Days</a></li> 
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/3-week-itineraries">3 Weeks</a></li> 
+
+                                            <br><br>
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/plan-a-trip">Bucket List Trip</a></li>
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/how-to-plan-a-family-trip-to-japan">Family Trip</a></li> 
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/plan-a-cherry-blossom-trip">Cherry Blossom Trip</a></li>    
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/planning-a-summer-trip">Summer Trip</a></li>
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/plan-a-winter-trip">Winter Trip</a></li> 
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/asia/plan-a-two-week-itinerary-in-japan-and-south-korea">Japan-South Korea Trip</a></li>
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/asia/plan-a-trip-to-china-and-japan">Japan-China Trip</a></li> 
+                                            <li class="menu__item" role="menuitem"><a class="menu__link" href="/asia/plan-a-trip-to-japan-and-thailand">Japan-Thailand Trip</a></li>
+
+      </ul>
     </div>
 
 

From c5bd6c8263d0ef8649812e8ee4d04a63ae80b6af Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 10 May 2023 10:11:28 +0800
Subject: [PATCH 13/28] 11

---
 application/views/mobile_first/ah-pc.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index 75a55ef9..5fcbfc20 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -96,7 +96,7 @@
                             class="p_topnavilink" id="thailand_vietnam_cambodia_pc">Thailand-Vietnam-Cambodia</a>
                         <div class=" dropdown-content">
                             <div class="inspirationinfo">
-                                <div class="inspirationlist besttime">
+                                <div class="inspirationlist topthings">
                                     <span class="inspirationtitle">Thailand-Vietnam-Cambodia:</span>
                                     <div class="listtour">
                                         <ul class="inspiration">
@@ -123,7 +123,7 @@
                                     </div>
                                 </div>
 
-                                <div class="inspirationlist vacationtype">
+                                <div class="inspirationlist topthings">
                                     <span class="inspirationtitle">Vietnam & Thailand:</span>
                                     <ul class="inspiration">
                                         <li><a href="/southeast-asia/tours/classic-vietnam-and-thailand">2-Week
@@ -131,7 +131,7 @@
                                     </ul>
                                 </div>
 
-                                <div class="inspirationlist festival">
+                                <div class="inspirationlist topthings">
                                     <span class="inspirationtitle">Thailand & Cambodia:</span>
                                     <ul class="inspiration">
                                         <li><a href="/southeast-asia/tours/best-of-thailand-and-cambodia">2-Week
@@ -183,7 +183,7 @@
                     <li class="dropdown"><a class="p_topnavilink">Itinerary Ideas</a>
                         <div class=" dropdown-content">
                             <div class="inspirationinfo">
-                                <div class="inspirationlist topthings">
+                                <div class="inspirationlist vacationtype">
                                     <span class="inspirationtitle">1-Week Itinerary</span>
                                     <div class="listtour">
                                         <ul class="inspiration">
@@ -192,7 +192,7 @@
                                         </ul>                                      
                                     </div>
                                 </div>
-                                <div class="inspirationlist topthings">
+                                <div class="inspirationlist vacationtype">
                                     <span class="inspirationtitle">10-Day Itinerary</span>
                                     <div class="listtour">
                                         <ul class="inspiration">
@@ -201,7 +201,7 @@
                                         </ul>                                      
                                     </div>
                                 </div>
-                                <div class="inspirationlist besttime">
+                                <div class="inspirationlist vacationtype">
                                     <span class="inspirationtitle">2-Week Itinerary</span>
                                     <div class="listtour">
                                         <ul class="inspiration">
@@ -228,7 +228,7 @@
                                     </ul>
                                 </div>
 
-                                <div class="inspirationlist festival">
+                                <div class="inspirationlist vacationtype">
                                     <span class="inspirationtitle">4-Week Itinerary</span>
                                     <ul class="inspiration">
                                         <li><a href="/southeast-asia/4-weeks-itinerary">Southeast Asia</a></li>

From 1ec46cf541f183b6e7b57056720f06ae9dd3d492 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 10 May 2023 10:21:41 +0800
Subject: [PATCH 14/28] 11

---
 application/views/mobile_first/ah-pc.php | 42 +++++++++++-------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index 5fcbfc20..a5a25e23 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -58,7 +58,7 @@
                     <li class="dropdown"><a href="/japan/tours" class="p_topnavilink">Japan</a>
                         <div class=" dropdown-content">
                             <div class="inspirationinfo">
-                                <div class="inspirationlist topthings">
+                                <div class="inspirationlist vacationtype">
                                     <span class="inspirationtitle">Itinerary Ideas</span>
                                     <div class="listtour">
                                         <ul class="inspiration">
@@ -67,6 +67,8 @@
                                             <li><a href="/japan/tours/mountain-and-sea">8 Days</a></li>
                                             <li><a href="/japan/tours/japan-highlights">9 Days</a></li> 
                                             <li><a href="/japan/tours/cherry-blossom-spring-mini-group">10 Days</a></li>
+                                            </ul>
+                                            <ul class="inspiration">
                                             <li><a href="/japan/tours/classic-japan">11 Days</a></li> 
                                             <li><a href="/japan/tours/family-vacation">14 Days</a></li>
                                             <li><a href="/japan/tours/summer-family-vacation">17 Days</a></li> 
@@ -74,7 +76,7 @@
                                         </ul>                                      
                                     </div>
                                 </div>
-                                <div class="inspirationlist topthings">
+                                <div class="inspirationlist vacationtype">
                                     <span class="inspirationtitle">Trip Plan</span>
                                     <div class="listtour">
                                         <ul class="inspiration">
@@ -83,6 +85,8 @@
                                             <li><a href="/japan/plan-a-cherry-blossom-trip">Cherry Blossom Trip</a></li>    
                                             <li><a href="/japan/planning-a-summer-trip">Summer Trip</a></li>
                                             <li><a href="/japan/plan-a-winter-trip">Winter Trip</a></li> 
+                                            </ul>
+                                            <ul class="inspiration">
                                             <li><a href="/asia/plan-a-two-week-itinerary-in-japan-and-south-korea">Japan-South Korea Trip</a></li>
                                             <li><a href="/asia/plan-a-trip-to-china-and-japan">Japan-China Trip</a></li> 
                                             <li><a href="/asia/plan-a-trip-to-japan-and-thailand">Japan-Thailand Trip</a></li>
@@ -98,7 +102,7 @@
                             <div class="inspirationinfo">
                                 <div class="inspirationlist topthings">
                                     <span class="inspirationtitle">Thailand-Vietnam-Cambodia:</span>
-                                    <div class="listtour">
+                                    
                                         <ul class="inspiration">
                                             <li><a
                                                     href="/southeast-asia/tours/highlights-of-thailand-cambodia-and-vietnam">3-Week
@@ -108,19 +112,19 @@
                                             <li><a href=" /southeast-asia/tours/from-south-vietnam-to-north-cambodia">1-Week
                                                     Itinerary (Time-smart)</a></li>
                                         </ul>
-                                    </div>
+                                    
                                 </div>
 
                                 <div class="inspirationlist topthings">
                                     <span class="inspirationtitle">Vietnam & Cambodia:</span>
-                                    <div class="listtour">
+                                  
                                         <ul class="inspiration">
                                             <li><a href="/southeast-asia/tours/vietnam-cambodia-family-tour">2-Week
                                                     Itinerary for Family</a></li>
                                             <li><a href="/southeast-asia/tours/vietnam-cambodia-mekong-cruise">2-Week
                                                     Itinerary for Retired Couple</a></li>
                                         </ul>
-                                    </div>
+                                  
                                 </div>
 
                                 <div class="inspirationlist topthings">
@@ -183,25 +187,19 @@
                     <li class="dropdown"><a class="p_topnavilink">Itinerary Ideas</a>
                         <div class=" dropdown-content">
                             <div class="inspirationinfo">
-                                <div class="inspirationlist vacationtype">
-                                    <span class="inspirationtitle">1-Week Itinerary</span>
-                                    <div class="listtour">
-                                        <ul class="inspiration">
-                                            <li><a href="/japan/1-week-itinerary">Japan</a></li>
-                                            <li><a href="/vietnam/7-days-itinerary">Vietnam</a></li>            
-                                        </ul>                                      
-                                    </div>
-                                </div>
-                                <div class="inspirationlist vacationtype">
-                                    <span class="inspirationtitle">10-Day Itinerary</span>
+                                <div class="inspirationlist topthings">
+                                    <span class="inspirationtitle">7-10 Days Itinerary</span>
                                     <div class="listtour">
                                         <ul class="inspiration">
-                                            <li><a href="/japan/10-day-itineraries">Japan</a></li>
-                                            <li><a href="/vietnam/10-days-itinerary">Japan</a></li>              
+                                            <li><a href="/japan/1-week-itinerary">1-week Japan Itinerary</a></li>
+                                            <li><a href="/vietnam/7-days-itinerary">1-week Vietnam Itinerary</a></li>   
+                                            <li><a href="/japan/10-day-itineraries">10-Day Japan Itinerary</a></li>
+                                            <li><a href="/vietnam/10-days-itinerary">10-Day Japan Itinerary</a></li>           
                                         </ul>                                      
                                     </div>
                                 </div>
-                                <div class="inspirationlist vacationtype">
+                             
+                                <div class="inspirationlist topthings">
                                     <span class="inspirationtitle">2-Week Itinerary</span>
                                     <div class="listtour">
                                         <ul class="inspiration">
@@ -216,7 +214,7 @@
                                 </div>
 
 
-                                <div class="inspirationlist vacationtype">
+                                <div class="inspirationlist topthings">
                                     <span class="inspirationtitle">3-Week Itinerary</span>
                                     <ul class="inspiration">
                                         <li><a href="/southeast-asia/3-weeks-itinerary">Southeast Asia</a></li>
@@ -228,7 +226,7 @@
                                     </ul>
                                 </div>
 
-                                <div class="inspirationlist vacationtype">
+                                <div class="inspirationlist topthings">
                                     <span class="inspirationtitle">4-Week Itinerary</span>
                                     <ul class="inspiration">
                                         <li><a href="/southeast-asia/4-weeks-itinerary">Southeast Asia</a></li>

From c5f88941f5826be79c3d9135e7bcd04673ab3ddc Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 10 May 2023 10:28:28 +0800
Subject: [PATCH 15/28] 11

---
 application/views/mobile_first/ah.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php
index a0ccf956..873c7090 100644
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@@ -91,8 +91,7 @@
             aria-owns="submenu-5">2-Week Itinerary</a></li>
         <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-3"
             aria-owns="submenu-3">3-Week Itinerary</a></li>
-            <li class="menu__item" role="menuitem"><a class="menu__link" data-submenu="submenu-8"
-            aria-owns="submenu-8">4-Week Itinerary</a></li>
+            <li class="menu__item" role="menuitem"><a class="menu__link" href="/southeast-asia/4-weeks-itinerary">4-Week Southeast Asia Itinerary</a></li>
         <li class="menu__item" role="menuitem"><a class="menu__link" href="/about-us">About Us</a></li>
       </ul>
       <!-- Thailand-Vietnam-Cambodia -->
@@ -144,7 +143,7 @@
       <!-- Best-time -->
       <ul data-menu="submenu-2" id="submenu-2" class="menu__level" tabindex="-1" role="menu" aria-label="Best-time">
       <li class="menu__item" role="menuitem"><a href="/japan/10-day-itineraries" class="menu__link">Japan</a></li>
-<li class="menu__item" role="menuitem"><a href="/vietnam/10-days-itinerary" class="menu__link">Japan</a></li>
+<li class="menu__item" role="menuitem"><a href="/vietnam/10-days-itinerary" class="menu__link">Vietnam</a></li>
       </ul>
 
       <!-- festival -->
@@ -172,12 +171,8 @@
 <li class="menu__item" role="menuitem"><a  class="menu__link" href="/india/2-week-itinerary">India</a></li>
       </ul>
 
-      <ul data-menu="submenu-8" id="submenu-8" class="menu__level" tabindex="-1" role="menu" aria-label="topthingstodo">
-      <li class="menu__item" role="menuitem"><a class="menu__link" href="/southeast-asia/4-weeks-itinerary">Southeast Asia</a></li>
-      </ul>
-
       <ul data-menu="submenu-7" id="submenu-7" class="menu__level" tabindex="-1" role="menu" aria-label="japan">
-      <li><a href="/japan/tours/tokyo-highlights">5 Days</a></li>
+      <li class="menu__item" role="menuitem"><a href="/japan/tours/tokyo-highlights" class="menu__link">5 Days</a></li>
                                             <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/1-week-itinerary">7 Days</a></li>    
                                             <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/tours/mountain-and-sea">8 Days</a></li>
                                             <li class="menu__item" role="menuitem"><a class="menu__link" href="/japan/tours/japan-highlights">9 Days</a></li> 

From 86bc175a693657754244b1681352506a8b696465 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 10 May 2023 10:43:19 +0800
Subject: [PATCH 16/28] 11

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

diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/ah-pc.php
index a5a25e23..8191a36a 100644
--- a/application/views/mobile_first/ah-pc.php
+++ b/application/views/mobile_first/ah-pc.php
@@ -191,10 +191,11 @@
                                     <span class="inspirationtitle">7-10 Days Itinerary</span>
                                     <div class="listtour">
                                         <ul class="inspiration">
-                                            <li><a href="/japan/1-week-itinerary">1-week Japan Itinerary</a></li>
-                                            <li><a href="/vietnam/7-days-itinerary">1-week Vietnam Itinerary</a></li>   
-                                            <li><a href="/japan/10-day-itineraries">10-Day Japan Itinerary</a></li>
-                                            <li><a href="/vietnam/10-days-itinerary">10-Day Japan Itinerary</a></li>           
+                                            <li><a href="/japan/1-week-itinerary">1 Week in Japan</a></li>
+                                            <li><a href="/vietnam/7-days-itinerary">1 Week in Vietnam</a></li>   
+                                            <li><a href="/japan/10-day-itineraries">10 Days in Japan</a></li>
+                                            <li><a href="/vietnam/10-days-itinerary">10 Days in Vietnam</a></li>     
+                                            <li><a href="https://www.chinahighlights.com/travelguide/10-days-china-itinerary.htm" target="_blank">10 Days in China</a></li>      
                                         </ul>                                      
                                     </div>
                                 </div>
@@ -209,6 +210,7 @@
                                             <li><a href="/thailand/2-weeks-in-thailand">Thailand</a></li>
                                             <li><a href="/vietnam/2-weeks-itinerary">Vietnam</a></li>
                                             <li><a href="/india/2-week-itinerary">India</a></li>
+                                            <li><a href="https://www.chinahighlights.com/travelguide/2-weeks-china-itinerary.htm" target="_blank">China</a></li>
                                         </ul>                                      
                                     </div>
                                 </div>
@@ -219,10 +221,12 @@
                                     <ul class="inspiration">
                                         <li><a href="/southeast-asia/3-weeks-itinerary">Southeast Asia</a></li>
                                         <li><a href="/japan/3-week-itineraries">Japan</a></li>
+                                        <li><a href="https://www.chinahighlights.com/travelguide/3-weeks-china-itinerary.htm" target="_blank">China</a></li>
                                         <li><a href="/southeast-asia/trip-to-thailand-cambodia-vietnam">Thailand, Cambodia, Vietnam</a></li>
                                         <li><a href="/asia/tours/china-and-vietnam">China, Vietnam</a></li>
                                         <li><a href="/asia/tours/china-nepal-and-india">China, Nepal, India</a></li>
                                         <li><a href="/asia/tours/china-laos-thailand">China, Laos, Thailand</a></li>
+                                        
                                     </ul>
                                 </div>
 
diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/ah.php
index 873c7090..e658d67c 100644
--- a/application/views/mobile_first/ah.php
+++ b/application/views/mobile_first/ah.php
@@ -144,12 +144,14 @@
       <ul data-menu="submenu-2" id="submenu-2" class="menu__level" tabindex="-1" role="menu" aria-label="Best-time">
       <li class="menu__item" role="menuitem"><a href="/japan/10-day-itineraries" class="menu__link">Japan</a></li>
 <li class="menu__item" role="menuitem"><a href="/vietnam/10-days-itinerary" class="menu__link">Vietnam</a></li>
+<li class="menu__item" role="menuitem"><a href="https://www.chinahighlights.com/travelguide/10-days-china-itinerary.htm" target="_blank" class="menu__link">China</a></li> 
       </ul>
 
       <!-- festival -->
       <ul data-menu="submenu-3" id="submenu-3" class="menu__level" tabindex="-1" role="menu" aria-label="festival">
       <li class="menu__item" role="menuitem"><a href="/southeast-asia/3-weeks-itinerary" class="menu__link">Southeast Asia</a></li>
 <li class="menu__item" role="menuitem"><a href="/japan/3-week-itineraries" class="menu__link">Japan</a></li>
+<li class="menu__item" role="menuitem"><a href="https://www.chinahighlights.com/travelguide/3-weeks-china-itinerary.htm" target="_blank" class="menu__link">China</a></li>
 <li class="menu__item" role="menuitem"><a href="/southeast-asia/trip-to-thailand-cambodia-vietnam" class="menu__link">Thailand, Cambodia, Vietnam</a></li>
 <li class="menu__item" role="menuitem"><a href="/asia/tours/china-and-vietnam" class="menu__link">China, Vietnam</a></li>
 <li class="menu__item" role="menuitem"><a href="/asia/tours/china-nepal-and-india" class="menu__link">China, Nepal, India</a></li>
@@ -169,6 +171,7 @@
 <li class="menu__item" role="menuitem"><a class="menu__link" href="/thailand/2-weeks-in-thailand">Thailand</a></li>
 <li class="menu__item" role="menuitem"><a  class="menu__link" href="/vietnam/2-weeks-itinerary">Vietnam</a></li>
 <li class="menu__item" role="menuitem"><a  class="menu__link" href="/india/2-week-itinerary">India</a></li>
+<li class="menu__item" role="menuitem"><a  class="menu__link" href="https://www.chinahighlights.com/travelguide/2-weeks-china-itinerary.htm" target="_blank">China</a></li>
       </ul>
 
       <ul data-menu="submenu-7" id="submenu-7" class="menu__level" tabindex="-1" role="menu" aria-label="japan">

From a4adac3412933cfcc213f191f0035eb7ba6c006c Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Thu, 11 May 2023 09:15:24 +0800
Subject: [PATCH 17/28] 11

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

diff --git a/application/views/mobile_first/ch-pc.php b/application/views/mobile_first/ch-pc.php
index 96ffa2d5..0d08117c 100644
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@@ -211,8 +211,8 @@
         </div>
     </header>
     <div class="updated_news">
-        <div class="list_content">China has officially announced resuming all kinds of visas including tourist visa (L Visa) application from March 15th, 2023. <a
-                href="/travelguide/china-travel-reopen-restrictions.htm" id="updated_news_new_year_2022_pc">Learn
+        <div class="list_content">Top 10 China tours 2023/2024 for first visits and returns: embark on a lifetime experience. <a
+                href="/tour/top-china-tours/" id="updated_news_new_year_2022_pc">Learn
                 more</a></div>
     </div>
     <!--@TOP-BANNER@-->
diff --git a/application/views/mobile_first/ch.php b/application/views/mobile_first/ch.php
index 490d9941..2aab13e4 100644
--- a/application/views/mobile_first/ch.php
+++ b/application/views/mobile_first/ch.php
@@ -53,8 +53,8 @@
     </div>
   </header>
   <div class="updated_news">
-    <div class="list_content">China has officially announced resuming all kinds of visas including tourist visa (L Visa) application from March 15th, 2023. <a
-        href="/travelguide/china-travel-reopen-restrictions.htm" id="updated_news_new_year_2022_mobile">Learn more</a>
+    <div class="list_content">Top 10 China tours 2023/2024 for first visits and returns: embark on a lifetime experience. <a
+                href="/tour/top-china-tours/" id="updated_news_new_year_2022_pc">Learn more</a>
     </div>
   </div>
   <!--总-->

From a670156864fd4d31ff9f58c8a3035b3352bd200f Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Thu, 11 May 2023 14:14:15 +0800
Subject: [PATCH 18/28] =?UTF-8?q?=E6=80=A7=E5=88=AB=E9=80=89=E6=8B=A9html?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/order/views/confirm_order.php | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php
index 32dd0ea2..33111846 100644
--- a/application/third_party/order/views/confirm_order.php
+++ b/application/third_party/order/views/confirm_order.php
@@ -354,6 +354,13 @@ label.gender:hover {
     background: #ad1818;
     color: #fff;
 }
+select.gender_pick {border: 1px solid #d1d1d1;
+    border-radius: 4px;
+    height: 50px;
+    font-size: 19px;
+    box-shadow: inset 0 1px 3px rgb(0 0 0 / 10%);
+	padding: 0 15px;
+    width: auto;}
 	</style>
 </head>
 
@@ -393,21 +400,12 @@ label.gender:hover {
 
 					<div class="traveler_info">
 						<h3 data-header>Traveler 1</h3>
-                        <div style="    
-    margin-bottom: -30px;
-    display: inline-block;
-    width: 100%;">
-                            <input type="radio" name="gender[]" id="genderMs" value="100003" style="display:none;" class="tmpick">
-                            <label class="gender" for="genderMs" style="width: 120px;">
-
-                                Ms.</label>
-                            <input type="radio" name="gender[]" id="genderMr" value="100001" style="display:none;" class="tmpick">
-                            <label class="gender" for="genderMr" style="width: 120px;">
-
-                                Mr.</label>
-                        </div>
+                       
 						<div class="selectionBlock">
-
+						<select name="gender[]" class="gender_pick">
+                            <option value="Mr.">Mr.</option>
+                            <option value="Ms.">Ms.</option>
+                        </select>
 							<div class="inputTerm">
 								<input type="text" name="sur_name[]" required="">
 								<label>

From 7981fc21d3c79791eaa4b0b33748cae7d5c63b50 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Thu, 11 May 2023 14:27:08 +0800
Subject: [PATCH 19/28] =?UTF-8?q?=E6=80=A7=E5=88=ABvalue=E5=80=BC=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/third_party/order/views/confirm_order.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php
index 33111846..bf3fa68d 100644
--- a/application/third_party/order/views/confirm_order.php
+++ b/application/third_party/order/views/confirm_order.php
@@ -403,8 +403,8 @@ select.gender_pick {border: 1px solid #d1d1d1;
                        
 						<div class="selectionBlock">
 						<select name="gender[]" class="gender_pick">
-                            <option value="Mr.">Mr.</option>
-                            <option value="Ms.">Ms.</option>
+                            <option value="100001">Mr.</option>
+                            <option value="100003">Ms.</option>
                         </select>
 							<div class="inputTerm">
 								<input type="text" name="sur_name[]" required="">

From 8ad3faee4f70eea73e438aff8aaab51d04ad470e Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 11 May 2023 14:35:52 +0800
Subject: [PATCH 20/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php     | 158 ++++++++++++++++++++
 application/models/Price_model.php          |  77 ++++++++++
 application/models/PrimeLinePrice_model.php | 107 +++++++++++++
 3 files changed, 342 insertions(+)
 create mode 100644 application/models/Price_model.php
 create mode 100644 application/models/PrimeLinePrice_model.php

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 1b56f46a..2ef6474d 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -25,6 +25,8 @@ class Information extends CI_Controller
         $this->load->model('recommends_and_tips_model');
         $this->load->model('trippest_model'); //trippest产品
         $this->load->model('Feedback_model');
+        $this->load->model('Price_model');
+        $this->load->model('PrimeLinePrice_model');
         $this->load->library('Amplib'); //加载AMP处理类
         $this->load->library('html_optimize_lib'); //加载HTML优化类
 
@@ -992,6 +994,162 @@ class Information extends CI_Controller
       var_dump($feedback_newest_content);
     }
 
+    public function test_price()
+    {
+      $price_rule = '#ah-8,st,2#';//'#'.$meta_product_code.',st,2#';
+      $tag_price = $this->replace_price_tag($price_rule);
+      var_dump($tag_price);
+    }
+
+    /*!
+     * 页面中有价格标签，查出价格并替换内容
+     * @author LYT <lyt@hainatravel.com>
+     * @date   2017-07-14
+     * @param  string     $price_content 包含价格标签的内容
+     * @return string                    可读的价格字符串
+     */
+    public function replace_price_tag($price_content)
+    {
+        $price_item_array = $this->price_pregmatch($price_content);
+        if ( ! empty($price_item_array)) {
+            foreach ($price_item_array as $price_item) {
+                $price_date = !empty($price_item->price_date) ? $price_item->price_date : date('Y-m-d', time() + 86400 * 7); //当前时间7天后的价格
+                $price_number = '';
+                //优先读取新的价格体系
+                $price = $this->PrimeLinePrice_model->search($price_item->cli_no, 1, $price_item->cli_grade, $price_item->person_size, $price_date);
+                if (!empty($price)) {
+                    switch (strtoupper($price_item->price_people)) {
+                        case 'A':
+                            $price_number = $price->PLP_AdultUnitPrice;
+                            break;
+                        case 'C':
+                            $price_number = $price->PLP_ChildUnitPrice;
+                            break;
+                        case 'B':
+                            $price_number = $price->PLP_BabyUnitPrice;
+                            break;
+                        case 'R':
+                            $price_number = $price->PLP_RoomDiffPrice;
+                            break;
+                        case 'AR':
+                            $price_number = $price->PLP_AdultUnitPrice + $price->PLP_RoomDiffPrice; //成人加单间房差
+                            break;
+                        default :
+                            $price_number = $price->PLP_AdultUnitPrice;
+                    }
+                } else {
+                    $price = $this->Price_model->search($price_item->cli_no, 1, $price_item->cli_grade, false, $price_date);
+                    if (!empty($price)) {
+
+                        switch (strtoupper($price_item->price_people)) {
+                            case 'A':
+                                switch ($price_item->person_size) {
+                                    case '1':
+                                        $price_number = $price->CLP_OneAdultPriceRMB;
+                                        break;
+                                    case '2'://25
+                                        $price_number = $price->CLP_TwoToFiveAdultPriceRMB;
+                                        break;
+                                    case '6'://69
+                                        $price_number = $price->CLP_SixToNineAdultPriceRMB;
+                                        break;
+                                    case '10':
+                                        $price_number = $price->CLP_OverTenAdultPriceRMB;
+                                        break;
+                                    default:
+                                        $price_number = $price->CLP_TwoToFiveAdultPriceRMB;
+                                }
+                                break;
+                            case 'C':
+                                $price_number = 0;
+                                break;
+                            case 'B':
+                                $price_number = 0;
+                                break;
+                            case 'R':
+                                switch ($price_item->person_size) {
+                                    case '1':
+                                        $price_number = $price->CLP_OneRoomDiffPriceRMB;
+                                        break;
+                                    case '2'://25
+                                        $price_number = $price->CLP_TwoToFiveRoomDiffPriceRMB;
+                                        break;
+                                    case '6'://69
+                                        $price_number = $price->CLP_SixToNineRoomDiffPriceRMB;
+                                        break;
+                                    case '10':
+                                        $price_number = $price->CLP_OverTenRoomDiffPriceRMB;
+                                        break;
+                                    default:
+                                        $price_number = $price->CLP_TwoToFiveRoomDiffPriceRMB;
+                                }
+                                break;
+                            case 'AR'://成人加单间房差
+                                $price_number = 0;
+                                break;
+                            default :
+                                $price_number = 0;
+                        }
+                    }
+                }
+                $site_money = $this->CI->currency->GetSiteMoney($price_number);
+                $site_money = $this->CI->currency->calc_show_price($site_money);
+                //把金额格式化为带有逗号(,)方便阅读，如 12,345
+                $price_number = is_numeric($price_number) ? number_format($site_money) : $price_number;
+                if (!empty($price_number)) {
+                    $price_content = str_replace($price_item->placeholder, $price_number, $price_content);
+                }
+            }
+        }
+        return $price_content;
+    }
+
+    //使用正则匹配出价格标签，返回一个价格数组
+    private function price_pregmatch($content) {
+      $price_array = array();
+      $temp_array = array();
+      $result = false;
+      //#ah-1,lx,2,2016-01-23,A#
+      //线路代号,等级(st标准、lx豪华、ec经济),人等,时间,人型(A成人、C小孩、B婴儿、R单间房差、AR成人+房差)
+      preg_match_all('^#[a-zA-Z0-9,-]+#^', $content, $temp_array);
+      foreach ($temp_array[0] as $item) {
+          $placeholder = $item;
+          $item = str_replace('#', '', $item);
+          $price_array = explode(',', $item);
+          $cli_no = !empty($price_array[0]) ? $price_array[0] : false; //线路代号
+          if (empty($cli_no)) {
+              continue; //没有设置线路代号则进入下一条
+          }
+          $cli_grade = !empty($price_array[1]) ? $price_array[1] : false; //标准7001、豪华7002、经济7003
+          switch (strtoupper($cli_grade)) {
+              case 'ST':
+                  $cli_grade = '7001';
+                  break;
+              case 'LX':
+                  $cli_grade = '7002';
+                  break;
+              case 'EC':
+                  $cli_grade = '7003';
+                  break;
+              default :$cli_grade = '7001';
+          }
+          $person_size = (!empty($price_array[2]) && is_numeric($price_array[2])) ? $price_array[2] : 2; //人等1,2-5,6-9,10，默认2人等
+          //为了兼容以前的人等方式，把算数人等转换为单数 25=>2
+          switch ($person_size) {
+              case '25':
+                  $person_size = '2';
+                  break;
+              case '69':
+                  $person_size = '6';
+                  break;
+          }
+          $price_date = !empty($price_array[3]) ? $price_array[3] : false; //价格时间
+          $price_people = !empty($price_array[4]) ? $price_array[4] : 'A'; //A成人、C小孩、B婴儿、R单间房差
+          $result[] = (object) array('placeholder' => $placeholder, 'cli_no' => $cli_no, 'cli_grade' => $cli_grade, 'person_size' => $person_size, 'price_date' => $price_date, 'price_people' => $price_people);
+      }
+      return $result;
+  }
+
     public function make_www_cache_gh($device, $information, $recommand_information)
     {
         $data = array();
diff --git a/application/models/Price_model.php b/application/models/Price_model.php
new file mode 100644
index 00000000..d464f15b
--- /dev/null
+++ b/application/models/Price_model.php
@@ -0,0 +1,77 @@
+<?php
+
+class Price_model extends CI_Model {
+
+    var $topnum = false; //返回记录数
+    var $cli_no = false; //线路代号
+    var $person_size = false; //人等
+    var $cli_grade = false; //(标准7001、豪华7002、经济7003）
+    var $clp_pricetype = false; //价格类型 1旺季，2淡季
+    var $price_date = false; //查询价格日期区间
+    var $orderby = false;
+
+    function __construct() {
+        parent::__construct();
+        $this->HT = $this->load->database('HT', TRUE);
+    }
+
+    public function init() {
+        $this->topnum = false;
+        $this->cli_no = false;
+        $this->person_size = false;
+        $this->cli_grade = false;
+        $this->clp_pricetype = false;
+        $this->price_date = false;
+        $this->orderby = ' ORDER BY cli.CLI_Grade ASC, clp.CLP_PriceStartDate ASC,clp.CLP_PriceType DESC ';
+    }
+
+    public function search($cli_no, $topnum = false, $cli_grade = false, $clp_pricetype = false, $price_date = false) {
+        $this->init();
+        $this->topnum = empty($topnum) ? false : $topnum;
+        $this->cli_no = ' AND cli.CLI_NO = ' . $this->HT->escape($cli_no);
+        $this->cli_grade = empty($cli_grade) ? false : ' AND cli.CLI_Grade = ' . $this->HT->escape($cli_grade);
+        $this->clp_pricetype = empty($clp_pricetype) ? false : ' AND clp.CLP_PriceType = ' . $this->HT->escape($clp_pricetype);
+        $this->price_date = empty($price_date) ? false : " AND '$price_date 00:00:00' BETWEEN clp.CLP_PriceStartDate AND clp.CLP_PriceEndDate ";
+        return $this->get_list();
+    }
+
+    public function get_list() {
+        $this->topnum ? $sql = "SELECT TOP " . $this->topnum : $sql = "SELECT ";
+        $sql .= "    
+                  cli.CLI_SN
+                 ,cli.CLI_NO
+                 ,clp.CLP_SN
+                 ,clp.CLP_OneAdultPriceRMB
+                 ,clp.CLP_TwoToFiveAdultPriceRMB
+                 ,clp.CLP_SixToNineAdultPriceRMB
+                 ,clp.CLP_OverTenAdultPriceRMB
+                 ,clp.CLP_PriceType
+                 ,cli.CLI_Grade
+                 ,clp.CLP_PriceStartDate
+                 ,clp.CLP_PriceEndDate
+           FROM   CustomerLinePrice clp
+                  INNER JOIN CustomerLineInfo cli
+                       ON  cli.CLI_SN = clp.CLP_CLI_SN
+           WHERE  1 = 1
+                  AND cli.CLI_State IN (1005003 ,1005004)
+                 ";
+        $this->cli_no ? $sql.=$this->cli_no : false;
+        $this->cli_grade ? $sql.=$this->cli_grade : false;
+        $this->clp_pricetype ? $sql.=$this->clp_pricetype : false;
+        $this->price_date ? $sql.=$this->price_date : false;
+        $this->orderby ? $sql.=$this->orderby : false;
+        $query = $this->HT->query($sql);
+        //print_r($this->HT->queries);
+        if ($this->topnum === 1) {
+            if ($query->num_rows() > 0) {
+                $row = $query->row();
+                return $row;
+            } else {
+                return FALSE;
+            }
+        } else {
+            return $query->result();
+        }
+    }
+
+}
diff --git a/application/models/PrimeLinePrice_model.php b/application/models/PrimeLinePrice_model.php
new file mode 100644
index 00000000..05d02e50
--- /dev/null
+++ b/application/models/PrimeLinePrice_model.php
@@ -0,0 +1,107 @@
+<?php
+
+class PrimeLinePrice_model extends CI_Model {
+
+    var $topnum = false; //返回记录数
+    var $cli_no = false; //线路代号
+    var $person_size = false; //人等
+    var $cli_grade = 7001; //(标准7001、豪华7002、经济7003）
+    var $price_date = false; //查询价格日期区间
+    var $orderby = false;
+
+    function __construct() {
+        parent::__construct();
+        $this->HT = $this->load->database('HT', TRUE);
+    }
+
+    public function init() {
+        $this->topnum = false;
+        $this->cli_no = false;
+        $this->person_size = false;
+        $this->cli_grade = false;
+        $this->price_date = false;
+        $this->orderby = ' ORDER BY plp.PLP_Level ASC,plp.PLP_IsWeekPrice DESC,plp.PLP_AdultUnitPrice DESC ';
+    }
+
+    public function search($cli_no, $topnum = false, $cli_grade = false, $person_size = false, $price_date = false) {
+        $this->init();
+        $this->cli_no = $cli_no;
+        $this->topnum = empty($topnum) ? false : $topnum;
+        $this->cli_grade = empty($cli_grade) ? false : $this->cli_grade = ' AND  cli.CLI_Grade = ' . $this->HT->escape($cli_grade);
+        $this->person_size = empty($person_size) ? false : $this->person_size = " AND $person_size BETWEEN plp.PLP_PersonGradeDown AND plp.PLP_PersonGradeUp ";
+        if (!empty($price_date)) {
+            $this->price_date = " AND '$price_date 00:00:00' BETWEEN plp.PLP_StartDate AND plp.PLP_EndDate ";
+            $week_day = (int) date('w', strtotime($price_date)); //获取当前时间的星期号，用于判断周末价
+            $this->price_date .="
+                 AND (
+                                (plp.PLP_IsWeekPrice=1 AND plp.PLP_WeekDefine LIKE '%$week_day%')
+                                OR (plp.PLP_IsWeekPrice=0)
+                            )
+                     ";
+        }
+        return $this->get_list();
+    }
+
+    public function get_list() {
+        $this->topnum ? $sql = "SELECT TOP " . $this->topnum : $sql = "SELECT ";
+        $sql .= "
+                          cli.CLI_SN
+                          ,cli.CLI_NO
+                          ,cli.CLI_Grade
+                          ,plp.PLP_SN
+                          ,plp.PLP_CLI_SN
+                          ,plp.PLP_Season
+                          ,plp.PLP_Area
+                          ,plp.PLP_StartDate
+                          ,plp.PLP_EndDate
+                          ,plp.PLP_PersonGradeDown
+                          ,plp.PLP_PersonGradeUp
+                          ,plp.PLP_AdultUnitCost
+                          ,plp.PLP_AdultUnitPrice
+                          ,plp.PLP_RoomDiffPrice
+                          ,plp.PLP_ChildRate
+                          ,plp.PLP_BabyRate
+                          ,plp.PLP_ChildUnitPrice
+                          ,plp.PLP_BabyUnitPrice
+                          ,plp.PLP_Level
+                          ,plp.PLP_IsWeekPrice
+                          ,plp.PLP_WeekDefine
+                          ,plp.PLP_PriceDate
+                          ,plp.PLP_PersonNum
+                          ,plp.PLP_VEI_SN
+                          ,plp.PLP_Year
+                          ,plp.PLP_VPPI_SN
+                          ,plp.PLP_VPPD_SN
+                          ,plp.PLP_Creator
+                          ,plp.PLP_CreateDate
+                          ,plp.PLP_LastEditor
+                          ,plp.PLP_LastEditDate
+                    FROM   PrimeLinePrice plp
+                            INNER JOIN CustomerLineInfo cli
+                                 ON  cli.CLI_SN = plp.PLP_CLI_SN
+                    WHERE  1 = 1
+                            AND cli.CLI_DEI_SN=?
+                            AND plp.PLP_Year IS NOT NULL
+                            AND cli.CLI_NO = ?
+                            AND cli.CLI_State IN (1005003 ,1005004)
+                 ";
+
+        $this->person_size ? $sql.=$this->person_size : false;
+        $this->price_date ? $sql.=$this->price_date : false;
+        $this->cli_grade ? $sql.=$this->cli_grade : false;
+        $this->orderby ? $sql.=$this->orderby : false;
+
+        $query = $this->HT->query($sql,array(CONST_SITE_DEPARTMENT,$this->cli_no));
+        if ($this->topnum === 1) {
+            if ($query->num_rows() > 0) {
+                $row = $query->row();
+                return $row;
+            } else {
+                return FALSE;
+            }
+        } else {
+            return $query->result();
+        }
+    }
+
+}

From c266aad27934fb641ab02ec587f28f2711871988 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 11 May 2023 14:39:51 +0800
Subject: [PATCH 21/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=99=E7=82=B9?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/models/PrimeLinePrice_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/PrimeLinePrice_model.php b/application/models/PrimeLinePrice_model.php
index 05d02e50..cd395801 100644
--- a/application/models/PrimeLinePrice_model.php
+++ b/application/models/PrimeLinePrice_model.php
@@ -91,7 +91,7 @@ class PrimeLinePrice_model extends CI_Model {
         $this->cli_grade ? $sql.=$this->cli_grade : false;
         $this->orderby ? $sql.=$this->orderby : false;
 
-        $query = $this->HT->query($sql,array(CONST_SITE_DEPARTMENT,$this->cli_no));
+        $query = $this->HT->query($sql,array($this->config->item('site_code'),$this->cli_no));
         if ($this->topnum === 1) {
             if ($query->num_rows() > 0) {
                 $row = $query->row();

From 94ae3d4a72868695f59c7243aa25f2e16b604d10 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 11 May 2023 14:45:30 +0800
Subject: [PATCH 22/28] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20AH=20=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/models/PrimeLinePrice_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/PrimeLinePrice_model.php b/application/models/PrimeLinePrice_model.php
index cd395801..752e5a25 100644
--- a/application/models/PrimeLinePrice_model.php
+++ b/application/models/PrimeLinePrice_model.php
@@ -91,7 +91,7 @@ class PrimeLinePrice_model extends CI_Model {
         $this->cli_grade ? $sql.=$this->cli_grade : false;
         $this->orderby ? $sql.=$this->orderby : false;
 
-        $query = $this->HT->query($sql,array($this->config->item('site_code'),$this->cli_no));
+        $query = $this->HT->query($sql,array(14,$this->cli_no));
         if ($this->topnum === 1) {
             if ($query->num_rows() > 0) {
                 $row = $query->row();

From 683c74cc4aafe1b5de181d7a60d9ff44d74f3b22 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 11 May 2023 14:48:40 +0800
Subject: [PATCH 23/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A7=E5=B8=81?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E7=B1=BB=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php |   5 +-
 application/libraries/Currency.php      | 203 ++++++++++++++++++++++++
 2 files changed, 206 insertions(+), 2 deletions(-)
 create mode 100644 application/libraries/Currency.php

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 2ef6474d..001c2a98 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -28,6 +28,7 @@ class Information extends CI_Controller
         $this->load->model('Price_model');
         $this->load->model('PrimeLinePrice_model');
         $this->load->library('Amplib'); //加载AMP处理类
+        $this->load->library('Currency');
         $this->load->library('html_optimize_lib'); //加载HTML优化类
 
     }
@@ -1092,8 +1093,8 @@ class Information extends CI_Controller
                         }
                     }
                 }
-                $site_money = $this->CI->currency->GetSiteMoney($price_number);
-                $site_money = $this->CI->currency->calc_show_price($site_money);
+                $site_money = $this->currency->GetSiteMoney($price_number);
+                $site_money = $this->currency->calc_show_price($site_money);
                 //把金额格式化为带有逗号(,)方便阅读，如 12,345
                 $price_number = is_numeric($price_number) ? number_format($site_money) : $price_number;
                 if (!empty($price_number)) {
diff --git a/application/libraries/Currency.php b/application/libraries/Currency.php
new file mode 100644
index 00000000..1c3775e2
--- /dev/null
+++ b/application/libraries/Currency.php
@@ -0,0 +1,203 @@
+<?php
+
+if (!defined('BASEPATH'))
+    exit('No direct script access allowed');
+/*
+ * 自动加载语种标签
+ */
+
+class Currency {
+
+    var $USD_Rate; //人民币兑美元汇率
+    var $EUR_Rate; //人民币兑欧元汇率
+    var $RUB_Rate; //人民币兑卢布汇率
+
+    public function __construct() {
+        $this->CI = & get_instance();
+        log_message('debug', "Language Tags Class Initialized");
+        $this->GetCurrencyRate();
+    }
+
+    function GetCurrencyRate() {
+        $this->HT = $this->CI->load->database('HT', TRUE);
+        $sql = "SELECT CRI_BuyIn / 100.00 AS tmpExRate, \n"
+                . "       CRI_Code \n"
+                . "FROM   tourmanager.dbo.CurrencyRateInfo \n"
+                . "WHERE  CRI_Code IN ('USD', 'EUR', 'RUB') \n"
+                . "       AND GETDATE() BETWEEN CRI_Start AND CRI_Stop";
+        $query = $this->HT->query($sql);
+        foreach ($query->result() as $item) {
+            switch ($item->CRI_Code) {
+                case 'USD':
+                    $this->USD_Rate = $item->tmpExRate;
+                    break;
+                case 'EUR':
+                    $this->EUR_Rate = $item->tmpExRate;
+                    break;
+                case 'RUB':
+                    $this->RUB_Rate = $item->tmpExRate;
+                    break;
+            }
+        }
+//        echo $this->USD_Rate . '<br/>';
+//        echo $this->EUR_Rate . '<br/>';
+//        echo $this->RUB_Rate . '<br/>';
+        return $query->result();
+    }
+
+    //根据人民币转换成站点对应的货币
+    public function GetSiteMoney($RMB) {
+        if (!is_numeric($RMB))
+        {
+            return $RMB;
+        }
+
+        $result = $RMB;
+        if (is_numeric($RMB)) {
+            switch (CONST_SITE_CURRENCY) {
+                case 'USD':
+                    $result = $RMB / $this->USD_Rate;
+                    break;
+                case 'EUR':
+                    $result = $RMB / $this->EUR_Rate;
+                    break;
+                case 'RUB':
+                    $result = $RMB / $this->RUB_Rate;
+                    break;
+            }
+        }
+        return ceil($result);
+    }
+
+    //把美金转换为人民币
+    public function get_USD_RMB_SUM($USD) {
+
+        if (!is_numeric($USD))return $USD;
+        $result = $USD;
+		$result = $USD * $this->USD_Rate;
+        return ceil($result);
+    }
+
+    /**
+     * 返回站点的汇率。
+     *
+     * @author lmr
+     */
+    public function get_site_currencyrate() {
+        switch (CONST_SITE_CURRENCY) {
+            case 'USD':
+                return $this->USD_Rate;
+            case 'EUR':
+                return $this->EUR_Rate;
+            case 'RUB':
+                return $this->RUB_Rate;
+            default:
+                return 1;
+        }
+    }
+
+    /**
+     * 返回带money_char的价格。
+     *
+     * @param $money Int 价格.
+     * @return String 带货币符号的价格。
+     */
+     public function get_money_char($money='') {
+
+        switch (CONST_SITE_CODE) {
+            case 'JP':
+                return $money.'元';
+            case 'GM':
+                return '€'.$money;
+            case 'VC':
+                return $money.'€';
+            case 'VAC':
+                return '$'.$money;
+            case 'RU':
+                return '$'.$money;
+            case 'IT':
+                return '€'.$money;
+            case 'SHT':
+                return '$'.$money;
+            default:
+                return '$'.$money;
+        }
+     }
+
+    /**
+     * 返回带money_char的价格。
+     *
+     * @param $money Int 价格.
+     * @return String 带货币符号的价格。
+     */
+    public function get_site_money_with_char($money='') {
+        return $this->get_money_char($this->GetSiteMoney($money));
+     }
+
+
+     /**
+      * RMB换算成指定货币。
+      * @param  int money   RMB
+      * @param  string  char    货币代号：usd，eur
+      * @return int 换算价格
+      */
+     public function convert_moneny_by_char($money,$char='')
+     {
+        switch (strtolower($char))
+        {
+            case 'usd':
+                return ceil($money/$this->USD_Rate);
+            case 'eur':
+                return ceil($money/$this->EUR_Rate);
+        }
+        return $money;
+     }
+
+    /**
+     * 尾数取"9"的定价规则
+     * 在正负误差值小于或等于16的前提下，
+     * 保证展示价格的个位数和十位数统一取"99"
+     * 当展示价格的个位数和十位数取"99"的正负误差大于16时，
+     * 通过四舍五入加价实现个位数取"9"
+     * 详细规则见GitLab issue #12 统一网前展示价格的标准
+     */
+    public function calc_show_price($value=0) {
+        if (empty($value)) return 0;
+        if (!is_numeric($value)) return $value;
+
+        $val_len = strlen($value);
+
+        if ($val_len == 1) return 9;
+
+        $discount = 16;
+        $val_pow = pow(10, $val_len - 1);
+
+        $min_val = $val_pow - 1;
+        $max_val = $min_val + $val_pow;
+        $max_diff = abs($value - $max_val);
+        $min_diff = abs($value - $min_val);
+
+        if (min($max_diff, $min_diff) > $discount) {
+            $calc_val = floor($value / 10) * 10 + 9;
+        } else {
+            $calc_val = $max_diff > $min_diff ? $min_val : $max_val;
+        }
+        return $calc_val;
+    }
+    /**
+     * 获取设置的信用卡卡费
+     */
+    public function cardfee(){
+        $sql = "SELECT TOP 1 * FROM dbo.SystemSettingInfo WHERE (SSI_Code = 1021001)";
+
+        $this->HT = $this->CI->load->database('HT', TRUE);
+        $query = $this->HT->query($sql);
+        $row = $query->row();
+        if (isset($row)){
+            return $row->SSI_UserValue;
+        }else{
+            return 0;
+        }
+
+    }
+}

From ceb57adbc4cf0b56dc2df53eb071311fa5f267b2 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 11 May 2023 14:58:44 +0800
Subject: [PATCH 24/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 001c2a98..a38d5eef 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1012,12 +1012,14 @@ class Information extends CI_Controller
     public function replace_price_tag($price_content)
     {
         $price_item_array = $this->price_pregmatch($price_content);
+        var_dump($price_item_array);
         if ( ! empty($price_item_array)) {
             foreach ($price_item_array as $price_item) {
                 $price_date = !empty($price_item->price_date) ? $price_item->price_date : date('Y-m-d', time() + 86400 * 7); //当前时间7天后的价格
                 $price_number = '';
                 //优先读取新的价格体系
                 $price = $this->PrimeLinePrice_model->search($price_item->cli_no, 1, $price_item->cli_grade, $price_item->person_size, $price_date);
+                var_dump($price);
                 if (!empty($price)) {
                     switch (strtoupper($price_item->price_people)) {
                         case 'A':

From 79a46fd76ecdb524b53732f3bbc992fcd0a787b1 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Thu, 11 May 2023 15:49:00 +0800
Subject: [PATCH 25/28] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php     | 6 ++----
 application/libraries/Currency.php          | 4 ++--
 application/models/PrimeLinePrice_model.php | 4 +++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index a38d5eef..c31eb8eb 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -999,7 +999,7 @@ class Information extends CI_Controller
     {
       $price_rule = '#ah-8,st,2#';//'#'.$meta_product_code.',st,2#';
       $tag_price = $this->replace_price_tag($price_rule);
-      var_dump($tag_price);
+      echo 'Price: '.$tag_price;
     }
 
     /*!
@@ -1012,14 +1012,12 @@ class Information extends CI_Controller
     public function replace_price_tag($price_content)
     {
         $price_item_array = $this->price_pregmatch($price_content);
-        var_dump($price_item_array);
         if ( ! empty($price_item_array)) {
             foreach ($price_item_array as $price_item) {
                 $price_date = !empty($price_item->price_date) ? $price_item->price_date : date('Y-m-d', time() + 86400 * 7); //当前时间7天后的价格
                 $price_number = '';
                 //优先读取新的价格体系
                 $price = $this->PrimeLinePrice_model->search($price_item->cli_no, 1, $price_item->cli_grade, $price_item->person_size, $price_date);
-                var_dump($price);
                 if (!empty($price)) {
                     switch (strtoupper($price_item->price_people)) {
                         case 'A':
@@ -1095,7 +1093,7 @@ class Information extends CI_Controller
                         }
                     }
                 }
-                $site_money = $this->currency->GetSiteMoney($price_number);
+                $site_money = $this->currency->GetSiteMoney($price_number, 'USD');
                 $site_money = $this->currency->calc_show_price($site_money);
                 //把金额格式化为带有逗号(,)方便阅读，如 12,345
                 $price_number = is_numeric($price_number) ? number_format($site_money) : $price_number;
diff --git a/application/libraries/Currency.php b/application/libraries/Currency.php
index 1c3775e2..fb145c04 100644
--- a/application/libraries/Currency.php
+++ b/application/libraries/Currency.php
@@ -46,7 +46,7 @@ class Currency {
     }
 
     //根据人民币转换成站点对应的货币
-    public function GetSiteMoney($RMB) {
+    public function GetSiteMoney($RMB, $fromCurrency) {
         if (!is_numeric($RMB))
         {
             return $RMB;
@@ -54,7 +54,7 @@ class Currency {
 
         $result = $RMB;
         if (is_numeric($RMB)) {
-            switch (CONST_SITE_CURRENCY) {
+            switch ($fromCurrency) {
                 case 'USD':
                     $result = $RMB / $this->USD_Rate;
                     break;
diff --git a/application/models/PrimeLinePrice_model.php b/application/models/PrimeLinePrice_model.php
index 752e5a25..b167cb2e 100644
--- a/application/models/PrimeLinePrice_model.php
+++ b/application/models/PrimeLinePrice_model.php
@@ -8,6 +8,8 @@ class PrimeLinePrice_model extends CI_Model {
     var $cli_grade = 7001; //(标准7001、豪华7002、经济7003）
     var $price_date = false; //查询价格日期区间
     var $orderby = false;
+    // AH: 28
+    var $DEI_SN = 28;
 
     function __construct() {
         parent::__construct();
@@ -91,7 +93,7 @@ class PrimeLinePrice_model extends CI_Model {
         $this->cli_grade ? $sql.=$this->cli_grade : false;
         $this->orderby ? $sql.=$this->orderby : false;
 
-        $query = $this->HT->query($sql,array(14,$this->cli_no));
+        $query = $this->HT->query($sql,array($DEI_SN,$this->cli_no));
         if ($this->topnum === 1) {
             if ($query->num_rows() > 0) {
                 $row = $query->row();

From d8100905c9f013326a89a68b2ec115741910b732 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Fri, 12 May 2023 10:13:06 +0800
Subject: [PATCH 26/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php     | 16 +++++++++++-----
 application/models/PrimeLinePrice_model.php |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index c31eb8eb..0870a2a5 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -997,9 +997,9 @@ class Information extends CI_Controller
 
     public function test_price()
     {
-      $price_rule = '#ah-8,st,2#';//'#'.$meta_product_code.',st,2#';
-      $tag_price = $this->replace_price_tag($price_rule);
-      echo 'Price: '.$tag_price;
+      $price_rule = '<div style="color: red;">#ah-8,st,2#</div>';
+      $price_tag_list = $this->parse_price_tag($price_rule);
+      var_dump($price_tag_list);
     }
 
     /*!
@@ -1009,9 +1009,10 @@ class Information extends CI_Controller
      * @param  string     $price_content 包含价格标签的内容
      * @return string                    可读的价格字符串
      */
-    public function replace_price_tag($price_content)
+    public function parse_price_tag($price_content)
     {
         $price_item_array = $this->price_pregmatch($price_content);
+        $price_tag_list = [];
         if ( ! empty($price_item_array)) {
             foreach ($price_item_array as $price_item) {
                 $price_date = !empty($price_item->price_date) ? $price_item->price_date : date('Y-m-d', time() + 86400 * 7); //当前时间7天后的价格
@@ -1098,7 +1099,12 @@ class Information extends CI_Controller
                 //把金额格式化为带有逗号(,)方便阅读，如 12,345
                 $price_number = is_numeric($price_number) ? number_format($site_money) : $price_number;
                 if (!empty($price_number)) {
-                    $price_content = str_replace($price_item->placeholder, $price_number, $price_content);
+                  $price_tag = [
+                    'placeholder' => $price_item->placeholder,
+                    'price_number' => $price_item->price_number,
+                  ];
+                  $price_tag_list[] = $price_tag;
+                  //$price_content = str_replace($price_item->placeholder, $price_number, $price_content);
                 }
             }
         }
diff --git a/application/models/PrimeLinePrice_model.php b/application/models/PrimeLinePrice_model.php
index b167cb2e..7408a4d7 100644
--- a/application/models/PrimeLinePrice_model.php
+++ b/application/models/PrimeLinePrice_model.php
@@ -93,7 +93,7 @@ class PrimeLinePrice_model extends CI_Model {
         $this->cli_grade ? $sql.=$this->cli_grade : false;
         $this->orderby ? $sql.=$this->orderby : false;
 
-        $query = $this->HT->query($sql,array($DEI_SN,$this->cli_no));
+        $query = $this->HT->query($sql,array($this->$DEI_SN,$this->cli_no));
         if ($this->topnum === 1) {
             if ($query->num_rows() > 0) {
                 $row = $query->row();

From 79192d5628ecd6b040cb79c3cab0217af0e30b33 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Fri, 12 May 2023 10:24:16 +0800
Subject: [PATCH 27/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E6=B5=8B=E8=AF=95=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8SN=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php     | 15 +++++++--------
 application/models/PrimeLinePrice_model.php |  5 +++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index 0870a2a5..d03255c2 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -997,23 +997,23 @@ class Information extends CI_Controller
 
     public function test_price()
     {
-      $price_rule = '<div style="color: red;">#ah-8,st,2#</div>';
+      $price_rule = '<div style="color: red;">#ah-8,st,2#</div><div style="color: red;">#ah-8,st,2#</div>';
       $price_tag_list = $this->parse_price_tag($price_rule);
       var_dump($price_tag_list);
     }
 
     /*!
      * 页面中有价格标签，查出价格并替换内容
-     * @author LYT <lyt@hainatravel.com>
-     * @date   2017-07-14
+     * @author LiaoYijun
+     * @date   2023-05-12
      * @param  string     $price_content 包含价格标签的内容
-     * @return string                    可读的价格字符串
+     * @return array                     包含价格与占位符的数组
      */
     public function parse_price_tag($price_content)
     {
         $price_item_array = $this->price_pregmatch($price_content);
         $price_tag_list = [];
-        if ( ! empty($price_item_array)) {
+        if (!empty($price_item_array)) {
             foreach ($price_item_array as $price_item) {
                 $price_date = !empty($price_item->price_date) ? $price_item->price_date : date('Y-m-d', time() + 86400 * 7); //当前时间7天后的价格
                 $price_number = '';
@@ -1101,14 +1101,13 @@ class Information extends CI_Controller
                 if (!empty($price_number)) {
                   $price_tag = [
                     'placeholder' => $price_item->placeholder,
-                    'price_number' => $price_item->price_number,
+                    'price_number' => $price_number,
                   ];
                   $price_tag_list[] = $price_tag;
-                  //$price_content = str_replace($price_item->placeholder, $price_number, $price_content);
                 }
             }
         }
-        return $price_content;
+        return $price_tag_list;
     }
 
     //使用正则匹配出价格标签，返回一个价格数组
diff --git a/application/models/PrimeLinePrice_model.php b/application/models/PrimeLinePrice_model.php
index 7408a4d7..18fd518b 100644
--- a/application/models/PrimeLinePrice_model.php
+++ b/application/models/PrimeLinePrice_model.php
@@ -25,7 +25,7 @@ class PrimeLinePrice_model extends CI_Model {
         $this->orderby = ' ORDER BY plp.PLP_Level ASC,plp.PLP_IsWeekPrice DESC,plp.PLP_AdultUnitPrice DESC ';
     }
 
-    public function search($cli_no, $topnum = false, $cli_grade = false, $person_size = false, $price_date = false) {
+    public function search($cli_no, $topnum = false, $cli_grade = false, $person_size = false, $price_date = false, $DEI_SN = 28) {
         $this->init();
         $this->cli_no = $cli_no;
         $this->topnum = empty($topnum) ? false : $topnum;
@@ -41,6 +41,7 @@ class PrimeLinePrice_model extends CI_Model {
                             )
                      ";
         }
+        $this->DEI_SN = $DEI_SN;
         return $this->get_list();
     }
 
@@ -93,7 +94,7 @@ class PrimeLinePrice_model extends CI_Model {
         $this->cli_grade ? $sql.=$this->cli_grade : false;
         $this->orderby ? $sql.=$this->orderby : false;
 
-        $query = $this->HT->query($sql,array($this->$DEI_SN,$this->cli_no));
+        $query = $this->HT->query($sql,array($this->DEI_SN,$this->cli_no));
         if ($this->topnum === 1) {
             if ($query->num_rows() > 0) {
                 $row = $query->row();

From c6e902cd26af17add4eaf3082673f615fcecce44 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Fri, 12 May 2023 10:40:58 +0800
Subject: [PATCH 28/28] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/information.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/application/controllers/information.php b/application/controllers/information.php
index d03255c2..4cb4a37f 100644
--- a/application/controllers/information.php
+++ b/application/controllers/information.php
@@ -1544,6 +1544,16 @@ class Information extends CI_Controller
                 true
             );
             $information->ic_content = str_replace('<!--@LANTERN-GP-FORM@-->', $gp_form_content, $information->ic_content);
+
+            $price_tag_list = $this->parse_price_tag($information->ic_content);
+            
+            foreach ($price_tag_list as $price_tag) {
+              $information->ic_content = str_replace(
+                $price_tag['placeholder'],
+                $price_tag['price_number'],
+                $information->ic_content
+              );
+            }
         }
         // why-us 相关的标签
         $why_us_mobile = $this->load->view($template_path . '-why-us-mobile', false, true);