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

src/components/Hotel/roomQuery.vue

@@ -394,12 +394,14 @@
                 var rootRowspan = 0; //合团跨行
                 rootItem.PriceCommonList.forEach(subItem => {
                   var itemRowSpan = 0; //酒店跨行
-                  subItem.PriceHotelResult.forEach(thirdItem => {
-                    thirdItem.SubList.forEach(lastItem => {
-                      rootRowspan++;
-                      itemRowSpan++;
+                  if (subItem.PriceHotelResult && subItem.PriceHotelResult.length > 0) {
+                    subItem.PriceHotelResult.forEach(thirdItem => {
+                      thirdItem.SubList.forEach(lastItem => {
+                        rootRowspan++;
+                        itemRowSpan++;
+                      });
                     });
-                  });
+                  }
                   subItem.itemRowSpan = itemRowSpan;
                 });
                 rootItem.rootRowspan = rootRowspan;