修改酒店

src/components/Hotel/HotelDetail.vue

@@ -1211,7 +1211,7 @@ export default {
     },
     //点击预订传递参数
     bookHotel(roomOptionCd){
-        if(!localStorage.userInfo){
+        if(sessionStorage.getItem("UserId")==''&& !localStorage.userInfo){
             return this.Error('请登录！')
         }
 

src/components/Hotel/HotelHome.vue

@@ -327,9 +327,18 @@ export default {
   },
   mounted() {
     this.loadSize();
+
   },
   created() {
     this.isLogin=this.$store.state.isLogin;
+
+    //获取传递参数
+    var url = window.location.href;
+    if (url.indexOf("?") != -1) {
+      let str = url.split("?")[1];
+      let uid = str.split("=")[1];
+      sessionStorage.setItem("UserId", uid);
+    }
   },
   methods: {
     //查询
@@ -426,9 +435,6 @@ export default {
       this.carousel_height = w * 0.269* 0.75 + "px";
       this.banner_height=w*0.205+"px";
     },
-    getDatelist(val){
-      console.log(val,'date');
-    }
   }
 };
 </script>

src/components/Hotel/HotelSure.vue

@@ -533,12 +533,11 @@
                         <span class="C9">加床</span>
                         <span>JPY 20216.00/床/间夜</span>
                     </li> -->
-                    <li>
+                    <li v-if="dataList.roomRateDetails&&dataList.roomRateDetails.smoking!=''">
                         <span class="C9">吸烟</span>
                         <span v-if="dataList.roomRateDetails">
-                            <template v-if="dataList.roomRateDetails.smoking==''"></template>
-                            <template v-else-if="dataList.roomRateDetails.smoking==0">禁吸</template>
-                            <template v-else-if="dataList.roomRateDetails.smoking==1">可吸烟</template>
+                            <template v-if="dataList.roomRateDetails.smoking==0">禁吸</template>
+                            <template v-if="dataList.roomRateDetails.smoking==1">可吸烟</template>
                         </span>
                     </li>
                     <li>
@@ -622,6 +621,7 @@ export default {
           CustomerId:0,
           HotelName:'',
           HotelPic:'',
+          EmployeeIdStr:''
       },
       //验证规则
       rules: {
@@ -734,8 +734,6 @@ export default {
           this.childNum+=x.numberOfChildren;
       })
       let roomGroupLen = this.msg.searchroomGroup.length;
-      let userInfo = this.getLocalStorage();
-      this.sureMsg.CustomerId = userInfo.customerId;
       this.sureMsg.roomGroup=[];
       for(var i=0;i<roomGroupLen;i++){
           var obj = {
@@ -773,17 +771,35 @@ export default {
                     }
                     let tt = 0;
                     let tt2 = 0;
+                    let AdultTotalPrice = 0;
+                    let childToTalPrice = 0;
+                    let AdultCount = 0;
+                    let childCount = 0;
+
+                    let AdultJapanPrice = 0;
+                    let ChildJapanPrice = 0;
+                    let AdultJapanCount = 0;
+                    let childJapanCount = 0;
+
+
                     x.rateGroup.forEach(z=>{
                         if(z.perAdultRateBySetCurrency){
-                            tt+=parseFloat(z.perAdultRateBySetCurrency);
+                            AdultTotalPrice+=parseFloat(z.perAdultRateBySetCurrency);
+                            childToTalPrice+=parseFloat(z.perChildRateBySetCurrency);
                         }
                         if(z.perAdultRate){
-                            tt2+=parseFloat(z.perAdultRate);
+                            AdultJapanPrice+=parseFloat(z.perAdultRate);
+                            ChildJapanPrice+=parseFloat(z.perChildRate);
                         }
-
                     })
-                    this.sureMsg.totalChargeableRateInfo+=tt*x.roomAdultCount;
-                    this.sureMsg.totalPriceJapanese+=tt2*x.roomAdultCount;
+                    AdultCount+=AdultTotalPrice*x.roomAdultCount;
+                    childCount+=childToTalPrice*x.roomChildCount;
+                    this.sureMsg.totalChargeableRateInfo = parseFloat(AdultCount+childCount);
+
+                    AdultJapanCount+=AdultJapanPrice*x.roomAdultCount;
+                    childJapanCount+=ChildJapanPrice*x.roomChildCount;
+
+                    this.sureMsg.totalPriceJapanese=parseFloat(AdultJapanCount+childJapanCount);
                 })
 
             } else {
@@ -862,6 +878,18 @@ export default {
     },
     //点击支付
     BuyHoTel(){
+        //判断是否为登录状态
+        if(localStorage.userInfo){
+            sessionStorage.removeItem("UserId");
+            this.sureMsg.EmployeeIdStr='';
+            let userInfo = this.getLocalStorage();
+            this.sureMsg.CustomerId = userInfo.customerId;
+        }
+        //判断是否跳过来的
+        if(sessionStorage.getItem("UserId")){
+            this.sureMsg.EmployeeIdStr= sessionStorage.getItem("UserId");
+        }
+
         this.sureMsg.hotelId = this.msg.hotelId;
         this.sureMsg.arrivalDate = this.msg.arrivalDate;
         this.sureMsg.totalRoomCount = this.msg.searchroomGroup.length;
@@ -870,6 +898,7 @@ export default {
         this.sureMsg.HotelName = this.dataList.hotelName;
         this.sureMsg.HotelPic = this.HotelImgUrl;
 
+
         this.dataList.roomGroup.forEach(x=>{
             this.sureMsg.roomGroup.forEach(j=>{
                 if(Object.prototype.toString.call(x.rateGroup) == '[object Object]'){