From ce77eeeffa42e771b1cfd78a6b708b6b9f8a9d93 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Wed, 15 Apr 2020 14:40:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/views/orders/inquiry.php          | 96 +++++++++++++++++--
 application/views/orders/inquiry_mobile.php   | 79 +++++++++++++--
 application/views/orders/tailormade.php       | 15 ++-
 application/views/orders/tailormademobile.php | 30 ++----
 css/inquiry-pc.css                            |  2 +-
 5 files changed, 175 insertions(+), 47 deletions(-)

diff --git a/application/views/orders/inquiry.php b/application/views/orders/inquiry.php
index bdea52ab..86d7e0ea 100644
--- a/application/views/orders/inquiry.php
+++ b/application/views/orders/inquiry.php
@@ -129,8 +129,8 @@
 			<div class="clear">
 			</div>
 			<div class="selectionBlock">
-				<h3>
-					Your hotel preference *
+				<h3 id="hotelselect">
+					Your hotel preference * <span id="hotel_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please select an option.)</span>
 				</h3>
 				<span class="formNote">
 					Hotels prices in Japan are at least doubled based on the suggested rates
@@ -167,8 +167,8 @@
 				</div>
 			</div>
 			<div class="selectionBlock">
-				<h3>
-					Number in your group *
+				<h3 id="numberselect">
+					Number in your group * <span id="number_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 				</h3>
 				<div class="peopleSelect">
 					<span class="formMemo">
@@ -194,8 +194,8 @@
 				</div>
 			</div>
 			<div class="selectionBlock">
-				<h3>
-					Your date of arrival *
+				<h3 id="dateselect">
+					Your date of arrival * <span id="date_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 				</h3>
 				<input type="text" class="arrivalDate datepicker hidden-xs" id="Date_Start"
 				name="Date_Start" value="" placeholder="mm/dd/yyyy" autocomplete="off">
@@ -336,12 +336,14 @@
 						</label>
 					</div>
 			</div>
+			<span id="name_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 			<div class="inputTerm">
 				<input type="text" name="name" required>
 				<label>
 					Full Name *
 				</label>
 			</div>
+			<span id="email_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 			<div class="inputTerm">
 				<input type="email" name="email" required>
 				<label>
@@ -351,8 +353,9 @@
 			<div class="formMemo">
 				All your ticket issues will be sent to your mailbox.
 			</div>
+			<span id="nation_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 			<div class="inputTerm">
-				<input type="text" name="nationality" required>
+				<input type="text" name="Nationality" required>
 				<label>
 					Nationality / Region *
 				</label>
@@ -376,7 +379,7 @@
 			<div class="clear">
 			</div>
 			<div class="inquiryBtn">
-				<input type="submit" value="Start My Journey">
+				<button id="tmsubmit" href="javascript:;">Start My Journey</button>
 			</div>
 			<input type="hidden" name="url" value="<?php echo $orderfrom;?>" />
 			<input type="hidden" name="cli_sn" value="<?php echo $this->input->get_post('cli_sn');?>" />
@@ -438,5 +441,82 @@ $(function(){
 		
 		$('.destination').html(destinantionstr);
 	});
+	
+	//表单验证
+	$('#tmsubmit').click(function(){
+		var adultnumber = $('input[name="adultnumber"]').val();
+		var hotel = $('input[name="hotel"]:checked').val();
+		var name = $('input[name="name"]').val();
+		var email = $('input[name="email"]').val();
+		var Nationality = $('input[name="Nationality"]').val();
+		var date = $('input[name="Date_Start"]').val();
+		
+		//酒店选择
+		if(hotel === undefined){
+			$("body,html").animate({
+                scrollTop: $('#hotelselect').offset().top - 70
+            });
+			$('#hotel_error_msg').removeClass('hidden');
+			setTimeout(function(){
+				$('#hotel_error_msg').addClass('hidden');
+			},5000);
+			return false;
+		}
+		
+		//人数选择
+		if(adultnumber < 1){
+			$("body,html").animate({
+                scrollTop: $('#numberselect').offset().top - 70
+            });
+			$('#number_error_msg').removeClass('hidden');
+			setTimeout(function(){
+				$('#number_error_msg').addClass('hidden');
+			},5000);
+			return false;
+		}
+		
+		//时间选择
+		if(date == ''){
+			$("body,html").animate({
+                scrollTop: $('#dateselect').offset().top - 70
+            });
+			$('#date_error_msg').removeClass('hidden');
+			setTimeout(function(){
+				$('#date_error_msg').addClass('hidden');
+			},5000);
+			return false;
+		}
+		
+		//姓名验证
+		if(name == ''){
+			$('input[name="name"]').focus();
+			$('#name_error_msg').removeClass('hidden');
+			setTimeout(function(){
+				$('#name_error_msg').addClass('hidden');
+			},5000);
+			return false;
+		}
+		
+		//邮箱验证
+		if(email == ''){
+			$('input[name="email"]').focus();
+			$('#email_error_msg').removeClass('hidden');
+			setTimeout(function(){
+				$('#email_error_msg').addClass('hidden');
+			},5000);
+			return false;
+		}
+		
+		//国籍验证
+		if(Nationality == ''){
+			$('input[name="Nationality"]').focus();
+			$('#nation_error_msg').removeClass('hidden');
+			setTimeout(function(){
+				$('#nation_error_msg').addClass('hidden');
+			},5000);
+			return false;
+		}
+		
+	});
 });
 </script>
