From 0efa22149e2bf07efb5012f0e2fcbc1d73675e13 Mon Sep 17 00:00:00 2001
From: candice <candice@hainatravel.com>
Date: Wed, 6 Dec 2023 15:22:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=80=89=E6=8B=A9=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/orders/tailormade.php | 241 ++++++++++++------------
 1 file changed, 125 insertions(+), 116 deletions(-)

diff --git a/application/views/orders/tailormade.php b/application/views/orders/tailormade.php
index e10a5be8..e8536ef3 100644
--- a/application/views/orders/tailormade.php
+++ b/application/views/orders/tailormade.php
@@ -1453,57 +1453,132 @@ right: 5px;">
 					</div>
 
 					<div id="adultBlock" style="display: none">
-
-						<div class="peopleSelect" style="width: 295px;">
-							<h4>
-								Adults number (≥18 yrs old)
-							</h4>
-							<div class="numberBtn">
-								<input class="minaddBtn reduceadult" id="minusAdult" type="button" value="-">
-								<input class="number" type="text" value="2" id="adultNumber" name="adult">
-								<input class="minaddBtn addadult" id="plusAdult" type="button" value="+">
-							</div>
+                        <h4>
+                            Adults number
+                        </h4>
+                        <div class="peopleSelect" style="width: 270px;">
+							<span class="formMemo">
+								18-40 yrs old
+							</span>
+							<select class="country_code" id="adultNumber_18_40" name="adult_18_40" style="width: 245px;">
+                                <option value="2">2 people</option>
+								<option value="0">0 people</option>
+                                <option value="1">1 person</option>
+                                <option value="2">2 people</option>
+                                <option value="3">3 people</option>
+                                <option value="4">4 people</option>
+                                <option value="5">5 people</option>
+                                <option value="6">6 people</option>
+                                <option value="7">7 people</option>
+                                <option value="8">8 people</option>
+                                <option value="9">9 people</option>
+                                <option value="10">10 people</option>
+                                <option value="11">11 people</option>
+                                <option value="12">12 people</option>
+                                <option value="13">13 people</option>
+                                <option value="14">14 people</option>
+                                <option value="15">15 people</option>
+                                <option value="16">16 people</option>
+                                <option value="17">17 people</option>
+                                <option value="18">18 people</option>
+                                <option value="19">19 people</option>
+                                <option value="20">20 people</option>
+                                <option value="21">21 people</option>
+                                <option value="22">22 people</option>
+                                <option value="23">23 people</option>
+                                <option value="24">24 people</option>
+                                <option value="25">25 people</option>
+                                <option value="26">26 people</option>
+                                <option value="27">27 people</option>
+                                <option value="28">28 people</option>
+                                <option value="29">29 people</option>
+                                <option value="30">30 people</option>
+                                <option value="31">31 or more people</option>
+                                </select>
 						</div>
-						<div class="age_range">
-							<p>
-								Adults' ages
-							</p>
-							<div class="checkYes">
-								<label for="65+">
-									<input type="checkbox" value="yes" name="age_65_plus" id="65+"
-										class="checkBorder">65+
-								</label>
-							</div>
-							<div class="checkYes">
-								<label for="51-64">
-									<input type="checkbox" value="yes" name="age_51_64" id="51-64"
-										class="checkBorder">51-64
-								</label>
-							</div>
-							<div class="checkYes">
-								<label for="41-50">
-									<input type="checkbox" value="yes" name="age_41_50" id="41-50"
-										class="checkBorder">41-50
-								</label>
-							</div>
-							<div class="checkYes">
-								<label for="31-40">
-									<input type="checkbox" value="yes" name="age_31_40" id="31-40"
-										class="checkBorder">31-40
-								</label>
-							</div>
-							<div class="checkYes">
-								<label for="18-30">
-									<input type="checkbox" value="yes" name="age_18_30" id="18-30"
-										class="checkBorder">18-30
-								</label>
-							</div>
+                        <div class="peopleSelect" style="width: 270px;">
+							<span class="formMemo">
+								41-64 yrs old
+							</span>
+                            <select class="country_code" id="adultNumber_41_64" name="adult_41_64" style="width: 245px;">
+                                <option value="0">0 people</option>
+                                <option value="1">1 person</option>
+                                <option value="2">2 people</option>
+                                <option value="3">3 people</option>
+                                <option value="4">4 people</option>
+                                <option value="5">5 people</option>
+                                <option value="6">6 people</option>
+                                <option value="7">7 people</option>
+                                <option value="8">8 people</option>
+                                <option value="9">9 people</option>
+                                <option value="10">10 people</option>
+                                <option value="11">11 people</option>
+                                <option value="12">12 people</option>
+                                <option value="13">13 people</option>
+                                <option value="14">14 people</option>
+                                <option value="15">15 people</option>
+                                <option value="16">16 people</option>
+                                <option value="17">17 people</option>
+                                <option value="18">18 people</option>
+                                <option value="19">19 people</option>
+                                <option value="20">20 people</option>
+                                <option value="21">21 people</option>
+                                <option value="22">22 people</option>
+                                <option value="23">23 people</option>
+                                <option value="24">24 people</option>
+                                <option value="25">25 people</option>
+                                <option value="26">26 people</option>
+                                <option value="27">27 people</option>
+                                <option value="28">28 people</option>
+                                <option value="29">29 people</option>
+                                <option value="30">30 people</option>
+                                <option value="31">31 or more people</option>
+                                </select>
+						</div>
+                        <div class="peopleSelect" style="width: 270px;">
+							<span class="formMemo">
+								65+ yrs old
+							</span>
+							<select class="country_code" id="adultNumber_65_plus" name="adult_65_plus" style="width: 245px;">
+                                <option value="0">0 people</option>
+                                <option value="1">1 person</option>
+                                <option value="2">2 people</option>
+                                <option value="3">3 people</option>
+                                <option value="4">4 people</option>
+                                <option value="5">5 people</option>
+                                <option value="6">6 people</option>
+                                <option value="7">7 people</option>
+                                <option value="8">8 people</option>
+                                <option value="9">9 people</option>
+                                <option value="10">10 people</option>
+                                <option value="11">11 people</option>
+                                <option value="12">12 people</option>
+                                <option value="13">13 people</option>
+                                <option value="14">14 people</option>
+                                <option value="15">15 people</option>
+                                <option value="16">16 people</option>
+                                <option value="17">17 people</option>
+                                <option value="18">18 people</option>
+                                <option value="19">19 people</option>
+                                <option value="20">20 people</option>
+                                <option value="21">21 people</option>
+                                <option value="22">22 people</option>
+                                <option value="23">23 people</option>
+                                <option value="24">24 people</option>
+                                <option value="25">25 people</option>
+                                <option value="26">26 people</option>
+                                <option value="27">27 people</option>
+                                <option value="28">28 people</option>
+                                <option value="29">29 people</option>
+                                <option value="30">30 people</option>
+                                <option value="31">31 or more people</option>
+                                </select>
 						</div>
 					</div>
 					<div class="clear"></div>
 
 					<div id="childrenBlock" style="display: none">
