1

src/api/didahotel.ts

@@ -37,7 +37,7 @@ static async GetHotelRoomsList(param:any): Promise<HttpResponse> {
     param.reviewRatingLowerLimits = param.reviewRatingLowerLimits && param.reviewRatingLowerLimits != '' ? param.reviewRatingLowerLimits : 0
     param.searchMaxRate = param.searchMaxRate && param.searchMaxRate != '' ? param.searchMaxRate : 0
     param.searchMinRate = param.searchMinRate && param.searchMinRate != '' ? param.searchMinRate : 0
-    return request('dmc_post_GetDiDaHotelPageList', param, false)
+    return request('dmc_post_GetDiDaLowPriceSearchList', param, false)
   }
 }
 

src/components/scattered/dida/DetailsList.vue

@@ -119,19 +119,15 @@
   </template>
   
   <script lang="ts">
-  import { useRouter } from 'vue-router'
-  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 DidaService from "../../../api/didahotel";
-  import message from '../../../utils/message'
-  import { ApiResult } from '../../../@types/enumHelper'
-  import { date } from 'quasar'
-  import { HotelRate,HotelArea, useHotel } from '../../../utils/hotelRate'
-  import { useQuasar } from 'quasar'
-  import useScrollModule from '../../../module/scrollbar/scrollModule'
-  import { DirtionmaryHelper } from '../../../config/dictionary'
-  import { moneyFormat } from '../../../utils/tools'
+import { useRouter } from "vue-router";
+import HotelService from "../../../api/scattered";
+import { DirtionmaryHelper } from "../../../config/dictionary";
+import message from "../../../utils/message";
+import { defineComponent, inject, reactive, toRefs, watch } from "vue";
+import { date, useQuasar } from "quasar";
+import { useI18n } from "vue-i18n";
+import DidaService from "../../../api/didahotel";
+import { HotelArea, useHotel } from "../../../utils/hotelRate";
   export default defineComponent({
     components: { svgIcon },
     props:[''],
@@ -294,6 +290,7 @@
           DidaService.GetHotelRoomsList(param)
             .then(r => {
               data.SimilarList = [] as Array<any>
+                console.log("道旅酒店详情",r.data);
               if (r.data.resultCode == ApiResult.SUCCESS) {
                 if (
                   Object.prototype.toString.call(r.data.data.roomRateDetails) ==

src/components/scattered/dida/DidaHeader.vue

@@ -243,25 +243,9 @@
               </q-popup-proxy>
             </q-btn>
           </div>
-          <div class="q-my-md">
-         <!--HotelLiveRates -->
-            <q-select
-              v-model="search.searchHotelCategory"
-              dense
-              :options="HotelDidaPropertyCategory"
-              emit-value
-              option-label="Description_CN"
-              option-value="ID"
-              clearable
-              multiple
-              map-options
-              :label="$t('v101.scattered.zhusutype')"
-              standout
-            />
-          </div>
           <div class="q-my-md row items-center">
             <q-input
-              v-model="search.QStartPrice"
+              v-model="search.MinPrice"
               class="col q-mr-md"
               mask="#.##"
               reverse-fill-mask
@@ -271,7 +255,7 @@
               :label="$t('hotel.minPrice')"
             />
             <q-input
-              v-model="search.QEndStartPrice"
+              v-model="search.MaxPrice"
               class="col"
               dense
               mask="#.##"
@@ -283,14 +267,13 @@
           </div>
           <div class="q-my-md">
             <q-select
-              v-model="search.searchRoomType"
+              v-model="search.BedTypeID"
               dense
               :options="HotelRoomTypes"
               emit-value
               option-label="Name_CN"
               option-value="ID"
               clearable
-              multiple
               map-options
               :label="$t('v101.scattered.fangxingtype')"
               standout
@@ -298,14 +281,13 @@
           </div>
           <div class="q-my-md">
             <q-select
-              v-model="search.searchMealType"
+              v-model="search.BreakfastTypeID"
               dense
               :options="HotelMealTypes"
               emit-value
               option-label="Name_CN"
               option-value="ID"
               clearable
-              multiple
               map-options
               :label="$t('v101.scattered.canxingtype')"
               standout
@@ -313,7 +295,7 @@
           </div>
           <div class="q-my-md row items-center">
             <q-input
-              v-model="search.QStarRating"
+              v-model="search.MinStarRating"
               class="col q-mr-md"
               mask="#.##"
               reverse-fill-mask
@@ -323,7 +305,7 @@
               :label="$t('v101.scattered.minxingji')"
             />
             <q-input
-              v-model="search.QEndStarRating"
+              v-model="search.MaxStarRating"
               class="col"
               dense
               mask="#.##"
@@ -432,8 +414,8 @@ export default defineComponent({
       "YYYY/MM/DD"
     );
     data.dateRangeFormat = `${data.dateRange.from} - ${data.dateRange.to}`;
-    search.arrivalDate = data.dateRange.from;
-    search.departureDate = data.dateRange.to;
+    search.CheckInDate = data.dateRange.from;
+    search.CheckOutDate = data.dateRange.to;
     data.hotelsRates = useHotel.getHotelRate();
     data.HotelMealTypes = useHotel.getHotelMeal();
     data.HotelConceptTypes = useHotel.getHotelConcept();
@@ -482,9 +464,9 @@ export default defineComponent({
         search.childNum = data.childNum;
       },
       dateRangeHandler(e: any) {
-        search.arrivalDate = `${e.from.year}/${e.from.month}/${e.from.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}`;
+        search.CheckOutDate = `${e.to.year}/${e.to.month}/${e.to.day} `;
+        data.dateRangeFormat = `${search.CheckInDate} - ${search.CheckOutDate} `;
         if (qDateProxy.value) qDateProxy.value.hide();
       },
       optionsFn(cd: any) {
@@ -505,15 +487,6 @@ export default defineComponent({
         //先不缓存
         //localStorage.setItem(DirtionmaryHelper.SCATTERED_HOTEL_DATE, JSON.stringify(d));
       },
-      //获取道旅房型
-      getdidaPropertyCategory() {
-        DidaService.GetDidaPropertyCategory({}).then((res) => {
-          console.log("GetDidaPropertyCategory", res);
-          if ((res.data.resultCode = 1)) {
-            data.HotelDidaPropertyCategory = res.data.data;
-          }
-        });
-      },
       //获取道旅餐食类型
       getdidaMealType() {
         DidaService.GetDidaMealType({}).then((res) => {
@@ -565,40 +538,17 @@ export default defineComponent({
         if (search.searchroomGroup.length > 0) setCnt++;
       }
       if (data.keyWords) setCnt++;
-      if (search.QEndStarRating) setCnt++;
-      if (search.QStarRating) setCnt++;
-      if (search.searchHotelCategory && search.searchHotelCategory.length > 0) setCnt++;
-      if (search.searchHotelFeatures && search.searchHotelFeatures.length > 0) setCnt++;
+      if (search.MaxStarRating) setCnt++;
+      if (search.MinStarRating) setCnt++;
       if (search.searchRoomType && search.searchRoomType.length > 0) setCnt++;
       if (search.searchMealType && search.searchMealType.length > 0) setCnt++;
-      if (search.QStartPrice) setCnt++;
-      if (search.QEndStartPrice) setCnt++;
+      if (search.MinPrice) setCnt++;
+      if (search.MaxPrice) setCnt++;
       search.Name_CN = data.keyWords;
-      // if (data.keyWords == "") {
-      //   search.freewordType = 1;
-      //   search.Name_CN = data.placeKeyWords;
-      // } else {
-      //   search.freewordType = 2;
-      //   search.Name_CN = data.keyWords;
-      // }
       return setCnt;
     });
-    watch(search, (n, o) => {
-      methods.setData();
-    });
-    watch(data.room, (n, o) => {
-      methods.setData();
-    });
-    watch(data.auditNum, (n, o) => {
-      methods.setData();
-    });
-    watch(data.childNum, (n, o) => {
-      methods.setData();
-    });
-
     onMounted(() => {
       methods.getdidaCity();
-      methods.getdidaPropertyCategory();
       methods.getdidaBedType();
       methods.getdidaMealType();
       methods.setData();