1

src/components/scattered/dida/DetailsList.vue

@@ -70,7 +70,7 @@
             <div class="col q-ml-lg q-pt-lg q-pb-md q-pr-md" >
               <div class="col q-pt-sm" :class="{'row items-center no-wrap': $q.platform.is.desktop,'common': $q.platform.is.mobile}">
                 <div class="absolute text-white q-px-lg" style="left: 25%;top: 0;border-bottom-right-radius: 10px;"
-                :class="item.BreakfastType==2?'HD_Black':'HD_Green'">{{item.BreakfastType==1?"含早":"不含早"}}</div>
+                :class="item.BreakfastType==2?'HD_Black':'HD_Green'">{{item.BreakfastType==1?"不含早":"含早"}}</div>
                
                 <div class="col-3" :class="{'q-pl-lg':$q.platform.is.desktop}"  v-if="$q.platform.is.desktop">{{item.RatePlanName}}</div>
 
@@ -152,6 +152,7 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate";
         childrenList: [] as Array<Number>,//儿童下拉
         isShowPop: false,//房间
         SimilarList: [] as Array<any>,
+        AllSimilarList: [] as Array<any>,
         RoomTypeList: [] as Array<HotelArea>,//房间等级
         HotelRoomTypes: [] as Array<HotelArea>,//散客房间类型
         ScatMeaList: [] as Array<HotelArea>//散客房间餐型
@@ -165,9 +166,8 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate";
       for(let i=0;i<6;i++){
         data.childrenList.push(i)
       }
-
       data.scrollStyle = useScrollModule().scrollStyle
-      const search = inject(DirtionmaryHelper.HOTEL_QUERY_PARAM) as any
+      const search = inject(DirtionmaryHelper.DiDaHOTEL_QUERY_PARAM) as any
       if(search.searchroomGroup&&search.searchroomGroup.length==0){
         search.searchroomGroup.push({
           roomNum: 1,
@@ -233,36 +233,26 @@ import { HotelArea, useHotel } from "../../../utils/hotelRate";
           }
         });
       },
+
         initHotel() {
           data.loading = true
-         
           let param = Object.assign(search)
           DidaService.GetHotelRoomsList(param)
             .then(r => {
               data.SimilarList = [] as Array<any>
-                console.log("道旅酒店详情",r.data.data.PriceDetails.HotelList);
+                data.AllSimilarList = [] as Array<any>
+                console.log("道旅酒店详情",r.data.data.HotelList);
+                context.emit('getPriceDetails',r.data.data.HotelList[0].LowestPrice)
               if (r.data.resultCode == ApiResult.SUCCESS) {
                 if (
-                  Object.prototype.toString.call(r.data.data.PriceDetails.HotelList[0].RatePlanList) ==
+                  Object.prototype.toString.call(r.data.data.HotelList[0].RatePlanList) ==
                   "[object Object]"
                 ) {
-                  data.SimilarList.push(r.data.data.PriceDetails.HotelList[0].RatePlanList);
+                  data.SimilarList.push(r.data.data.HotelList[0].RatePlanList);
                 } else {
-                  data.SimilarList = r.data.data.PriceDetails.HotelList[0].RatePlanList;
+                  data.SimilarList = r.data.data.HotelList[0].RatePlanList;
                 }
-
                  console.log(" 道旅data.SimilarList", data.SimilarList);
-                data.SimilarList.forEach(x => {
-                  if (
-                    Object.prototype.toString.call(x.roomOptions) ==
-                    "[object Object]"
-                  ) {
-                    let arr = [];
-                    arr.push(x.roomOptions);
-                    x.roomOptions = arr;
-                  }
-                });
-                data.JapanIncrease = r.data.data.JapanIncrease;
               }
               data.loading = false
             }).catch(e => {

src/pages/scattered/didaDetails.vue

@@ -9,8 +9,8 @@
             <div class="text-weight-bold fz20 ellipsis desktop-only">{{ hotelSummary.Name_CN }}</div>
             <div :class="{'q-pt-sm':$q.platform.is.mobile}">
               <span class=" text-orange text-weight-bold fz18" :class="{'q-pl-lg':$q.platform.is.desktop}">
-                CNY
-                {{hotelSummary.Name_CN}}
+                {{LowPriceInfo.Currency}}
+                {{LowPriceInfo.Value}}
               </span>
               <span class="text-grey-8 q-pl-xs">/{{$t('v101.scattered.qi')}}</span>
             </div>
@@ -62,7 +62,7 @@
               </GoogleMap>
             </div>
           </div>
-          <DetailsList @goUrl="goUrl"></DetailsList>
+          <DetailsList @goUrl="goUrl" @getPriceDetails="getPriceDetails"></DetailsList>
           <div class="bg-light-blue-1 q-pa-md fz14 rounded-borders">
             <div class="text-weight-bold">{{ $t('v101.scatteredDetails.jiudianxinxi') }}</div>
             <!-- <div class="text-grey-8 q-mt-sm">{{ h.Descriptions }}</div> -->
@@ -217,7 +217,8 @@ import DidaService from 'src/api/didahotel'
         HotSpring: [] as Array<String>,//洗漱用品是否免费
         bathRoom: [],
         ServicesList: [] as Array<HotelArea>,//设施与服务
-        Services: [] as Array<String>
+        Services: [] as Array<String>,
+          LowPriceInfo:{} as any
       })
       data.InterList = useHotel.getHotelInter()
       data.HotSpringList = useHotel.getHotelSpring()
@@ -227,7 +228,6 @@ import DidaService from 'src/api/didahotel'
   
       data.scrollStyle = useScrollModule().scrollStyle
       data.getParamsMsg = JSON.parse(localStorage.getItem(DirtionmaryHelper.SCATTERED_DiDaHOTEL_DATE))
-    console.log("111",localStorage.getItem(DirtionmaryHelper.SCATTERED_DiDaHOTEL_DATE));
       data.urlParamsMsg = currentRouter.currentRoute.value.params
       const search = reactive({
         hotelId: data.urlParamsMsg.hotelId,
@@ -238,8 +238,12 @@ import DidaService from 'src/api/didahotel'
         roomOptionCd: "",
         searchroomGroup: data.getParamsMsg.searchroomGroup,//客房数
       })
-      provide(DirtionmaryHelper.HOTEL_QUERY_PARAM, search)
+      provide(DirtionmaryHelper.DiDaHOTEL_QUERY_PARAM, search)
       const methods = {
+        getPriceDetails(priceDetails: any) {
+          data.LowPriceInfo=priceDetails;
+          console.log('***priceDetails: ', priceDetails)
+        },
         goUrl(url:stringify,dataObj:{}){
           localStorage.removeItem(DirtionmaryHelper.SCATTERED_HOTEL_ORDER)
           let d = {
@@ -253,10 +257,8 @@ import DidaService from 'src/api/didahotel'
           }
           localStorage.setItem(DirtionmaryHelper.SCATTERED_HOTEL_ORDER,JSON.stringify(d))
           window.open(url, '_blank')
-          // $router.push({ path:url })
         },
         initMap(lat: any, lng: any) {
-          console.log("我是地图，我来了",lat);
           let country=localStorage.getItem(DirtionmaryHelper.USER_IN_COUNTRY) ?? 'GW'
           if(country!='CN'){
             data.center = { lat: parseFloat(lng), lng: parseFloat(lat) }