\ No newline at end of file
diff --git a/application/views/orders/inquiry_mobile.php b/application/views/orders/inquiry_mobile.php
index c2444745..158d10a4 100644
--- a/application/views/orders/inquiry_mobile.php
+++ b/application/views/orders/inquiry_mobile.php
@@ -58,8 +58,8 @@
 			<div class="clear">
 			</div>
 			<div class="selectionBlock">
-				<h3>
-					Your hotel preference *
+				<h3 id="hotelselect">
+					Your hotel preference * <span id="hotel_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please select an option.  )</span>
 				</h3>
 				<span class="formNote">
 					Hotels prices in Japan are at least doubled based on the suggested rates
@@ -100,8 +100,8 @@
 					</div>
 			</div>
 			<div class="selectionBlock">
-				<h3>
-					Number in your group *
+				<h3 id="numberselect">
+					Number in your group * <span id="number_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please fill out this field.   )</span>
 				</h3>
 				<div class="peopleSelect">
 					<span class="formMemo">
@@ -267,12 +267,14 @@
 						</label>
 					</div>
 			</div>
+			<span id="name_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 			<div class="inputTerm">
 				<input type="text" name="name" required>
 				<label>
 					Full Name *
 				</label>
 			</div>
+			<span id="email_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 			<div class="inputTerm">
 				<input type="email" name="email" required>
 				<label>
@@ -282,8 +284,9 @@
 			<span class="formMemo">
 				Your trip advisor will talk with you via email first.
 			</span>
+			<span id="nation_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 			<div class="inputTerm">
-				<input type="text" name="nationality" required>
+				<input type="text" name="Nationality" required>
 				<label>
 					Nationality *
 				</label>
@@ -305,7 +308,7 @@
 				</label>
 			</div>
 			<div class="inquiryBtn">
-				<input type="submit" value="Start My Journey">
+				<button id="tmsubmit" href="javascript:;">Start My Journey</button>
 			</div>
 			<input type="hidden" name="url" value="<?php echo $orderfrom;?>" />
 			<input type="hidden" name="ic_title" value="<?php echo $ic_title;?>" />
@@ -372,5 +375,69 @@ $(function(){
 		
 		$('.destination').html(destinantionstr);
 	});
