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

src/components/Hotel/HotelDetail.vue

@@ -472,7 +472,7 @@
                     {{hotelSummary.address}}
                 </div>
                 <div class="HD_Top_Price">
-                    <span class="HD_Top_Pinfo"><i>¥</i>{{price}}</span>
+                    <span class="HD_Top_Pinfo"><i>¥</i>{{getPrice(price)}}</span>
                     <span class="HD_Top_qi">/起</span>
                     <!-- <span>另付税：¥177</span> -->
                     <input type="button" class="HD_SureBtn" style="display:none;" value="立即预订"/>
@@ -662,7 +662,9 @@
                                     <div>最迟退房时间{{subItem['finalCheck-outTime']}}</div>
                                 </li>
                                 <li class="HD_Lingprice">
-                                    <div><i>¥</i><span>{{subItem.chargeableRateInfoPerPersonForANightBySetCurrency}}</span></div>
+                                    <div><i>¥</i>
+                                        <span>{{getPrice(subItem.chargeableRateInfoPerPersonForANightBySetCurrency)}}</span>
+                                    </div>
                                 </li>
                                 <li>
                                     <input type="button" style="right:20px;" @click="bookHotel(subItem.roomOptionCd)" class="HD_PsureBtn" value="预订" />
@@ -830,6 +832,8 @@ export default {
       bathRoom:[],
       //地图坐标
       travelLngLat:[],
+      //除以
+      JapanIncrease:0,
       pickerOptions0: {
         disabledDate(time) {
           let today_after7=moment().add(8,'days').format('YYYY-MM-DD');
@@ -1165,6 +1169,7 @@ export default {
                         x.roomOptions = arr;
                     }
                 })
+                this.JapanIncrease = res.data.data.JapanIncrease;
             } else {
                 this.Error(res.data.message);
             }
@@ -1218,6 +1223,10 @@ export default {
             }
         }
     },
+    //获取价格
+    getPrice(price){
+        return Math.ceil(price/this.JapanIncrease);
+    },
     //点击预订传递参数
     bookHotel(roomOptionCd){
         if(sessionStorage.getItem('OpenB2BCode')==null && !localStorage.userInfo){

src/components/Hotel/HotelList.vue

@@ -606,7 +606,7 @@
                                             地址：{{item.address}}
                                         </div>
                                         <div class="HL_ListPrice">
-                                            <span><label>¥</label>{{item.lowrateBySetCurrency}}</span>起
+                                            <span><label>¥</label>{{getPrice(item.lowrateBySetCurrency)}}</span>起
                                         </div>
                                         <input type="button" class="HL_ListBtn" @click="goHotelDetail(item)" value="查看详情"/>
                                     </div>
@@ -675,6 +675,8 @@ export default {
         //最大星星
         reviewRatingUpperLimits:'',
       },
+      //除以
+      JapanIncrease:0,
       isShowPop:false,
       roomList:[],
       room:1,
@@ -1052,6 +1054,7 @@ export default {
                 })
                 this.TotalPage = parseInt(res.data.data.numberOfResultMatched);
                 this.PassMsg.groupBookingFlg = res.data.data.groupBookingFlg;
+                this.JapanIncrease = res.data.data.JapanIncrease;
             } else {
                 this.Error(res.data.message);
             }
@@ -1101,6 +1104,10 @@ export default {
             newArr.push('退房11点以后');
         }
         return newArr;
+    },
+    //获取价格
+    getPrice(price){
+        return Math.ceil(price/this.JapanIncrease);
     }
   }
 };

src/components/Hotel/HotelSure.vue

@@ -632,7 +632,8 @@ export default {
           CustomerId:0,
           HotelName:'',
           HotelPic:'',
-          EmployeeIdStr:''
+          EmployeeIdStr:'',
+          OldTotalPrice:0
       },
       //验证规则
       rules: {
@@ -733,7 +734,7 @@ export default {
       TotalChildCount:0,
       //选了的儿童数
       chekedChildCount:0,
-      isBaoChild:false
+      isBaoChild:false,
     };
   },
   mounted() {
@@ -779,7 +780,6 @@ export default {
                 }
                 this.sureMsg.totalChargeableRateInfo=0;
                 this.sureMsg.totalPriceJapanese=0;
-                console.log(this.dataList,'datalistss');
                 this.TotalChildCount = 0;
                 let rateGrouoLen = 0;
                 this.dataList.roomGroup.forEach(x=>{
@@ -800,6 +800,11 @@ export default {
                     let AdultJapanCount = 0;
                     let childJapanCount = 0;
                     
+                    //原始成人
+                    let oldAount=0;
+                    let childAount=0;
+                    let oldAuditPrice=0;
+                    let oldChildPrice=0;
                     this.TotalChildCount+=x.roomChildCount*x.rateGroup.length;
 
                     rateGrouoLen+= x.rateGroup.length;
@@ -809,11 +814,18 @@ export default {
                     }
                     x.rateGroup.forEach(z=>{
                         if(z.perAdultRateBySetCurrency){
+                            z.oldAuditPrice = z.perAdultRateBySetCurrency;
+                            z.oldchildPrice = z.perChildRateBySetCurrency;
+
+                            z.perAdultRateBySetCurrency = Math.ceil(z.perAdultRateBySetCurrency/this.dataList.JapanIncrease);
+                            z.perChildRateBySetCurrency = Math.ceil(z.perChildRateBySetCurrency/this.dataList.JapanIncrease);
                             if(x.roomAdultCount>0){
                                 AdultTotalPrice+=parseFloat(z.perAdultRateBySetCurrency);
+                                oldAuditPrice+=parseFloat(z.oldAuditPrice);
                             }
                             if(x.roomChildCount>0){
                                 childToTalPrice+=parseFloat(z.perChildRateBySetCurrency);
+                                oldChildPrice+=parseFloat(z.oldchildPrice);
                             }
                         }
                         if(z.perAdultRate){
@@ -825,8 +837,11 @@ export default {
                     // childCount+=childToTalPrice*x.roomChildCount;
                     AdultCount+=AdultTotalPrice;
                     childCount+=childToTalPrice;
-                    this.sureMsg.totalChargeableRateInfo += parseFloat(AdultCount+childCount);
 
+                    oldAount+=oldAuditPrice;
+                    childAount+=childAount;
+                    this.sureMsg.totalChargeableRateInfo += parseFloat(AdultCount+childCount);
+                    this.sureMsg.OldTotalPrice+=parseFloat(oldAount+childAount);
                     // AdultJapanCount+=AdultJapanPrice*x.roomAdultCount;
                     // childJapanCount+=ChildJapanPrice*x.roomChildCount;
 

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

@@ -23,8 +23,7 @@
             <div
               class="_pointer"
               :style="{'left': ((userInfo.vipExperience/999)*100)-13 + '%'}"
-              v-if="(userInfo.vipExperience/999)*100>0"
-            >
+              v-if="(userInfo.vipExperience/999)*100>0">
               <span class="_pointer_num">{{userInfo.vipExperience}}</span>
               <span class="_line"></span>
             </div>