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,23 +316,26 @@
             }
             if (dItem.HotelArray && dItem.HotelArray.length > 0) {
               dItem.HotelArray.forEach(sItem => {
-                var tempImgList = [];
-                if (sItem.ImaArray && sItem.ImaArray.length > 0) {
-                  sItem.ImaArray.forEach(iItem => {
-                    tempImgList.push({
-                      url: iItem.Url
-                    });
-                  })
-                }
-                var hObj = {
-                  MainName: sItem.HotelName,
-                  MainDesc: sItem.Description,
-                  ImgList: tempImgList,
-                  SourceType: 4
-                }
-                var tempHotel = hotelArray.find(x => x.MainName == hObj.MainName)
-                if (!tempHotel) {
-                  hotelArray.push(hObj);
+                //排除“温馨的家”和“机场附近酒店”
+                if (sItem.HotelId != 1568 && sItem.HotelId != 2353) {
+                  var tempImgList = [];
+                  if (sItem.ImaArray && sItem.ImaArray.length > 0) {
+                    sItem.ImaArray.forEach(iItem => {
+                      tempImgList.push({
+                        url: iItem.Url
+                      });
+                    })
+                  }
+                  var hObj = {
+                    MainName: sItem.HotelName,
+                    MainDesc: sItem.Description,
+                    ImgList: tempImgList,
+                    SourceType: 4
+                  }
+                  var tempHotel = hotelArray.find(x => x.MainName == hObj.MainName)
+                  if (!tempHotel) {
+                    hotelArray.push(hObj);
+                  }
                 }
               });
             }