Merge branch 'master' of http://gitlab.oytour.com/luochao/bigwood

src/api/didahotel.ts

@@ -26,6 +26,11 @@ class DidaService {
     return request('dmc_post_GetDidaBedTypeBaseInfo', param, false)
   }
 
+//道旅酒店详情
+static async GetHotelRoomsList(param:any): Promise<HttpResponse> {
+  return request('dmc_post_GetDiDaPriceSearchList', param)
+}
+
   // 道旅酒店列表
   static async GetDidaHotelList(param: any): Promise<HttpResponse> {
     param.reviewRatingUpperLimits = param.reviewRatingUpperLimits && param.reviewRatingUpperLimits != '' ? param.reviewRatingUpperLimits : 0

src/components/scattered/dida/DetailsList.vue

@@ -123,7 +123,7 @@
   import { useI18n } from 'vue-i18n'
   import svgIcon from '../../global/svg-icon.vue'
   import { computed, inject, provide, reactive, ref, toRefs, defineComponent, onMounted, watch } from 'vue'
-  import HotelService from '../../../api/scattered'
+  import DidaService from "../../../api/didahotel";
   import message from '../../../utils/message'
   import { ApiResult } from '../../../@types/enumHelper'
   import { date } from 'quasar'
@@ -189,15 +189,9 @@
       data.childNum = getParamsMsg.childNum?getParamsMsg.childNum:''
       data.room = data.theRooms[search.searchroomGroup.length-1]
 
-      // data.dateRange.to = date.formatDate(date.addToDate(new Date(), { days: 9 }), 'YYYY/MM/DD')
-      // data.dateRange.from = date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY/MM/DD')
-      // data.dateRangeFormat = `${data.dateRange.from} - ${data.dateRange.to}`
-      // search.arrivalDate = data.dateRange.from
-      // search.departureDate = data.dateRange.to
-
-      data.dateRange.to = search.arrivalDate
-      data.dateRange.from = search.departureDate
-      data.dateRangeFormat = `${search.arrivalDate} - ${search.departureDate}`
+      data.dateRange.to = search.CheckInDate
+      data.dateRange.from = search.CheckOutDate
+      data.dateRangeFormat = `${search.CheckInDate} - ${search.CheckOutDate}`
 
       data.RoomTypeList = useHotel.getHotelRoomType()
       data.scatteredRoomTypeList = useHotel.getHotelScatRoom()
@@ -297,7 +291,7 @@
         initHotel() {
           data.loading = true
           let param = Object.assign(search)
-          HotelService.GetHotelRoomsList(param)
+          DidaService.GetHotelRoomsList(param)
             .then(r => {
               data.SimilarList = [] as Array<any>
               if (r.data.resultCode == ApiResult.SUCCESS) {
@@ -370,10 +364,10 @@
             search.childNum = data.childNum;
         },
         dateRangeHandler(e: any) {
-          search.arrivalDate = `${e.from.year}/${e.from.month}/${e.from.day}`
-          if(search.arrivalDate!=`${e.to.year}/${e.to.month}/${e.to.day}`){
-            search.departureDate = `${e.to.year}/${e.to.month}/${e.to.day}`
-            data.dateRangeFormat = `${search.arrivalDate} - ${search.departureDate} `
+          search.CheckInDate = `${e.from.year}/${e.from.month}/${e.from.day}`
+          if(search.CheckInDate!=`${e.to.year}/${e.to.month}/${e.to.day}`){
+            search.CheckOutDate = `${e.to.year}/${e.to.month}/${e.to.day}`
+            data.dateRangeFormat = `${search.CheckInDate} - ${search.CheckOutDate} `
             if (qDateProxy.value) qDateProxy.value.hide()
           }else{
             // message.errorMsg(`${t('v101.scatteredDetails.timeTis')}`)