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

src/components/Hotel/roomReservationsDetails.vue

@@ -469,7 +469,14 @@
           item.HotelOrderList.forEach(subItem => {
             subItem.OrderDetailsList.forEach(y => {
               y.HouseTypeCount = parseInt(y.HouseTypeCount);
-              y.UnitPrice = parseInt(y.UnitPrice);
+              if(y.UnitPrice)
+              {
+                y.UnitPrice = parseInt(y.UnitPrice);
+              }
+              else
+              {
+                 y.UnitPrice=0;
+              }
               y.HotelDiscount = parseInt(y.HotelDiscount);
               if (y.BookNum == "") {
                 y.BookNum = 0;