修改

src/components/Hotel/HotelDetail.vue

@@ -474,7 +474,7 @@
                 <div class="HD_Top_Price">
                     <span class="HD_Top_Pinfo"><i>¥</i>{{price}}</span>
                     <span class="HD_Top_qi">/起</span>
-                    <span>另付税：¥177</span>
+                    <!-- <span>另付税：¥177</span> -->
                     <input type="button" class="HD_SureBtn" style="display:none;" value="立即预订"/>
                 </div>
                 <div class="HD_Top_ImgList clearfix">
@@ -621,12 +621,12 @@
                                 <img :src="item.roomImageURL" alt=""/>
                             </div>
                             <div class="HD_Kefang">
-                                <span v-if="item.gradeType==1">标准间</span>
-                                <span v-if="item.gradeType==2">普通间</span>
-                                <span v-if="item.gradeType==3">经济间</span>
-                                <span v-if="item.gradeType==4">舒适间</span>
-                                <span v-if="item.gradeType==5">豪华间</span>
-                                <span v-if="item.gradeType==6">其他</span>
+                                <!-- <span v-if="item.gradeType==1">标准</span>
+                                <span v-if="item.gradeType==2">主力</span>
+                                <span v-if="item.gradeType==3">经济学家</span>
+                                <span v-if="item.gradeType==4">苏佩里</span>
+                                <span v-if="item.gradeType==5">豪华裤</span>
+                                <span v-if="item.gradeType==6">特别房间、套房、远离</span> -->
 
                                 <span v-if="item.roomType==1">单人</span>
                                 <span v-if="item.roomType==2">双人</span>
@@ -1146,6 +1146,7 @@ export default {
                         x.roomOptions = arr;
                     }
                 })
+                console.log(this.SimilarList,'SimilarList');
             } else {
                 this.Error(res.data.message);
             }

src/components/Hotel/HotelList.vue

@@ -230,11 +230,12 @@
         background-color: #DBF1DF;
         color:#4E9F5D;
         font-size:12px;
-        margin:20px 10px 20px 0;
+        margin:20px 10px 0 0;
     }
     .HL_ListAddress{
         font-size:12px;
         color:#333333;
+        margin-top:20px;
     }
     .HL_ListPrice{
         position: absolute;
@@ -605,9 +606,7 @@
                                             </span>
                                         </div>
                                         <div>
-                                            <span class="HL_ListSpecial">明日可定</span>
-                                            <span class="HL_ListSpecial">亲子游</span>
-                                            <span class="HL_ListSpecial">主题乐园</span>
+                                            <span v-for="subItem in getTravelFeature(item.hotelFeaturesMask)" class="HL_ListSpecial">{{subItem}}</span>
                                         </div>
                                         <div class="HL_ListAddress">
                                             <img src="../../assets/img/hotel/address.png" alt=""/>
@@ -1063,7 +1062,24 @@ export default {
       this.$router.push({
           path:"/HotelDetail"
       })
-
+    },
+    //主题特色
+    getTravelFeature(feature){
+        let fea = feature.split(',');
+        let newArr=[];
+        if(fea[0]==1){
+           newArr.push('从车站步行5分钟');
+        }
+        if(fea[1]==1){
+            newArr.push('有温泉');
+        }
+        if(fea[2]==1){
+            newArr.push('离海滩5分钟');
+        }
+        if(fea[3]==1){
+            newArr.push('退房11点以后');
+        }
+        return newArr;
     }
   }
 };

src/components/Hotel/HotelSure.vue

@@ -551,7 +551,7 @@
                 <div class="HS_RitTop">
                     <span class="HS_RitTop_Left">订单总额</span>
                     <span class="HS_RitPrice">
-                        <i>¥</i>{{totalPrice}}
+                        <i>¥</i>{{sureMsg.totalChargeableRateInfo}}
                     </span>
                 </div>
                 <!-- <div class="HS_RitBottom">
@@ -599,6 +599,7 @@ export default {
           departureDate:'',
           roomOptionCd:'',
           totalChargeableRateInfo:'',
+          totalPriceJapanese:'',
           roomGroup:[],
           guestLastName:'',
           guestFirstName:'',
@@ -704,8 +705,6 @@ export default {
             num:20
       },],
       dataList:[],
