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

src/components/Hotel/DiDa/HotelSure.vue

@@ -480,13 +480,11 @@
           }}</span>
               </span>
             </div>
-
             <div class="q-pt-xs col q-px-lg q-mb-md8" style="width:50%;">
               <span class="text-grey-6 q-pr-lg"> <i style="color:#c0c4cc;" class="text-grey-13 q-mr-xs el-icon-phone"
                   name="place" size="xs"></i>
                 <span class="col fz14 text-weight-bold text-blick text-grey-6">{{  $route.query.tel }}</span>
               </span>
-
             </div>
           </div>
         </div>
@@ -510,7 +508,6 @@
               </div>
             </div>
           </div>
-
           <div style="padding-bottom: 8px;">
             <div style="display: flex;">
               <div class="q-pt-xs col q-px-lg q-mb-md8" style="width:50%;">
@@ -779,6 +776,7 @@
           guestRequest: "",
           hotelId: '',
           roomType: 0,
+          RoomName:"",//房型名称
         },
         auditNum: 0,
         childNum: 0,
@@ -866,6 +864,7 @@
             this.sureMsg.totalRoomCount = this.params.searchroomGroup.length;
             this.sureMsg.RoomCount = this.params.searchroomGroup.length;
             this.sureMsg.CheckOutDate = this.params.CheckOutDate;
+            this.sureMsg.RoomName= this.roomRateDetails.RatePlanList[0].RoomName_CN;
             if (this.roomRateDetails && this.roomRateDetails.RatePlanList && this.roomRateDetails.RatePlanList
               .length > 0) {
               this.sureMsg.roomType = this.roomRateDetails.RatePlanList[0].BedType;
@@ -1007,8 +1006,8 @@
           "dmc_post_GetDiDaPriceConfirm",
           this.params,
           res => {
-            console.log("dmc_post_GetDiDaPriceConfirm",res.data);
             this.loading = false;
+            console.log("GetDiDaPriceConfirm",res.data);
             if (res.data.resultCode == 1) {
               this.dataList = res.data.data.PriceDetails;
               this.roomRateDetails = res.data.data.PriceDetails.HotelList[0];

src/components/TravelManager/TravelList/OpHotelOrderDetail.vue

@@ -473,7 +473,8 @@
                 <template v-for="(item,index) in details.parmResultRoomInfo.GuestList">
                   <el-row :key="`dp_`+index">
                     <el-col>
-                      房间 {{item.RoomNum}}: <template v-for="(subItem,subIndex) in item.GuestInfo">
+                      房间 {{item.RoomNum}}: 
+                        <template v-for="(subItem,subIndex) in item.GuestInfo">
                         {{subItem.LastName}} {{subItem.FirstName}}
                         <template v-if="subItem.Age&&subItem.Age!=''">
                           年龄：{{subItem.Age}}
@@ -534,7 +535,7 @@
         </div>
       </div>
       <div class="HS_RightTopImg">
-        <template v-if="details">
+        <template v-if="details&&details.model&&details.model.HotelPic&&details.model.HotelPic!=''">
           <img :src="details.model.HotelPic" alt="" />
         </template>
       </div>