+	
+	//表单验证
+	$('#tmsubmit').click(function(){
+		var adultnumber = $('input[name="adultnumber"]').val();
+		var hotel = $('input[name="hotel"]:checked').val();
+		var name = $('input[name="name"]').val();
+		var email = $('input[name="email"]').val();
+		var Nationality = $('input[name="Nationality"]').val();
+		
+		//酒店选择
+		if(hotel === undefined){
+			$("body,html").animate({
+                scrollTop: $('#hotelselect').offset().top - 70
+            });
+			$('#hotel_error_msg').removeClass('hidden');
+			setTimeout(function(){
+				$('#hotel_error_msg').addClass('hidden');
+			},5000);
+			return false;
+		}
+		
+		//人数选择
+		if(adultnumber < 1){
+			$("body,html").animate({
+                scrollTop: $('#numberselect').offset().top - 70
+            });
+			$('#number_error_msg').removeClass('hidden');
+			setTimeout(function(){
+				$('#number_error_msg').addClass('hidden');
+			},5000);
+			return false;
+		}
+		
+		//姓名验证
+		if(name == ''){
+			$('input[name="name"]').focus();
+			$('#name_error_msg').removeClass('hidden');
+			setTimeout(function(){
+				$('#name_error_msg').addClass('hidden');
+			},5000);
+			return false;
+		}
+		
+		//邮箱验证
+		if(email == ''){
+			$('input[name="email"]').focus();
+			$('#email_error_msg').removeClass('hidden');
+			setTimeout(function(){
+				$('#email_error_msg').addClass('hidden');
+			},5000);
+			return false;
+		}
+		
+		//国籍验证
+		if(Nationality == ''){
+			$('input[name="Nationality"]').focus();
+			$('#nation_error_msg').removeClass('hidden');
+			setTimeout(function(){
+				$('#nation_error_msg').addClass('hidden');
+			},5000);
+			return false;
+		}
+		
+	});
 });
 </script>
\ No newline at end of file
diff --git a/application/views/orders/tailormade.php b/application/views/orders/tailormade.php
index 6da89a2f..f85d589b 100644
--- a/application/views/orders/tailormade.php
+++ b/application/views/orders/tailormade.php
@@ -175,7 +175,7 @@
 			</div>
 			<div class="selectionBlock">
 				<h3 id="hotelselect">
-					Your hotel preference * <span id="hotel_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please select an option.  )</span>
+					Your hotel preference * <span id="hotel_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please select an option.)</span>
 				</h3>
 				<span class="formNote">
 					Hotels prices in Japan are at least doubled based on the suggested rates
@@ -214,7 +214,7 @@
 			</div>
 			<div class="selectionBlock">
 				<h3 id="numberselect">
-					Number in your group * <span id="number_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please fill out this field.   )</span>
+					Number in your group * <span id="number_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 				</h3>
 				<div class="peopleSelect">
 					<span class="formMemo">
@@ -241,7 +241,7 @@
 			</div>
 			<div class="selectionBlock">
 				<h3 id="dateselect">
-					Your date of arrival * <span id="date_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please fill out this field.   )</span>
+					Your date of arrival * <span id="date_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 				</h3>
 				<input type="text" class="arrivalDate datepicker hidden-xs" id="Date_Start"
 				name="Date_Start" value="" placeholder="mm/dd/yyyy" autocomplete="off" />
@@ -385,14 +385,14 @@
 					</div>
 				</form>
 			</div>
-			<span id="name_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please fill out this field.   )</span>
+			<span id="name_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 			<div class="inputTerm">
 				<input type="text" name="name" required /> 
 				<label>
 					Full Name *
 				</label>
 			</div>
-			<span id="email_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please fill out this field.   )</span>
+			<span id="email_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 			<div class="inputTerm">
 				<input type="email" name="email" required />
 				<label>
@@ -402,7 +402,7 @@
 			<div class="formMemo">
 				All your ticket issues will be sent to your mailbox.
 			</div>
-			<span id="nation_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please fill out this field.   )</span>
+			<span id="nation_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 			<div class="inputTerm">
 				<input type="text" name="Nationality" required />
 				<label>
