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

src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue

@@ -40,7 +40,7 @@
         <TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
           :NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
 
-        <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" v-if="TeamType==1"
+        <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
           :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice2>
         <div class="btnFixedDiv">
           <div class="toTop" @click="backTop">

src/components/newTravelmanager/oldTravelGroupControl/dinnerTrip_Direct.vue

@@ -186,7 +186,7 @@ export default {
         narrative: true //叙述,
       },
       //是否显示编辑框
-      isShowEdit: false,
+      isShowEdit: true,
       dspNone: false,
       initialIndex: 0,
       //text框placeholder

src/components/newTravelmanager/oldTravelGroupControl/freedomTrip.vue

@@ -119,7 +119,7 @@
           narrative: true //叙述,
         },
         //是否显示编辑框
-        isShowEdit:false,
+        isShowEdit:true,
         dspNone:false,
         initialIndex:0,
         //text框placeholder

src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct.vue

@@ -199,7 +199,7 @@ export default {
       //不选中
       UnCheckedVaule: 0,
       //是否显示编辑框
-      isShowEdit: false,
+      isShowEdit: true,
       //text框placeholder
       placeholder: "请输入酒店信息",
       //酒店含餐

src/components/newTravelmanager/oldTravelGroupControl/scienTrip_Direct.vue

@@ -185,7 +185,7 @@
         QTicketList: [],
         DefaultSelectValue: 0,
         //是否显示编辑框
-        isShowEdit: false,
+        isShowEdit: true,
         dspNone: false,
         initialIndex: 0,
         //text框placeholder

src/components/newTravelmanager/oldTravelGroupControl/titleTrip.vue

@@ -24,7 +24,7 @@
           narrative: true //叙述,
         },
         //是否显示编辑框
-        isShowEdit:false,
+        isShowEdit:true,
         //text框placeholder
         placeholder:'请输入行程大点信息'
       };

src/components/newTravelmanager/oldTravelGroupControl/trifficTrip.vue

@@ -230,7 +230,7 @@ export default {
       //不用车
       UnCheckedVaule: 0,
       //是否显示编辑框
-      isShowEdit: false,
+      isShowEdit: true,
       //text框placeholder
       placeholder: "请输入交通信息",
       //交通验证

src/components/newTravelmanager/oldTravelGroupControl/warmtipTrip.vue

@@ -47,7 +47,7 @@ export default {
         narrative: true //叙述,
       },
       //是否显示编辑框
-      isShowEdit:false,
+      isShowEdit:true,
       //text框placeholder
       placeholder:'请输入提示信息',
     };