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

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -220,6 +220,7 @@
           TripCountryList: [], //行程国家
           TripCityList: [], //行程城市
           TripMapList: [],
+          NotQueryCityList:[],//使用系统中的经纬度城市
         },
         //行程
         FeatureData: {
@@ -878,6 +879,7 @@
                 this.PostConfig.TripCountryList = tempData.TripCountryList;
                 this.PostConfig.TripCityList = tempData.TripCityList;
                 this.PostConfig.TripMapList = tempData.TripMapList;
+                this.PostConfig.NotQueryCityList=tempData.NotQueryCityList;
                 this.PostConfig.MapUrl = tempData.MapUrl;
                 let arrList = function (list) {
                   list.forEach(x => {

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -399,11 +399,11 @@
                 <span v-if="dayobject.checkState==$calendarUtils.checkState.noChecked"
                   class="other-month">{{dayobject.day.getDate()}}</span>
                 <!---->
-                <span v-if="dayobject.checkState==$calendarUtils.checkState.checked"
-                  class="checked1" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
+                <span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
+                  @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
                 <!---->
-                <span
-                  v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue" @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
+                <span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
+                  @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}</span>
               </li>
             </ul>
           </div>
@@ -1491,7 +1491,8 @@
           QFlightDateEnd: this.QFlightDateEnd,
           CreateBy: createBy,
           AirTicketId: this.priceData.AirTicketId,
-          TCID: this.priceData.TCID
+          TCID: this.priceData.TCID,
+          LineId: this.PostConfig.LineId
         };
 
         let that = this;
@@ -1994,7 +1995,7 @@
         this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
             if (res.data.resultCode == 1) {
               this.TeamListArr = res.data.data;
-     
+
             } else {
               this.Error(res.data.message);
             }

src/components/newTravelmanager/TravelGroupControl/tripmap.vue

@@ -98,7 +98,6 @@
         deviceMarkers: [], //城市Markers
         allMapCityList: [], //地图显示所有城市
         countriesMarkers: [], //国家的Markers
-
         chooseCountry: [], //选中的国家
         chooseCity: [], //选中的城市
       };
@@ -481,7 +480,6 @@
               filter: ["==", "NAME_ZH", x.name]
             });
           }
-
           if (x.MId != 651 && x.MId != 891) {
             that.ClearSource("mapLayer-" + x.MId, 1)
             that.ClearSource("mapLayerId-" + x.MId, 1)
@@ -570,12 +568,17 @@
       async calcCitiesGeoInfoHandler() {
         await Promise.all(
           this.citiesData.map(async cityItem => {
-            var cityPosition = await this.getCityCoordinates(cityItem);
-            if (cityPosition && cityPosition.length == 2) {
-              cityItem.longitude = cityPosition[0];
-              cityItem.Lng = cityPosition[0];
-              cityItem.Lat = cityPosition[1];
-              cityItem.latitude = cityPosition[1];
+            var isNotQueryCity = this.PostConfig.NotQueryCityList.find(cItem => {
+              return cItem === cityItem.MId;
+            });
+            if (!isNotQueryCity) {
+              var cityPosition = await this.getCityCoordinates(cityItem);
+              if (cityPosition && cityPosition.length == 2) {
+                cityItem.longitude = cityPosition[0];
+                cityItem.Lng = cityPosition[0];
+                cityItem.Lat = cityPosition[1];
+                cityItem.latitude = cityPosition[1];
+              }
             }
           })
         );