修改酒店

src/components/Hotel/HotelDetail.vue

@@ -144,7 +144,7 @@
         border-radius: 4px;
     }
     .HD_fuhe{
-        width:1167px;
+        width:100%;
         padding:0 17px;
         height:30px;
         color:#fff;
@@ -375,7 +375,7 @@
         top:1px;
     }
     .HD_Top_Right_Star{
-        width:262px;
+        width:100%;
         height:122px;
         padding:0 20px;
         border:1px solid #DDDDDD;
@@ -1248,12 +1248,12 @@ export default {
         this.Error("请选择退房日期");
         return;
       }
+      this.SimilarList=[];
       this.apipost(
         "dmc_post_Get_GetJAPAN_RoomsList",
         this.SimilarMsg,
         res => {
           if (res.data.resultCode == 1) {
-            this.SimilarList=[];
             if (
               Object.prototype.toString.call(res.data.data.roomRateDetails) ==
               "[object Object]"

src/components/Hotel/HotelSure.vue

@@ -181,7 +181,7 @@
         height:100%;
     }
     .HS_HotelRight{
-        width:346px;
+        width:100%;
         height:257px;
         padding:17px 20px 20px 20px;
         border:1px solid #E0E0E0;
@@ -234,7 +234,7 @@
         border:1px solid #E0E0E0;
     }
     .HS_RitTop{
-        width:348px;
+        width:100%;
         /* height:72px; */
         background-color: #EDF4FF;
         padding:10px 20px;
@@ -395,6 +395,7 @@
                                 size="small"
                                 value-format="yyyy-MM-dd"
                                 type="date" 
+                                :picker-options="pickerBeginDateBefore"
                                 placeholder="">
                             </el-date-picker>
                             <template v-if="dataList.roomRateDetails">
@@ -406,6 +407,7 @@
                                 size="small"
                                 value-format="yyyy-MM-dd"
                                 type="date" 
+                                :picker-options="pickerBeginDateAfter"
                                 placeholder="">
                             </el-date-picker>
                             <template v-if="dataList.roomRateDetails">
@@ -460,6 +462,7 @@
                             <div class="HS_fangfei" v-for="subItem in item.rateGroup">
                                 <div class="HS_fangfei_Top">{{subItem.stayDate}}</div>
                                 <div v-if="subItem.perAdultRateBySetCurrency">¥<span>{{subItem.perAdultRateBySetCurrency}}/人</span></div>
+                                <div v-else="subItem.totalPerRoomRateBySetCurrency">¥<span>{{subItem.totalPerRoomRateBySetCurrency}}/晚</span></div>
                             </div>
                         </li>
                     </ul>
@@ -837,6 +840,22 @@ export default {
       //选了的儿童数
       chekedChildCount:0,
       isBaoChild:false,
+      pickerBeginDateBefore: {
+        disabledDate: time => {
+        if (this.msg.departureDate == null) {
+                return false;
+            } else {
+                let endTime = new Date(this.msg.departureDate)
+                return endTime.getTime() < time.getTime()
+            }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: time => {
+            let startTime = new Date(this.msg.arrivalDate)
+            return startTime.getTime() >= time.getTime()
+        }
+      },
 
         CouponList:[],
         UserCanUseCouponList:[],
@@ -1102,6 +1121,9 @@ export default {
                     if(this.TotalChildCount<this.chekedChildCount){
                         this.isBaoChild=true;
                     }
+                    //无价格 只有房间价格
+                    let onlyRoomPrice=0;
+                    let onlyJanpnase=0;
                     x.rateGroup.forEach(z=>{
                         if(z.perAdultRateBySetCurrency){
                             z.oldAuditPrice = z.perAdultRateBySetCurrency;
@@ -1123,16 +1145,21 @@ export default {
                                 ChildJapanPrice+=parseFloat(z.perChildRate);
                             }
                         }
+                        if(z.totalPerRoomRateBySetCurrency){
+                            z.totalPerRoomRateBySetCurrency = Math.ceil(z.totalPerRoomRateBySetCurrency/this.dataList.JapanIncrease);
+
+                            onlyRoomPrice+=parseFloat(z.totalPerRoomRateBySetCurrency);
+                            onlyJanpnase+=parseFloat(z.totalPerRoomRate);
+                        }
                     })
                     AdultCount+=AdultTotalPrice*x.roomAdultCount;
                     childCount+=childToTalPrice*x.roomChildCount;
                     // AdultCount+=AdultTotalPrice;
                     // childCount+=childToTalPrice;
-
                     oldAount+=oldAuditPrice;
                     childAount+=childAount;
-                    this.sureMsg.totalChargeableRateInfo += parseFloat(AdultCount+childCount);
-                    this.sureMsg.OldTotalPrice+=parseFloat(oldAount+childAount);
+                    this.sureMsg.totalChargeableRateInfo += parseFloat(AdultCount+childCount+onlyRoomPrice);
+                    this.sureMsg.OldTotalPrice+=parseFloat(oldAount+childAount+onlyRoomPrice);
                     AdultJapanCount+=AdultJapanPrice*x.roomAdultCount;
                     childJapanCount+=ChildJapanPrice*x.roomChildCount;
                     this.SettlementPrice=this.sureMsg.totalChargeableRateInfo;
@@ -1142,7 +1169,7 @@ export default {
                     // AdultJapanCount+=AdultJapanPrice;
                     // childJapanCount+=ChildJapanPrice;
 
-                    this.sureMsg.totalPriceJapanese += parseFloat(AdultJapanCount+childJapanCount);
+                    this.sureMsg.totalPriceJapanese += parseFloat(AdultJapanCount+childJapanCount+onlyJanpnase);
                     if (this.isShowTime) {
                         this.getUserCanUseCouponList();
                     }