Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/components/mall/detailTwo.vue

@@ -343,7 +343,7 @@
                     <div v-html="feature.featureHtml" style="width:1000px;margin:0 auto;"></div>
                 </div>
                 <div id="teamacitvy"> </div>
-                <div class="item-title" v-if="dataList.isDirect&&dataList.travelLngLat.length>1">
+                <div class="item-title" v-if="dataList.isDirect&&travelLngLat.length>1">
                     <span class="t">行程地图</span>
                     <span>
                         <small class="s"></small>
@@ -351,9 +351,9 @@
                     <span>Trip Maps</span>
                 </div>
                 <!--  -->
-                <div class="map-box" v-if="dataList.isDirect&&dataList.travelLngLat.length>1">
+                <div class="map-box" v-if="dataList.isDirect&&travelLngLat.length>1">
                     <!-- <bmap :data="travelLngLat"/> -->
-                    <GGMap :dataList="dataList.travelLngLat"></GGMap>
+                    <GGMap :dataList="travelLngLat"></GGMap>
                     <div class="_travelLngLatInfo_box">
                         <p v-for="item in travelLngLatInfo"><span class="_travelLngLatInfo_label">{{item.lable}}</span>： {{item.text}}</p>
                     </div>
@@ -850,7 +850,12 @@ export default {
                         this.showType = this.feature.featureType;
                         this.dayTrip = this.dataList.dayNum;
                         if(this.dataList.isDirect==1&&this.dataList.travelLngLat.length){
-                            this.travelLngLat = this.dataList.travelLngLat;
+                            this.travelLngLat = [];//this.dataList.travelLngLat;
+                            this.dataList.travelLngLat.forEach(x=>{
+                                if(x.type!=2){
+                                    this.travelLngLat.push(x)
+                                }
+                            })
                             let travelLngLatInfo = [];
                             this.travelLngLat.forEach((x,index)=>{
                                 travelLngLatInfo.push(