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

src/components/Hotel/HotelDetail.vue

@@ -850,6 +850,7 @@ export default {
       this.SimilarMsg.arrivalDate = msgList.arrivalDate;
       this.SimilarMsg.departureDate = msgList.departureDate;
       this.SimilarMsg.searchroomGroup = msgList.searchroomGroup;
+      this.room = msgList.room;
       this.getList();
       this.getSimilar();
     }

src/components/Hotel/HotelHome.vue

@@ -333,11 +333,12 @@ export default {
     this.isLogin=this.$store.state.isLogin;
 
     //获取传递参数
-    var url = window.location.href;
+     var url = window.location.href;
+
     if (url.indexOf("?") != -1) {
       let str = url.split("?")[1];
-      let uid = str.split("=")[1];
-      sessionStorage.setItem("UserId", uid);
+      let uid = str.split("uid=")[1];
+      sessionStorage.setItem("UserId", decodeURIComponent(uid));
     }
   },
   methods: {
@@ -373,6 +374,7 @@ export default {
         place:keywords,
         StartDate:moment().format("YYYY-MM-DD"),
         EndDate:moment().add(1,'days').format('YYYY-MM-DD'),
+        room:1,
         roomList:[
           {
             roomNum:1,
@@ -382,9 +384,10 @@ export default {
           }
         ],
       }
+      sessionStorage.setItem("HotelInfo", JSON.stringify(msg));
+
       this.$router.push({
         path:"/HotelList",
-        query:{msg:JSON.stringify(msg)}
       })
     },
     //房间数改变

src/components/Hotel/HotelList.vue

@@ -1068,6 +1068,8 @@ export default {
       this.PassMsg.searchroomGroup = this.msg.searchroomGroup;
       this.PassMsg.lowrateBySetCurrency = item.lowrateBySetCurrency;
     
+      this.PassMsg.room = this.room
+
       sessionStorage.setItem("HotelDetail", JSON.stringify(this.PassMsg));
       this.$router.push({
           path:"/HotelDetail"