s

src/components/Hotel/HotelList.vue

@@ -736,7 +736,7 @@ export default {
             Id:1,
             isCked:false
         },{
-            name:'双床',
+            name:'双人间',
             Id:2,
             isCked:false
         },{
@@ -748,7 +748,7 @@ export default {
             Id:4,
             isCked:false
         },{
-            name:'四床房',
+            name:'四人间',
             Id:5,
             isCked:false
         },{
@@ -756,7 +756,7 @@ export default {
             Id:6,
             isCked:false
         },{
-            name:'日式&西式混合房间',
+            name:'日式+西式混合',
             Id:7,
             isCked:false
       }],

src/components/Hotel/HotelSure.vue

@@ -352,15 +352,14 @@
                         <li class="HS2_title">房型信息</li>
                         <li>
                             <div v-if="dataList.roomRateDetails">
-                                <template v-if="dataList.roomRateDetails.roomType==1">单人</template>
-                                <template v-if="dataList.roomRateDetails.roomType==2">双人</template>
-                                <template v-if="dataList.roomRateDetails.roomType==3">双</template>
-                                <template v-if="dataList.roomRateDetails.roomType==4">三件套</template>
-                                <template v-if="dataList.roomRateDetails.roomType==5">4床</template>
-                                <template v-if="dataList.roomRateDetails.roomType==6">日式房间</template>
-                                <template v-if="dataList.roomRateDetails.roomType==7">和洋室</template>
-                                <template v-if="dataList.roomRateDetails.roomType==8">半开房</template>
-                                <template v-if="dataList.roomRateDetails.roomType==9">其他的</template>
+                                <template v-if="dataList.roomRateDetails.roomType==1">{{getGradeType(dataList.roomRateDetails.gradeType)}}单人间</template>
+                                <template v-if="dataList.roomRateDetails.roomType==2">{{getGradeType(dataList.roomRateDetails.gradeType)}}双人间</template>
+                                <template v-if="dataList.roomRateDetails.roomType==3">{{getGradeType(dataList.roomRateDetails.gradeType)}}大床房</template>
+                                <template v-if="dataList.roomRateDetails.roomType==4">{{getGradeType(dataList.roomRateDetails.gradeType)}}三人间</template>
+                                <template v-if="dataList.roomRateDetails.roomType==5">{{getGradeType(dataList.roomRateDetails.gradeType)}}四人间</template>
+                                <template v-if="dataList.roomRateDetails.roomType==6">{{getGradeType(dataList.roomRateDetails.gradeType)}}日式房</template>
+                                <template v-if="dataList.roomRateDetails.roomType==7">{{getGradeType(dataList.roomRateDetails.gradeType)}}日式+西式混合</template>
+                                <template v-if="dataList.roomRateDetails.roomType==8">{{getGradeType(dataList.roomRateDetails.gradeType)}}大床房（小型）</template>
                             </div>
                         </li>
                     </ul>
@@ -550,15 +549,14 @@
                     <li>
                         <span class="C9">房型</span>
                         <span v-if="dataList.roomRateDetails">
-                            <template v-if="dataList.roomRateDetails.roomType==1">单人</template>
-                            <template v-if="dataList.roomRateDetails.roomType==2">双人</template>
-                            <template v-if="dataList.roomRateDetails.roomType==3">双</template>
-                            <template v-if="dataList.roomRateDetails.roomType==4">三件套</template>
-                            <template v-if="dataList.roomRateDetails.roomType==5">4床</template>
-                            <template v-if="dataList.roomRateDetails.roomType==6">日式房间</template>
-                            <template v-if="dataList.roomRateDetails.roomType==7">和洋室</template>
-                            <template v-if="dataList.roomRateDetails.roomType==8">半开双</template>
-                            <template v-if="dataList.roomRateDetails.roomType==9">其他的</template>
+                            <template v-if="dataList.roomRateDetails.roomType==1">{{getGradeType(dataList.roomRateDetails.gradeType)}}单人间</template>
+                            <template v-if="dataList.roomRateDetails.roomType==2">{{getGradeType(dataList.roomRateDetails.gradeType)}}双人间</template>
+                            <template v-if="dataList.roomRateDetails.roomType==3">{{getGradeType(dataList.roomRateDetails.gradeType)}}大床房</template>
+                            <template v-if="dataList.roomRateDetails.roomType==4">{{getGradeType(dataList.roomRateDetails.gradeType)}}三人间</template>
+                            <template v-if="dataList.roomRateDetails.roomType==5">{{getGradeType(dataList.roomRateDetails.gradeType)}}四人间</template>
+                            <template v-if="dataList.roomRateDetails.roomType==6">{{getGradeType(dataList.roomRateDetails.gradeType)}}日式房</template>
+                            <template v-if="dataList.roomRateDetails.roomType==7">{{getGradeType(dataList.roomRateDetails.gradeType)}}日式+西式混合</template>
+                            <template v-if="dataList.roomRateDetails.roomType==8">{{getGradeType(dataList.roomRateDetails.gradeType)}}大床房（小型）</template>
                         </span>
                     </li>
                     <!-- <li>
@@ -574,7 +572,7 @@
                     <li v-if="dataList.roomRateDetails&&dataList.roomRateDetails.smoking!=''">
                         <span class="C9">吸烟</span>
                         <span v-if="dataList.roomRateDetails">
-                            <template v-if="dataList.roomRateDetails.smoking==0">禁吸</template>
+                            <template v-if="dataList.roomRateDetails.smoking==0">禁烟</template>
                             <template v-if="dataList.roomRateDetails.smoking==1">可吸烟</template>
                         </span>
                     </li>
@@ -588,7 +586,7 @@
                     <li>
                         <span class="C9">露天客房</span>
                         <span v-if="dataList.roomRateDetails">
-                            <template v-if="dataList.roomRateDetails.withOpenAirBath==0">没有</template>
+                            <template v-if="dataList.roomRateDetails.withOpenAirBath==0">无</template>
                             <template v-if="dataList.roomRateDetails.withOpenAirBath==1">有</template>
                         </span>
                     </li>
@@ -800,6 +798,31 @@ export default {
     }
   },
   methods: {
+        //获取房型
+      getGradeType(type){
+        let gradeType=''
+        switch(parseInt(type)){
+            case 1:
+                gradeType="标准"
+                break;
+            case 2:
+                gradeType="普通"
+                break;
+            case 3:
+                gradeType="经济"
+                break;
+            case 4:
+                gradeType="精品"
+                break;
+            case 5:
+                gradeType="豪华"
+                break;
+            case 6:
+                gradeType="套房"
+                break;
+        }
+        return gradeType;
+      },
       //获取带过来信息
       getBookInfo(){
         this.apipost("dmc_post_Get_GetJAPAN_RoomsList",this.msg,res => {
@@ -1023,7 +1046,14 @@ export default {
                     path:"/HotelPayBefore",
                 })
             } else {
-                this.Error(res.data.message);
+                var that = this
+                if(res.data.message=='Room rate(s) for 1 day(s) changed'){
+                    that.Confirm("当前酒店价格已发生变化，需要重新加载?", function() {
+                        that.getBookInfo();
+                    });
+                }else{
+                    that.Error(res.data.message);
+                }
             }
             },
             err => {}

src/components/newPersonalCenter/block/model/HotelOrder.vue

@@ -202,10 +202,10 @@ export default {
     //取消
     canCelHotel(ThirdOrderNo){
         let userInfo = this.getLocalStorage();
-        let EmployeeId = userInfo.EmployeeId;
+        let customerId = userInfo.customerId;
         let msg ={
             bookingNumber:ThirdOrderNo,
-            CancelBy:EmployeeId,
+            CancelBy:customerId,
             CancelType:2
         }
         this.apipost(

src/components/newPersonalCenter/block/model/OpHotelOrderDetail.vue

@@ -345,15 +345,14 @@
                         <li class="HS2_title">房型信息</li>
                         <li>
                             <div>
-                                <template v-if="details.parmResult.roomType==1">单人</template>
-                                <template v-if="details.parmResult.roomType==2">双人</template>
-                                <template v-if="details.parmResult.roomType==3">双</template>
-                                <template v-if="details.parmResult.roomType==4">三人间</template>
-                                <template v-if="details.parmResult.roomType==5">4床</template>
-                                <template v-if="details.parmResult.roomType==6">日式房间</template>
-                                <template v-if="details.parmResult.roomType==7">和洋室</template>
-                                <template v-if="details.parmResult.roomType==8">半开房</template>
-                                <template v-if="details.parmResult.roomType==9">其他的</template>
+                                <template v-if="details.parmResult.roomType==1">{{getGradeType(details.parmResult.gradeType)}}单人间</template>
+                                <template v-if="details.parmResult.roomType==2">{{getGradeType(details.parmResult.gradeType)}}双人间</template>
+                                <template v-if="details.parmResult.roomType==3">{{getGradeType(details.parmResult.gradeType)}}大床房</template>
+                                <template v-if="details.parmResult.roomType==4">{{getGradeType(details.parmResult.gradeType)}}三人间</template>
+                                <template v-if="details.parmResult.roomType==5">{{getGradeType(details.parmResult.gradeType)}}四人间</template>
+                                <template v-if="details.parmResult.roomType==6">{{getGradeType(details.parmResult.gradeType)}}日式房</template>
+                                <template v-if="details.parmResult.roomType==7">{{getGradeType(details.parmResult.gradeType)}}日式+西式混合房</template>
+                                <template v-if="details.parmResult.roomType==8">{{getGradeType(details.parmResult.gradeType)}}大床房（小型）</template>
                             </div>
                         </li>
                     </ul>
@@ -461,7 +460,31 @@ export default {
     })
   },
   methods: {
-    
+     //获取房型
+      getGradeType(type){
+        let gradeType=''
+        switch(parseInt(type)){
+            case 1:
+                gradeType="标准"
+                break;
+            case 2:
+                gradeType="普通"
+                break;
+            case 3:
+                gradeType="经济"
+                break;
+            case 4:
+                gradeType="精品"
+                break;
+            case 5:
+                gradeType="豪华"
+                break;
+            case 6:
+                gradeType="套房"
+                break;
+        }
+        return gradeType;
+      }
   }
 };
 </script>