@@ -529,7 +529,6 @@ $(function(){
 		
 		//姓名验证
 		if(name == ''){
-			console.log('123');
 			$('input[name="name"]').focus();
 			$('#name_error_msg').removeClass('hidden');
 			setTimeout(function(){
@@ -540,7 +539,6 @@ $(function(){
 		
 		//邮箱验证
 		if(email == ''){
-			console.log('123');
 			$('input[name="email"]').focus();
 			$('#email_error_msg').removeClass('hidden');
 			setTimeout(function(){
@@ -551,7 +549,6 @@ $(function(){
 		
 		//国籍验证
 		if(Nationality == ''){
-			console.log('123');
 			$('input[name="Nationality"]').focus();
 			$('#nation_error_msg').removeClass('hidden');
 			setTimeout(function(){
diff --git a/application/views/orders/tailormademobile.php b/application/views/orders/tailormademobile.php
index 349062d3..1e7415be 100644
--- a/application/views/orders/tailormademobile.php
+++ b/application/views/orders/tailormademobile.php
@@ -34,7 +34,7 @@
 		</div>
 		<div class="selectionBlock">
 			<h3 id="hotelselect">
-				Your hotel preference * <span id="hotel_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please select an option.  )</span>
+				Your hotel preference * <span id="hotel_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please select an option.)</span>
 			</h3>
 			<span class="formNote">
 				Hotels prices in Japan are at least doubled based on the suggested rates
@@ -78,7 +78,7 @@
 			<h3 id="numberselect">
 				Number in your group * 
 			</h3>
-			<span id="number_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please fill in this field.   )</span>
+			<span id="number_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill in this field.)</span>
 			<div class="peopleSelect">
 				<span class="formMemo">
 					Adults (≥12 years old)
@@ -102,8 +102,8 @@
 			</div>
 		</div>
 		<div class="selectionBlock">
-			<h3 id="dateselect">
-				Your date of arrival * <span id="date_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please fill out this field.   )</span>
+			<h3>
+				Your date of arrival *
 			</h3>
 			<input type="date" class="arrivalDate visible-xs" id="Date_Start" name="Date_Start_Mobile"
 			value="<?php echo date('Y-m-d',time() + 24*3600*7)?>" min="<?php echo date('Y-m-d',time() + 24*3600*7)?>" placeholder="mm/dd/yyyy" autocomplete="off" />
@@ -244,14 +244,14 @@
 					</label>
 				</div>
 		</div>
-		<span id="name_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please fill out this field.   )</span>
+		<span id="name_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 		<div class="inputTerm">
 			<input type="text" name="name" required>
 			<label>
 				Full Name *
 			</label>
 		</div>
-		<span id="email_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please fill out this field.   )</span>
+		<span id="email_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 		<div class="inputTerm">
 			<input type="email" name="email" required>
 			<label>
@@ -261,7 +261,7 @@
 		<span class="formMemo">
 			Your trip advisor will talk with you via email first.
 		</span>
-		<span id="nation_error_msg" style="color:#a31022;font-size:18px;" class="hidden">( Please fill out this field.   )</span>
+		<span id="nation_error_msg" style="color:#a31022;font-size:18px;" class="hidden">(Please fill out this field.)</span>
 		<div class="inputTerm">
 			<input type="text" name="Nationality" required>
 			<label>
@@ -360,7 +360,6 @@ $(function(){
 		var name = $('input[name="name"]').val();
 		var email = $('input[name="email"]').val();
 		var Nationality = $('input[name="Nationality"]').val();
-		var date = $('input[name="Date_Start"]').val();
 		
 		//目的地选择
 		if(destinations === false){
@@ -388,7 +387,6 @@ $(function(){
 		
 		//人数选择
 		if(adultnumber < 1){
-			console.log('123');
 			$("body,html").animate({
                 scrollTop: $('#numberselect').offset().top - 70
             });
@@ -399,21 +397,8 @@ $(function(){
 			return false;
 		}
 		
-		//时间选择
-		if(date == ''){
-			$("body,html").animate({
-                scrollTop: $('#dateselect').offset().top - 70
-            });
-			$('#date_error_msg').removeClass('hidden');
-			setTimeout(function(){
-				$('#date_error_msg').addClass('hidden');
-			},5000);
-			return false;
-		}
-		
 		//姓名验证
 		if(name == ''){
-			console.log('123');
 			$('input[name="name"]').focus();
 			$('#name_error_msg').removeClass('hidden');
 			setTimeout(function(){
@@ -424,7 +409,6 @@ $(function(){
 		
 		//邮箱验证
 		if(email == ''){
-			console.log('123');
 			$('input[name="email"]').focus();
 			$('#email_error_msg').removeClass('hidden');
 			setTimeout(function(){
diff --git a/css/inquiry-pc.css b/css/inquiry-pc.css
index ac1ec948..fe081a21 100644
--- a/css/inquiry-pc.css
+++ b/css/inquiry-pc.css
@@ -193,7 +193,7 @@ input[type=checkbox]:checked+label{color: #000}
 .chooseothers{font-size: 18px;color: #000;display: block;margin-top: 10px }
 
 .inquiryBtn{display:block;text-align:center;font-family:Georgia,"Times New Roman",Times,serif;font-size:24px}
-input[type=submit]{background: linear-gradient(#ca3c3b,#ad1818);
+button{background: linear-gradient(#ca3c3b,#ad1818);
   text-align: center;
   display: table;
   border-radius: 60px;