Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/Hotel/HotelList.vue

@@ -364,6 +364,10 @@
     .HL_Two .icon-img-rili{
         margin-left:0!important;
     }
+    .HL_TitleSpan:hover{
+        text-decoration: underline;
+        cursor: pointer;
+    }
 </style>
 
 <template>
@@ -581,7 +585,7 @@
                                     </div>
                                     <div class="HL_ListContent">
                                         <div class="HL_ListTitle">
-                                            {{item.hotelName}}
+                                            <span class="HL_TitleSpan" @click="goHotelDetail(item,'HotelDetail')">{{item.hotelName}}</span>
                                             <span v-if="item.reviewRating">
                                                 <el-rate
                                                     v-model="item.reviewRating"
@@ -609,7 +613,7 @@
                                         <div class="HL_ListPrice">
                                             <span><label>¥</label>{{getPrice(item.lowrateBySetCurrency)}}</span>起
                                         </div>
-                                        <input type="button" class="HL_ListBtn" @click="goHotelDetail(item)" value="查看详情"/>
+                                        <input type="button" class="HL_ListBtn" @click="goHotelDetail(item,'HotelDetail')" value="查看详情"/>
                                     </div>
                                 </div>
                             </td>
@@ -737,7 +741,7 @@ export default {
             Id:1,
             isCked:false
         },{
-            name:'双床',
+            name:'双人间',
             Id:2,
             isCked:false
         },{
@@ -749,7 +753,7 @@ export default {
             Id:4,
             isCked:false
         },{
-            name:'四床房',
+            name:'四人间',
             Id:5,
             isCked:false
         },{
@@ -757,7 +761,7 @@ export default {
             Id:6,
             isCked:false
         },{
-            name:'日式&西式混合房间',
+            name:'日式+西式混合',
             Id:7,
             isCked:false
       }],
@@ -1089,7 +1093,7 @@ export default {
         this.SearchHotel();
     },
     //跳转详情
-    goHotelDetail(item){
+    goHotelDetail(item,path){
       this.PassMsg.hotelId = item.hotelId,
       this.PassMsg.arrivalDate=this.msg.arrivalDate;
       this.PassMsg.departureDate = this.msg.departureDate;
@@ -1099,9 +1103,13 @@ export default {
       this.PassMsg.room = this.room
       this.PassMsg.auditNum = this.auditNum;
       sessionStorage.setItem("HotelDetail", JSON.stringify(this.PassMsg));
-      this.$router.push({
-          path:"/HotelDetail"
-      })
+    //   this.$router.push({
+    //       path:"/HotelDetail"
+    //   })
+     let routeData = this.$router.resolve({
+        name: path,
+     });
+     window.open(routeData.href, "_blank");
     },
     //主题特色
     getTravelFeature(feature){

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

@@ -166,6 +166,8 @@ export default {
             this.totalCount = res.data.data.pageCount;
             this.Count = res.data.data.count;
             this.orderLoading = false;
+
+            console.log(res,'resss');
           } else {
             this.Error(res.data.message);
           }
@@ -202,10 +204,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>