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

src/components/Home.vue

@@ -561,9 +561,9 @@
               </div>
               <div class="tour_right">
                    <ul class="common_ul_tab">
-                       <li :class="liActive==0?'li_active':''" @click="getHotelList('东京'),liActive=0">东京</li>
-                       <li :class="liActive==1?'li_active':''" @click="getHotelList('大阪'),liActive=1">大阪</li>
-                       <li :class="liActive==2?'li_active':''" @click="getHotelList('京都'),liActive=2">京都</li>
+                       <li :class="liActive==0?'li_active':''" @click="getHotelList('东京都'),liActive=0">东京</li>
+                       <li :class="liActive==1?'li_active':''" @click="getHotelList('大阪府'),liActive=1">大阪</li>
+                       <li :class="liActive==2?'li_active':''" @click="getHotelList('京都府'),liActive=2">京都</li>
                        <span style="float:right;color:#999999;font-size:12px" @click="SearchHotelMore">查看更多</span>
                    </ul>
                    <div class="hotel_right" v-loading="hotelLoading">
@@ -1270,7 +1270,6 @@ export default {
                     this.HotelList = res.data.data.hotelSummary;
                 }
                 this.PassMsg.groupBookingFlg = res.data.data.groupBookingFlg;
-                console.log(this.HotelList,'Hotellist');
             } else {
                 this.Error(res.data.message);
             }

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

@@ -191,8 +191,12 @@ export default {
     },
     //取消
     canCelHotel(ThirdOrderNo){
+        let userInfo = this.getLocalStorage();
+        let EmployeeId = userInfo.EmployeeId;
         let msg ={
-            bookingNumber:ThirdOrderNo
+            bookingNumber:ThirdOrderNo,
+            CancelBy:EmployeeId,
+            CancelType:2
         }
         this.apipost(
         "dmc_post_Get_GetJAPAN_GetJAPAN_ReservationCancallation",