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

src/components/newTravelmanager/travelLineTrip/ScenicTraffic.vue

@@ -51,8 +51,9 @@
           酒店出发
         </div>
         <div class="St_current" style="margin-bottom:10px">
+            <!--{{trafficObj.trafficIntroduce.IntroduceTitle}}-->
           <template
-            v-if="trafficObj.trafficIntroduce.IntroduceTitle">{{trafficObj.trafficIntroduce.IntroduceTitle}}</template>
+            v-if="trafficObj.trafficIntroduce.IntroduceTitle">机场</template>
           <template v-else>机场</template>
           <div class="St_radioDiv Str1">
             <i class="iconfont icon-Shape1"></i>

src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue

@@ -167,7 +167,7 @@
                 :CurrentDayNum="dayObj.DayNum" :totalDayNum="subConfig.DayNum"
                 >
                 </scenicTraffic>
-                <span slot="reference" class="TC-tripTitle" style="padding-left:5px;cursor:pointer;">选择交通信息</span>
+                <span slot="reference" class="TC-tripTitle" style="padding-left:5px;cursor:pointer;display:none;">路线信息</span>
             </el-popover>
 
             <ul class="scenicCheck_check" v-if="ishasScenic&& NoticeParameters.IsDirect==0">