Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/Hotel/roomReservationsDetailsNew.vue

@@ -995,7 +995,6 @@
                   if (subItem.CurrencyId == 0) {
                     subItem.CurrencyId = 3;
                   }
-                  this.calculationPrice(subItem);
                   subItem.OrderDetailsList.forEach((x, index1) => {
                     x.HouseTypeCount = x.HouseTypeCount.toString();
                     x.UnitPrice = x.UnitPrice.toString();
@@ -1005,8 +1004,7 @@
                     subItem.ReserveNo = this.$route.query.NewCombinationNum;
                   }
                   subItem.OrderDetailsList = subItem.OrderDetailsList.filter(item => item.HouseType === 2)
-                  console.log('subItem.OrderDetailsList', subItem.OrderDetailsList, subItem.OrderDetailsList
-                    .filter(item => item.HouseType === 2))
+                  this.calculationPrice(subItem);
                   subItem.isShowPop = false;
                   subItem.ckedHotelName = "";
                   //遍历手配