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

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -685,10 +685,15 @@
           this.journeyList.isFileUpload = true;
           this.journeyList.DayNum = configData.Days.length;
           this.journeyList.NightNum = this.journeyList.DayNum - 1;
+          let _this = this
           let arrDayList = function(list){
             list.forEach(x=>{
               x.IsBlowUp = false
-              x.zoom = 0.44
+              if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){
+                x.zoom = 0.44
+              }else if(_this.journeyList.FeaturePageType==1){
+                x.zoom = 0.285
+              }
             })
           }
           arrDayList(dayList)
@@ -949,10 +954,15 @@
                 this.journeyList.NightNum = tempData.NightNum;
                 this.journeyList.ReturnArriveCityId = tempData.ReturnArriveCityId;
                 this.journeyList.StartCityId = tempData.StartCityId;
+                let _this = this
                 let arrDayList = function(list){
                   list.forEach(x=>{
                     x.IsBlowUp = false
-                    x.zoom = 0.44
+                    if(_this.journeyList.FeaturePageType==2||!_this.journeyList.FeaturePageType){
+                      x.zoom = 0.44
+                    }else if(_this.journeyList.FeaturePageType==1){
+                      x.zoom = 0.285
+                    }
                   })
                 }
                 arrDayList(tempData.DayList)