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

src/components/TravelManager/Ticket/TravelMyTicket.vue

@@ -824,7 +824,7 @@
                   <p class="_text">{{$t('Airticket.Air_departureDate')}}</p>
                 </div>
               </el-col>
-              <el-col :span="3" class="vmiddle" style="display:none;">
+              <el-col :span="3" class="vmiddle">
                 <div class="_btn _tmt_page">
                   <button class="hollowFixedBtn inversion" type="button" @click="outBtn(item)">转位</button>
                   <el-tooltip class="item" effect="dark" content="日志" placement="top-start" style="display:none">

src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue

@@ -124,7 +124,7 @@
             <div>
               <el-form-item label="本团卖点">
                 <el-input v-model="PostConfig.ProductRecommend" type="textarea" :autosize="{minRows: 3, maxRows: 3 }"
-                          resize="none" placeholder="本团卖点" maxlength="300"></el-input>
+                          resize="none" placeholder="本团卖点" maxlength="2000"></el-input>
               </el-form-item>
             </div>
             <div>