开团修改

src/assets/utils/tripUtils.js

@@ -331,7 +331,6 @@ var tripUtils = {
 
   //行程-【交通对象】
   trafficObj: function () {
-    console.log(ViittoFileUrl)
     return {
       ID: 0,
       ConfigId: 0,

src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue

@@ -348,7 +348,7 @@ export default {
         }
         this.subConfig.DayList.length = this.subConfig.DayNum;
       }
-      console.log("this.sub",this.subConfig);
+ 
     },
 
     //点击往后追加
@@ -697,43 +697,41 @@ export default {
       var FreedomList = [];
       var WarmTipList = [];
       var TitleList = [];
-      // this.subConfig.DayList.forEach((item, dayIndex) => {
-      //   var rank = 1;
-      //   if (item.dayArray != null && item.dayArray.length > 0) {
-      //     item.dayArray.forEach(subItem => {
-      //       subItem.childItem.Rank = rank;
-      //       subItem.childItem.dayNum = item.dayNum;
-      //       subItem.Type = subItem.Type.toString();
-      //       switch (subItem.Type) {
-      //         case this.$tripUtils.TypeKey.traffic:
-      //           TrafficList.push(subItem.childItem);
-      //           break;
-      //         case this.$tripUtils.TypeKey.scenic:
-      //           ScenicList.push(subItem.childItem);
-      //           break;
-      //         case this.$tripUtils.TypeKey.hotel: 
-      //           HotelList.push(subItem.childItem);
-      //           break;
-      //         case this.$tripUtils.TypeKey.dinner:
-      //           DinnerList.push(subItem.childItem);
-      //           break;
-      //         case this.$tripUtils.TypeKey.freedom:
-      //           FreedomList.push(subItem.childItem);
-      //           break;
-      //         case this.$tripUtils.TypeKey.warmtip:
-      //           WarmTipList.push(subItem.childItem);
-      //           break;
-      //         case this.$tripUtils.TypeKey.title:
-      //           TitleList.push(subItem.childItem);
-      //           break;
-      //       }
-      //       rank++;
-      //     });
-      //   }
-      // });
-      this.subConfig.DayList.forEach((item,dayIndex)=>{
-          
-      })
+      this.subConfig.DayList.forEach((item, dayIndex) => {
+        var rank = 1;
+        if (item.dayArray != null && item.dayArray.length > 0) {
+          item.dayArray.forEach(subItem => {
+            subItem.childItem.Rank = rank;
+            subItem.childItem.dayNum = item.dayNum;
+            subItem.Type = subItem.Type.toString();
+            switch (subItem.Type) {
+              case this.$tripUtils.TypeKey.traffic:
+                TrafficList.push(subItem.childItem);
+                break;
+              case this.$tripUtils.TypeKey.scenic:
+                ScenicList.push(subItem.childItem);
+                break;
+              case this.$tripUtils.TypeKey.hotel: 
+                HotelList.push(subItem.childItem);
+                break;
+              case this.$tripUtils.TypeKey.dinner:
+                DinnerList.push(subItem.childItem);
+                break;
+              case this.$tripUtils.TypeKey.freedom:
+                FreedomList.push(subItem.childItem);
+                break;
+              case this.$tripUtils.TypeKey.warmtip:
+                WarmTipList.push(subItem.childItem);
+                break;
+              case this.$tripUtils.TypeKey.title:
+                TitleList.push(subItem.childItem);
+                break;
+            }
+            rank++;
+          });
+        }
+      });
+    
       var obj = {
         RemoveChild: this.subConfig.RemoveChild,
         RemoveImg: this.subConfig.RemoveImg,
@@ -758,9 +756,6 @@ export default {
     //防止首次初始化数据失败
    // this.emitData();
     this.typeArrayList.push(this.$tripUtils.TypeArray[this.$tripUtils.TypeArray.length-1]);
-    // this.getSameJourney();
-
-    console.log(this.subConfig,'subConfigOld');  
   },
   created() {
     if (this.isOpenGroup == undefined) {
@@ -772,10 +767,6 @@ export default {
     getDayNum() {
       return this.subConfig.DayNum;
     },
-    //获取目的地
-    // getCountryId() {
-    //   return this.subArray.CountryID;
-    // },
     getDayList() {
       return this.subConfig.DayList;
     }
@@ -785,16 +776,12 @@ export default {
     getDayNum(newValue, oldValue) {
       this.createLineTrip();
     },
-    //监听目的地国家是否改变
-    // getCountryId(newValue, oldValue) {
-    //   this.createLineTrip();
-    // },
-    // subConfig: {
-    //   handler: function(newValue, oldValue) {
-    //     this.emitData();
-    //   },
-    //   deep: true
-    // }
+    subConfig: {
+      handler: function(newValue, oldValue) {
+        this.emitData();
+      },
+      deep: true
+    }
   }
 };
 </script>
\ No newline at end of file

src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue

@@ -246,6 +246,7 @@
       //行程回调
       getDaysTrip(tripObj) {
         this.PostDaysTrip = tripObj;
+        console.log("this.PostDaysTrip",this.PostDaysTrip);
       },
       /*获取行程特色内容对象*/
       getFeature(featureObj) {
@@ -266,7 +267,6 @@
           if (this.PostConfig.fileList.length <= 5) {
             this.PostConfig.fileList.push(fileObj);
           }
-
           this.FeatureData.fileList.push(fileObj);
         }
       },
@@ -301,7 +301,7 @@
         basicData.RemoveChild = this.PostConfig.RemoveChild;
 
         basicData.TeamType = this.PostConfig.TeamType;
-
+        
         basicData.DayNum = (this.PostDaysTrip && this.PostDaysTrip.DayNum != "") ? this.PostDaysTrip.DayNum : 0;
         basicData.NightNum = (this.PostDaysTrip && this.PostDaysTrip.NightNum != "") ? this.PostDaysTrip.NightNum : 0;
         basicData.StartCityId = (this.PostDaysTrip && this.PostDaysTrip.StartCityId != "") ? this.PostDaysTrip.StartCityId :