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

src/assets/utils/tripUtils.js

 let locationName = window.location.hostname;
-let ViittoFileUrl = locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.10.214:8130'
+let ViittoFileUrl = locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.5.214:8130'
 var tripUtils = {
   TypeKey: {
     traffic: "1",

src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue

@@ -620,7 +620,6 @@
                       </el-option>
                     </el-select>
                   </el-form-item>
-
                 </div>
                 <div class="TPright clearfix">
                   <el-form-item prop="YSeat">