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

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue

@@ -152,9 +152,9 @@
         var oldJson = this.FeatureData.FeatureHtmlJson ?
           JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) :
           "";
-          console.log("oldJson",oldJson);
-        if (oldJson && oldJson.length>0) {
-           this.pageList=oldJson;
+        console.log("oldJson", oldJson);
+        if (oldJson && oldJson.length > 0) {
+          this.pageList = oldJson;
         } else {
           var tripObj = this.getTripData();
           console.log("tripObj", tripObj);
@@ -316,6 +316,8 @@
             }
             if (dItem.HotelArray && dItem.HotelArray.length > 0) {
               dItem.HotelArray.forEach(sItem => {
+                //排除“温馨的家”和“机场附近酒店”
+                if (sItem.HotelId != 1568 && sItem.HotelId != 2353) {
                   var tempImgList = [];
                   if (sItem.ImaArray && sItem.ImaArray.length > 0) {
                     sItem.ImaArray.forEach(iItem => {
@@ -334,6 +336,7 @@
                   if (!tempHotel) {
                     hotelArray.push(hObj);
                   }
+                }
               });
             }
             if (dItem.DinnerArray && dItem.DinnerArray.length > 0) {