From c605d1e366e68aba4c58ad1ffe59f21bc9c336a9 Mon Sep 17 00:00:00 2001
From: cyc <cyc@hainatravel.com>
Date: Wed, 15 Apr 2020 14:13:56 +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/tailormade.php       | 22 ++++++++++++++-----
 application/views/orders/tailormademobile.php | 19 +++++++++++++---
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/application/views/orders/tailormade.php b/application/views/orders/tailormade.php
index 082d6dd5..6da89a2f 100644
--- a/application/views/orders/tailormade.php
+++ b/application/views/orders/tailormade.php
@@ -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 in 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">
@@ -240,11 +240,11 @@
 				</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" required />
+				name="Date_Start" value="" placeholder="mm/dd/yyyy" autocomplete="off" />
 				<div class="checkYes">
 					<input type="checkbox" class="checkBorder" name="flexible" value="No">
 					<label for="dateLimit">
@@ -477,6 +477,7 @@ $(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){
@@ -504,7 +505,6 @@ $(function(){
 		
 		//人数选择
 		if(adultnumber < 1){
-			console.log('123');
 			$("body,html").animate({
                 scrollTop: $('#numberselect').offset().top - 70
             });
@@ -515,6 +515,18 @@ $(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');
diff --git a/application/views/orders/tailormademobile.php b/application/views/orders/tailormademobile.php
index 27e0c471..349062d3 100644
--- a/application/views/orders/tailormademobile.php
+++ b/application/views/orders/tailormademobile.php
@@ -102,11 +102,11 @@
 			</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="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" required />
+			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" />
 			<div class="checkYes">
 				<input type="checkbox" class="checkBorder" id="dateLimit" name="time">
 				<label for="dateLimit" class="checkBlock">
@@ -360,6 +360,7 @@ $(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){
@@ -398,6 +399,18 @@ $(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');