儿童年龄

pages/hotel/components/search.vue

@@ -226,7 +226,8 @@
 						roomNum: 1,
 						numberOfAdults: 2,
 						numberOfChildren: 0,
-						ChildAgeDetails: null
+						ChildAgeDetails: null,
+						ChildAgeTexts: [],
 					}],
 				},
 				day: 0,

pages/hotel/components/time/date.vue

@@ -68,12 +68,17 @@
                                     @change="(e)=>{ageChange(e,index)}"
                                     style="margin-left: 10rpx;"
                                     ></u-number-box> -->
+                                    <text v-for="(items,indexs) in item.ChildAgeTexts" 
+                                    :key="indexs" @click="eitAge(index,indexs)">
+                                         {{ items }} 岁<template v-if="indexs!=(item.ChildAgeTexts.length-1)">,</template>
+                                    </text>
                                     <uni-section title="" type="line">
-                                        <uni-data-select
-                                            placeholder="请选择年龄"
+                                        <uni-data-select :ref="`select_${index}`"
+                                            placeholder="年龄(多儿童需选多次)"
                                             v-model="item.ChildAgeDetails"
                                             :localdata="TypeList"
                                             :clear="false"
+                                            @change="(e)=>{ageChange(e,index)}"
                                         ></uni-data-select>
                                     </uni-section>
                                     <u-icon name="arrow" :size="32" color="#ccc" style="position: relative;top: -9rpx;"></u-icon>
@@ -116,6 +121,7 @@ export default {
                 peoples: 2,
             },
             TypeList: [],
