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

src/assets/utils/tripUtils.js

@@ -417,6 +417,7 @@ var tripUtils = {
       TrafficContent: "", //交通内容
       TrafficImage: "", //交通图片
       TimeStr: "", //时间字符串备注
+      DefaultNum:0,//默认景点展示图
     };
   },
   //行程-酒店对象

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1037,9 +1037,8 @@
                         {{$t('Operation.Op_xilieModyfi')}}
                       </el-dropdown-item>
                       <el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
-                        {{$t('Operation.Op_xilieModyfi')}}(新)
+                        {{$t('Operation.Op_xilieModyfi')}}新
                       </el-dropdown-item>
-
                       <el-dropdown-item @click.native="goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM,item)">
                         {{$t('Operation.Op_dangtuanModify')}}
                       </el-dropdown-item>

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -384,7 +384,6 @@
                 //保存按钮跳转当当前页码
                 if (SaveType == 1) {
                   let path = this.$route.path;
-                  console.log("path", path);
                   this.Success("保存成功");
                   if (this.isNewConfig) {
                     this.$router.push({