1

src/components/scattered/dida/DetailsList.vue

@@ -55,6 +55,9 @@
                 <div class="q-my-md">
                   <q-select v-model="item.numberOfChildren" dense :options="childrenList" emit-value map-options :label="$t('v101.scattered.ertong')" standout @update:model-value="setPeopleNum"/>
                 </div>
+                  <div class="q-my-md">
+                  <q-select v-model="item.ChildAgeDetails" dense :options="childrenAgeList" emit-value map-options :label="$t('v101.scattered.ertongage')" standout />
+                </div>
               </div>
             </q-card>
           </q-popup-proxy>
@@ -180,12 +183,12 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate";
         childNum:  null as any,
         adultList: [] as Array<Number>,//成人下拉
         childrenList: [] as Array<Number>,//儿童下拉
+        childrenAgeList: [] as Array<Number>,//儿童年龄下拉
         isShowPop: false,//房间
         SimilarList: [] as Array<any>,
         RoomTypeList: [] as Array<HotelArea>,//房间等级
         HotelRoomTypes: [] as Array<HotelArea>,//散客房间类型
-        ScatMeaList: [] as Array<HotelArea>,//散客房间餐型
-        HotelMealTypes: [] as Array<HotelRate>, //餐型
+        ScatMeaList: [] as Array<HotelArea>//散客房间餐型
       })
       for(let i=1;i<11;i++){
         data.theRooms.push(i)
@@ -196,8 +199,12 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate";
       for(let i=0;i<6;i++){
         data.childrenList.push(i)
       }
+      for(let i=1;i<13;i++){
+        data.childrenAgeList.push(i)
+      }
       data.scrollStyle = useScrollModule().scrollStyle
       const search = inject(DirtionmaryHelper.DiDaHOTEL_QUERY_PARAM) as any
+       console.log("search",search.searchroomGroup);
       if(search.searchroomGroup&&search.searchroomGroup.length==0){
         search.searchroomGroup.push({
           roomNum: 1,
@@ -207,10 +214,9 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate";
       }
 
       let getParamsMsg = JSON.parse(localStorage.getItem(DirtionmaryHelper.SCATTERED_DiDaHOTEL_DATE))
-      data.auditNum = getParamsMsg.auditNum
-      data.childNum = getParamsMsg.childNum?getParamsMsg.childNum:''
-      data.room = 1//data.theRooms[search.searchroomGroup.length-1]
-
+      data.auditNum = 1
+      data.childNum =0
+      data.room = 1
       data.dateRange.to = search.CheckInDate
       data.dateRange.from = search.CheckOutDate
       data.dateRangeFormat = `${search.CheckInDate} - ${search.CheckOutDate}`
@@ -254,6 +260,10 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate";
         let d = {
           CheckInDate: search.CheckInDate,
           CheckOutDate: search.CheckOutDate,
+          searchroomGroup: search.searchroomGroup,
+          room: data.room,
+          auditNum: data.auditNum,
+          childNum: data.childNum,
         };
        // 先不缓存
         localStorage.setItem(DirtionmaryHelper.SCATTERED_DiDaHOTEL_DATE, JSON.stringify(d));
@@ -316,11 +326,14 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate";
 
         //设置房间里面成人数改变总成人数和儿童数
         setPeopleNum() {
-            data.auditNum = 0;
+             data.auditNum = 0;
             data.childNum = 0;
             search.searchroomGroup.forEach(x => {
                 data.auditNum += x.numberOfAdults;
                 data.childNum += x.numberOfChildren;
+                if(x.numberOfChildren==0){
+                x.ChildAgeDetails="";
+                }
             })
             if (data.auditNum == null || data.auditNum == undefined) {
                 data.auditNum = 1
@@ -328,16 +341,20 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate";
             if (data.childNum == null || data.childNum == undefined) {
                 data.childNum = 1
             }
+           
         },
         //房间数改变
         getRoomList(roomNum) {
+          data.auditNum = 0;
+            data.childNum = 0;
             let length = search.searchroomGroup.length
             if(roomNum>length){
               for (let i = 1; i <= roomNum-length; i++) {
                 let obj = {
                     roomNum: i,
                     numberOfAdults: 1,
-                    numberOfChildren: 0
+                    numberOfChildren: 0,
+                    ChildAgeDetails:""
                 }
                 search.searchroomGroup.push(obj);
               }

src/i18n/ja-RB/index.ts

@@ -534,6 +534,7 @@ export default {
       kefang: '客室です',
       chengren: '大人です',
       ertong: '子供です',
+      ertongage:'子供の年齢',
       pingfen: '採点です',
       minpingfen: '最低評価です',
       maxpingfen: '最高評価です',

src/i18n/ko-HG/index.ts

@@ -534,6 +534,7 @@ export default {
       kefang: '객실이요',
       chengren: '어른',
       ertong: '어린이들입니다',
+      ertongage:'어린이 나이',
       pingfen: '평점',
       minpingfen: '최저 평점',
       maxpingfen: '최고 평점',

src/i18n/zh-SW/index.ts

@@ -534,6 +534,7 @@ export default {
       kefang: '客房',
       chengren: '成人',
       ertong: '儿童',
+      ertongage: '儿童年龄',
       pingfen: '评分',
       minpingfen: '最低评分',
       maxpingfen: '最高评分',

src/i18n/zh-TW/index.ts

@@ -535,6 +535,7 @@ export default {
       kefang: '客房',
       chengren: '成人',
       ertong: '兒童',
+      ertongage:'兒童年齡',
       pingfen: '評分',
       minpingfen: '最低評分',
       maxpingfen: '最高評分',

src/pages/scattered/didaDetails.vue

@@ -228,7 +228,7 @@ import DidaService from 'src/api/didahotel'
   
       data.scrollStyle = useScrollModule().scrollStyle
       data.getParamsMsg = JSON.parse(localStorage.getItem(DirtionmaryHelper.SCATTERED_DiDaHOTEL_DATE))
-      data.urlParamsMsg = currentRouter.currentRoute.value.params
+      data.urlParamsMsg = currentRouter.currentRoute._value.params
       const search = reactive({
         hotelId: data.urlParamsMsg.hotelId,
         sort: 1,
@@ -236,7 +236,7 @@ import DidaService from 'src/api/didahotel'
         CheckInDate: data.getParamsMsg.CheckInDate,//入住时间
         CheckOutDate: data.getParamsMsg.CheckOutDate,//离房时间
         roomOptionCd: "",
-        searchroomGroup: data.getParamsMsg.searchroomGroup,//客房数
+        searchroomGroup: [] as Array<ang>,//客房数
       })
       provide(DirtionmaryHelper.DiDaHOTEL_QUERY_PARAM, search)
       const methods = {