+            current: -1,
         }
     },
     watch:{
@@ -129,7 +135,7 @@ export default {
         },
     },
     created(){
-        for(let i=1;i<=14;i++){
+        for(let i=1;i<=18;i++){
             this.TypeList.push({
                 text: i+'岁',
                 value: i
@@ -144,7 +150,8 @@ export default {
                         roomNum: e.value,
                         numberOfAdults: 1,
                         numberOfChildren: 0,
-                        ChildAgeDetails: null
+                        ChildAgeDetails: null,
+                        ChildAgeTexts: [],
                     })
                 }
                 if(e.value<this.parameters.rooms){
@@ -154,11 +161,33 @@ export default {
                 this.peopleChange()
             }
         },
+        eitAge(index,indexs){
+            this.current = indexs
+            this.$refs[`select_${index}`][0].toggleSelector();
+        },
         ageChange(e,index){
-            this.parameters.searchroomGroup[index].ChildAgeDetails = e.value;
+            let list = this.parameters.searchroomGroup[index].ChildAgeTexts
+            if(this.current>=0){
+                this.parameters.searchroomGroup[index].ChildAgeTexts[this.current] = e
+                this.current = -1
+            }else{
+                if(list.length==0||list.length<this.parameters.searchroomGroup[index].numberOfChildren){
+                    this.parameters.searchroomGroup[index].ChildAgeTexts.push(e)
+                }else{
+                    this.parameters.searchroomGroup[index].ChildAgeTexts[list.length-1] = e
+                }
+            }
+            
+            this.parameters.searchroomGroup[index].ChildAgeDetails = e;
         },
         etChange(e,index){
             this.parameters.searchroomGroup[index].numberOfChildren = e.value;
+            if(e.value<this.parameters.searchroomGroup[index].ChildAgeTexts.length){
+                let num = this.parameters.searchroomGroup[index].ChildAgeTexts.length-e.value
+                for(let i=0;i<num;i++){
+                    this.parameters.searchroomGroup[index].ChildAgeTexts.splice(i,1)
+                }
+            }
             this.peopleChange()
         },
         crChange(e,index){
@@ -176,6 +205,16 @@ export default {
             })
         },
         chosenDateResult(obj) {
+            for(let i=0;i<this.parameters.searchroomGroup.length;i++){
+                let list = this.parameters.searchroomGroup[i]
+                if(list.numberOfChildren>list.ChildAgeTexts.length){
+                    return uni.showToast({
+                        title: `请选择房间${i+1} 儿童年龄`,
+                        icon: 'none',
+                        duration: 2000
+                    })
+                }
+            }
             this.showTimePopup = false;
             this.$emit('chosenDateResult',this.parameters,obj)
         },

pages/hotel/order.vue

@@ -51,20 +51,22 @@
 							</view> -->
 						</view>
 						<view class="row-sbas-n items-center">
+							<!--
 							<view class="addPnum addPnumL" @click="orderMsg.RoomCount>1?editNum(1):''">
 								<image v-if="orderMsg.RoomCount>1" style="width: 27rpx;height: 27rpx;display: block;"
 									src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638751245939665786.png" />
 								<image v-else style="width: 27rpx;height: 27rpx;display: block;"
 									src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638755711218891689.png" />
-							</view>
+							</view>-->
 							<view class="col row items-center textCenter visaProductTetx">
 								{{orderMsg.RoomCount}}
 								间
 							</view>
+							<!--
 							<view class="addPnum addPnumR" @click="editNum()">
 								<image style="width: 27rpx;height: 27rpx;display: block;"
 									src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638751245974558349.png" />
-							</view>
+							</view>-->
 						</view>
 					</view>
 					<view>
@@ -74,9 +76,9 @@
 							</view>
 							<view class="LastNameBox column val" style="width: 1px;flex: 1;">
 								<view class="row items-center" v-for="(sItem,i) in item.GuestInfo" :key="i">
-									<input type="text" v-model="sItem.LastName" :placeholder="`住客 ${i+1} 姓`" />
-									<input type="text" v-model="sItem.FirstName" :placeholder="`住客 ${i+1} 名`" />
-									<view class="row" style="margin-left:20rpx;">
+									<input type="text" v-model="sItem.LastName" :placeholder="`${sItem.IsAdult?'住客':'儿童'} ${i+1} 姓`" />
+									<input type="text" v-model="sItem.FirstName" :placeholder="`${sItem.IsAdult?'住客':'儿童'} ${i+1} 名`" />
+									<!--<view class="row" style="margin-left:20rpx;">
 										<image v-if="item.GuestInfo.length>1"
 											style="width: 27rpx;height: 27rpx;display: block;"
 											@click="deleteGuest(index,i)"
@@ -86,7 +88,7 @@
 										<image style="width: 27rpx;height: 27rpx;display: block;margin-left:20rpx;"
 											@click="addGuest(index)"
 											src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Upload/Goods/638751245974558349.png" />
-									</view>
+									</view>-->
 								</view>
 							</view>
 						</view>
@@ -415,28 +417,9 @@
 			this.orderMsg.CheckInDate = this.dayObj.start;
 			this.orderMsg.CheckOutDate = this.dayObj.end;
 			this.orderMsg.RoomCount = this.searchObj.rooms
-			this.orderMsg.GuestList = [];
-			this.searchObj.searchroomGroup.forEach((item, index) => {
-				var guestInfoList = [];
-				let allprople = Number(item.numberOfAdults) + Number(item.numberOfChildren)
-				for (let i = 1; i <= allprople; i++) {
-					let obj = {
-						LastName: "",
-						FirstName: "",
-						Age: ""
-					};
-					guestInfoList.push(obj);
-				}
-				console.log(item.ChildAgeDetails,'-------')
-				var obj = {
-					RoomNum: index + 1,
-					numberOfAdults: item.numberOfAdults,
-					numberOfChildren: item.numberOfChildren,
-					ChildAgeDetails: item.ChildAgeDetails != '' ? item.ChildAgeDetails : 1,
-					GuestInfo: guestInfoList
-				};
-				this.orderMsg.GuestList.push(obj);
-			});
+
+			this.getGroupData()
+
 			this.params = {
 				sort: 1,
 				displayFrom: 1,
@@ -457,6 +440,39 @@
 			this.initHotel()
 		},
 		methods: {
+			getGroupData(){
+				this.orderMsg.GuestList = [];
+				this.searchObj.searchroomGroup.forEach((item, index) => {
+					var guestInfoList = [];
+					let allprople = Number(item.numberOfAdults) + Number(item.numberOfChildren)
+					for (let i = 0; i <= Number(item.numberOfAdults)-1; i++) {
+						let obj = {
+							IsAdult: 1,
+							LastName: "",
+							FirstName: "",
+							Age: ""
+						};
+						guestInfoList.push(obj);
+					}
+					for (let i = 0; i <= Number(item.numberOfChildren)-1; i++) {
+						let obj = {
+							IsAdult: 0,
+							LastName: "",
+							FirstName: "",
+							Age: item.ChildAgeTexts[i]
+						};
+						guestInfoList.push(obj);
+					}
+					var obj = {
+						RoomNum: index + 1,
+						numberOfAdults: item.numberOfAdults,
+						numberOfChildren: item.numberOfChildren,
+						ChildAgeDetails: item.ChildAgeDetails != '' ? item.ChildAgeDetails : 1,
+						GuestInfo: guestInfoList
+					};
+					this.orderMsg.GuestList.push(obj);
+				});
+			},
 			getWeek(date) {
 				var weekArray = new Array("日", "一", "二", "三", "四", "五", "六");
 				var week = weekArray[new Date(date).getDay()]; //注意此处必须是先new一个Date