修改

src/components/global/tripMap.vue

@@ -99,7 +99,8 @@
                             let obj = {
                                 location: x.lat + ',' + x.lng,
                                 type: x.type,
-                                name: x.name
+                                name: x.name,
+                                isFly: x.isFly
                             }
                             if (!_this.checkItemIsExists(waypoints, obj)) {
                                 waypoints.push(obj);
@@ -128,6 +129,7 @@
                         //生成标记图标
                         var image = {}
                         var type = waypoints[i].type;
+                        var isFly = waypoints[i].isFly;
                         //交通
                         if (type == 1) {
                             image = {
@@ -149,6 +151,13 @@
                                 scaledSize: new google.maps.Size(35, 45),
                             }
                         }
+                        //飞机
+                        if(isFly == 1){
+                            image = {
+                                url: 'http://imgfile.oytour.com/static/location_plane.png',
+                                scaledSize: new google.maps.Size(30, 30),
+                            }
+                        }
 
                         let marker = new MarkerWithLabel({
                             position: new google.maps.LatLng(loc[0], loc[1]),
@@ -181,7 +190,7 @@
                                 infowindow.close();
                             })
                         }
-                        if (type == 3 || type == 2) {
+                        if (type == 3 || type == 2 || isFly==1) {
                             marker.labelContent = ''
                             marker.labelStyle = 'background:transparent'
                         }

src/components/mall/detailTwo.vue

@@ -313,7 +313,7 @@
                             </li>
                             <li @click="goUrlTrip()" v-if="dataList.lineId!=2&&dataList.lineId!=8">
                                 <i class="iconfont icon-hangchenganpai"></i>
-                                行程
+                                直客版行程
                             </li>
 
                         </ul>

src/components/mall/newTrip.vue

@@ -109,6 +109,7 @@
         font-weight: 700;
         font-size: 26px;
         overflow: hidden;
+        font-family: 'PingFangR';
     }
 
     #footer:after,
@@ -164,7 +165,7 @@
     .tripViewContainer .cityDayList .tripDay .left .dayIndex {
         color: #00A4A8;
         font-size: 20px;
-        font-weight: 700;
+        font-family: 'PingFangR';
     }
 
     .swiper-slide,
@@ -560,6 +561,7 @@
         font-weight: 700;
         padding: 0 12px;
         color: #3D4756;
+        font-family: 'PingFangR';
     }
 
     .tripViewAgendaList .agendaBox .detailBox {
@@ -1233,7 +1235,6 @@
                         this.dataList = res.data.data;
                         this.FlightList = res.data.data.currentPriceInfo.priceFlight;
                         this.StartData = res.data.data.currentPriceInfo.startDate;
-                        console.log("this.dataList", this.dataList);
                         this.isShow = true;
                         this.getAllPoint();
                         //装载景点酒店图片以供预览
@@ -1396,13 +1397,15 @@
                                         lat: subItem.dLat,
                                         lng: subItem.dLng,
                                         name: subItem.departureAirPortName,
-                                        type: 1
+                                        type: 1,
+                                        isFly:1
                                     });
                                     Arr.push({
                                         lat: subItem.aLat,
                                         lng: subItem.aLng,
                                         name: subItem.arrivalAirPortName,
-                                        type: 1
+                                        type: 1,
+                                        isFly:1
                                     })
                                 }
                             });
@@ -1435,13 +1438,15 @@
                                             lat: subItem.dLat,
                                             lng: subItem.dLng,
                                             name: subItem.departureAirPortName,
-                                            type: 1
+                                            type: 1,
+                                            isFly: 1
                                         });
                                         Arr.push({
                                             lat: subItem.aLat,
                                             lng: subItem.aLng,
                                             name: subItem.arrivalAirPortName,
-                                            type: 1
+                                            type: 1,
+                                            isFly: 1
                                         })
                                     }
                                 });