-      //总价
-      totalPrice:0,
     };
   },
   mounted() {
@@ -750,6 +749,8 @@ export default {
                     arr.push(this.dataList.roomGroup);
                     this.dataList.roomGroup=arr;
                 }
+                this.sureMsg.totalChargeableRateInfo=0;
+                this.sureMsg.totalPriceJapanese=0;
                 this.dataList.roomGroup.forEach(x=>{
                     if(Object.prototype.toString.call(x.rateGroup) == '[object Object]'){
                         let arr = [];
@@ -757,12 +758,18 @@ export default {
                         x.rateGroup= arr;
                     }
                     let tt = 0;
+                    let tt2 = 0;
                     x.rateGroup.forEach(z=>{
+                        if(z.perAdultRateBySetCurrency){
+                            tt+=parseFloat(z.perAdultRateBySetCurrency);
+                        }
                         if(z.perAdultRate){
-                            tt+=parseFloat(z.perAdultRate);
+                            tt2+=parseFloat(z.perAdultRate);
                         }
+
                     })
-                    this.totalPrice+=tt*x.roomAdultCount;
+                    this.sureMsg.totalChargeableRateInfo+=tt*x.roomAdultCount;
+                    this.sureMsg.totalPriceJapanese+=tt2*x.roomAdultCount;
                 })
 
             } else {
@@ -774,8 +781,54 @@ export default {
       },
     //通过日期得到周几
     getWeek(){
-      this.checkInWeek = new Date(this.msg.arrivalDate).getDay();
-      this.checkOutWeek = new Date(this.msg.departureDate).getDay();
+      let arrivalDate = new Date(this.msg.arrivalDate).getDay();
+      let departureDate = new Date(this.msg.departureDate).getDay();
+      switch(arrivalDate){
+          case 0:
+          this.checkInWeek="日"
+          break;
+          case 1:
+          this.checkInWeek="一"
+          break;
+          case 2:
+          this.checkInWeek="二"
+          break;
+          case 3:
+          this.checkInWeek="三"
+          break;
+          case 4:
+          this.checkInWeek="四"
+          break;
+          case 5:
+          this.checkInWeek="五"
+          break;
+          case 6:
+          this.checkInWeek="六"
+          break;
+      }
+      switch(departureDate){
+          case 0:
+          this.checkOutWeek="日"
+          break;
+          case 1:
+          this.checkOutWeek="一"
+          break;
+          case 2:
+          this.checkOutWeek="二"
+          break;
+          case 3:
+          this.checkOutWeek="三"
+          break;
+          case 4:
+          this.checkOutWeek="四"
+          break;
+          case 5:
+          this.checkOutWeek="五"
+          break;
+          case 6:
+          this.checkOutWeek="六"
+          break;
+      }
     },
     //改变日期
     getDateInfo(){
@@ -815,7 +868,6 @@ export default {
         if(this.sureMsg.CustomerId==null||this.sureMsg.CustomerId==""){
             this.sureMsg.CustomerId=0
         }
-        this.sureMsg.totalChargeableRateInfo = this.totalPrice;
 
         this.apipost("dmc_post_Get_GetJAPAN_HotelBooking",this.sureMsg,res => {
             if (res.data.resultCode == 1) {

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

@@ -65,8 +65,8 @@
                 <span>{{item.OrderStatus}}</span>
               </td>
               <td style="text-align:center;">
-                <el-button size="mini"type="danger"  @click="goPay(item)">立即付款</el-button> 
-                <el-button style="margin: 10px 0 0 0;" size="mini" @click="canCelHotel(item.ThirdOrderNo)">取消订单</el-button>
+                <el-button size="mini"type="danger" v-if="item.OrderStatus!='已取消'"  @click="goPay(item)">立即付款</el-button> 
+                <el-button style="margin: 10px 0 0 0;" v-if="item.OrderStatus!='已取消'" size="mini" @click="canCelHotel(item.ThirdOrderNo)">取消订单</el-button>
               </td>
             </tr>
           </template>

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

@@ -200,14 +200,13 @@ export default {
         "/api/b2b/user/getrecentorder",
         this.getOrderMsg,
         res => {
+            this.orderLoading = false;
           if (res.data.resultCode == 1) {
-            this.tableData = res.data.data.pageData;
+            this.tableData = res.data.data.pageData?res.data.data.pageData:[];
             this.totalCount = res.data.data.pageCount;
             this.Count = res.data.data.count;
-            this.orderLoading = false;
           } else {
             this.Error(res.data.message);
-            this.orderLoading = false;
           }
         },
         null