-						<h4>Children number (age of children at time of trip)</h4>
+						<h4>Children number (age at time of trip)</h4>
 						<div class="peopleSelect" style="width: 270px;">
 							<span class="formMemo">
 								10-17 yrs old
@@ -2206,13 +2281,6 @@ $(function () {
 					$adultBlock.show();
 					$childrenBlock.hide();
 				}
-				if (currentTarget.id === 'Couple') {
-					$adultNumberInput.val(2);
-				} else if (currentTarget.id === 'Solo') {
-					$adultNumberInput.val(1);
-				} else if (currentTarget.id === 'Friends') {
-					$adultNumberInput.val(5);
-				}
 				showTrip4(currentTarget.id);
 			})
 		});
@@ -2281,65 +2349,6 @@ $(function () {
 			})
 		});
 
-		var tripLength = $('#tripLengthNumber').val();
-		//成人
-		$('#plusAdult').click(function () {
-			adultNumber++;
-			$adultNumberInput.val(adultNumber);
-		});
-		$('#minusAdult').click(function () {
-			if (adultNumber > 1) {
-				adultNumber--;
-				$adultNumberInput.val(adultNumber);
-			}
-		});
-		// 青少年
-		$('#plusTeenager').click(function () {
-			teenagerNumber++;
-			$teenagerNumberInput.val(teenagerNumber);
-		});
-		$('#minusTeenager').click(function () {
-			if (teenagerNumber > 0) {
-				teenagerNumber--;
-				$teenagerNumberInput.val(teenagerNumber);
-			}
-		});
-		// 儿童
-		$('#plusChildren').click(function () {
-			childrenNumber++;
-			$childrenNumberInput.val(childrenNumber);
-		});
-		$('#minusChildren').click(function () {
-			if (childrenNumber > 0) {
-				childrenNumber--;
-				$childrenNumberInput.val(childrenNumber);
-			}
-		});
-		// 婴儿
-		$('#plusInfant').click(function () {
-			infantNumber++;
-			$infantNumberInput.val(infantNumber);
-		});
-		$('#minusInfant').click(function () {
-			if (infantNumber > 0) {
-				infantNumber--;
-				$infantNumberInput.val(infantNumber);
-			}
-		});
-
-		// Trip Length
-		$('#tripLengthPlus').click(function () {
-			tripLength++;
-			$('#tripLengthNumber').val(tripLength);
-		});
-
-		$('#tripLengthMinus').click(function () {
-			if (tripLength > 1) {
-				tripLength--;
-				$('#tripLengthNumber').val(tripLength);
-			}
-		});
-
 		var tailormade_form = document.getElementById("tailormade_form");
 		//表单验证
 		$('#tmsubmit').click(function () {
@@ -2410,11 +2419,11 @@ $(function () {
 				errorCount++;
 			}
 
-			if (tripLength < 1) {
-				calcScrollTop($('#tripLengthTitle'));
-				$('#trip_length_error_msg').removeClass('hidden');
-				errorCount++;
-			}
+			// if (tripLength < 1) {
+			// 	calcScrollTop($('#tripLengthTitle'));
+			// 	$('#trip_length_error_msg').removeClass('hidden');
+			// 	errorCount++;
+			// }
 
 			//其他需求验证
 			// if (requirementVal == '') {