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

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

 <style>
   @import "../../../assets/css/newTravelManager.css";
   @import "../../../assets/css/endTravelManager.css";
+
 </style>
 <template>
   <div>
@@ -14,12 +15,12 @@
         <div class="TravelNavList" :class="{'TravelCked':ckedNav==2}" @click.prevent="custormAnchor('secondAnchor',2)">
           线路行程
         </div>
-        <div class="TravelLine"></div>
-        <div class="TravelNavList" :class="{'TravelCked':ckedNav==3}" @click.prevent="custormAnchor('thirdAnchor',3)">
+        <div class="TravelLine" v-if="TeamType!=3"></div>
+        <div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==3}" @click.prevent="custormAnchor('thirdAnchor',3)">
           产品特色
         </div>
-        <div class="TravelLine"></div>
-        <div class="TravelNavList" :class="{'TravelCked':ckedNav==4}" @click.prevent="custormAnchor('fourAnchor',4)">
+        <div class="TravelLine" v-if="TeamType!=3"></div>
+        <div class="TravelNavList" v-if="TeamType!=3" :class="{'TravelCked':ckedNav==4}" @click.prevent="custormAnchor('fourAnchor',4)">
           补充信息
         </div>
         <div class="TravelLine"></div>
@@ -35,12 +36,13 @@
           :subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
           v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend"
           @change="handlerChangeData" :TeamType="TeamType" :IsOpenHotel="PostConfig.IsOpenHotel"></TravelDaysTripDirect>
-        <TravelFeature :class="{'showOther':TeamType==3}" ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData"
-          :TeamType="TeamType" :isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature>
-        <TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
-          :NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList"
-          v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
-        
+        <TravelFeature :class="{'showOther':TeamType==3}" ref="TravelFeature" id="thirdAnchor"
+          @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType" :isNewConfig="isNewConfig"
+          @unlockFormCommit="unlockFormCommit"></TravelFeature>
+        <TravelNotice :class="{'showOther':TeamType==3}" ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice"
+          :subArray="NoticeParameters" :NoticeData="NoticeData" v-bind:PostConfig="PostConfig"
+          v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
+
         <TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice"
           :priceList="PriceList" v-if="TeamType==0" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
           :TeamType="TeamType"></TravelPrice>
@@ -614,7 +616,7 @@
         if (routeName == 'TravelManager4') {
           this.TeamType = 2;
         }
-        if(routeName =='TravelManager6'){
+        if (routeName == 'TravelManager6') {
           this.TeamType = 3;
         }
         let configId = this.$route.query.configId;
@@ -773,6 +775,9 @@
           this.initFileList();
           this.initFeatureFile();
           this.loading = true;
+          if (this.TeamType == 3) {
+            this.PostConfig.LineteamId = 588;
+          }
           this.apipost(
             "travel_get_GetCommonTravelInfo", {
               TeamType: this.TeamType