页面修改

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -164,6 +164,7 @@
           WCountryId: 0, //国家编号
           WLocationId: 0, //位置编号
           WCityId: 0, //城市编号
+          TripColor:"",//行程特色主色
         },
         //行程
         FeatureData: {
@@ -372,7 +373,6 @@
         basicData.OpenTeamDescribe = this.PostConfig.OpenTeamDescribe;
         basicData.RemoveChild = this.PostConfig.RemoveChild;
         basicData.OfferId = this.PostConfig.OfferId;
-
         basicData.TeamType = this.PostConfig.TeamType;
         basicData.StartCityId = 0;
         basicData.ReturnArriveCityId = 0;
@@ -390,7 +390,7 @@
             basicData.ReturnArriveCityId = this.PostDaysTrip.ReturnArriveCityId;
           }
         }
-
+        basicData.TripColor=this.PostConfig.TripColor;
         basicData.SelfpayingList = this.PostConfig.SelfpayingList;
         basicData.ShopList = this.PostConfig.ShopList;
         basicData.DinnerList = this.PostDaysTrip.DinnerList;

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue

@@ -36,7 +36,7 @@
               <span class="absolute">{{'0'+(i+1)}}</span>
             </div>
             <div class="UpgradedVersionDetails-T absolute">
-              <vEditDiv :canEdit='canEdit1' v-model="item.MainDesc"></vEditDiv>
+              <vEditDiv :canEdit='canEdit' v-model="item.MainName"></vEditDiv>
             </div>
           </div>
           <div class="UpgradedVersionDetails-Img-two relative">
@@ -47,7 +47,7 @@
             </template>
           </div>
           <div class="UpgradedVersionDetails-T-two">
-            <vEditDiv :canEdit='canEdit' v-model="item.MainName"></vEditDiv>
+            <vEditDiv :canEdit='canEdit' v-model="item.MainDesc"></vEditDiv>
           </div>
         </div>
       </div>
@@ -83,7 +83,6 @@
     data() {
       return {
         canEdit: true,
-        canEdit1: true,
         backgroundColor: null,
         subscriptText: [{
             Name: 'FOODING',
@@ -104,7 +103,7 @@
           queryId: 0,
         },
         isShowScenicImg: false,
-        MasterMapIndex: null,//主图下标
+        MasterMapIndex: null, //主图下标
       };
     },
     methods: {
@@ -133,11 +132,11 @@
         }
       },
       SelectImg(index) {
-        this.MasterMapIndex = index?index:0
-        if(this.FeatureData.pageType==3) this.choseType = 2
-        else if(this.FeatureData.pageType==4) this.choseType = 1
-        else if(this.FeatureData.pageType==5) this.choseType = 2
-        else if(this.FeatureData.pageType==6) this.choseType = 3
+        this.MasterMapIndex = index ? index : 0
+        if (this.FeatureData.pageType == 3) this.choseType = 2
+        else if (this.FeatureData.pageType == 4) this.choseType = 1
+        else if (this.FeatureData.pageType == 5) this.choseType = 2
+        else if (this.FeatureData.pageType == 6) this.choseType = 3
         else this.choseType = 0
         this.isShowScenicImg = true
       },

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue

@@ -139,7 +139,7 @@
 
       },
       toAddPages() {
-        this.$emit('toAddPages', this.index, this.FeatureData)
+        this.$emit('toAddPages', this.index, this.FeatureItem)
       },
       toDeletePages() {
         this.$emit('toDeletePages', this.index)

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue

@@ -121,11 +121,12 @@
         return pageObj;
       },
       //添加页面
-      AddPages(index, FeatureData) {
+      AddPages(index, featureDataObj) {
+        console.log("featureDataObj",featureDataObj);
         var pageData = this.getPageObj();
         pageData.isDeletePage = true
-        pageData.pageType = FeatureData.pageType
-        if (FeatureData.pageType > 3) {
+        pageData.pageType = featureDataObj.pageType
+        if (featureDataObj.pageType > 3) {
           pageData.pageTemplate = 1
         }
         this.pageList.splice(index, 0, pageData);
@@ -209,12 +210,10 @@
                 }],
                 MainDesc: "特色餐描述"
               };
-
               if (tripObj.dinnerArray && tripObj.dinnerArray.length > 0) {
-                if (tripObj.dinnerArray.length == 1) {
-                  tripObj.dinnerArray.forEach(dItem => {
-                    var tempImaList=dItem.ImgList;
-                 
+                if (tripObj.dinnerArray.length > 2) {
+                  tripObj.dinnerArray.forEach((dItem, dIndex) => {
+                    if (dIndex <= 2) {
                       newObj.SubList.push({
                         MainName: dItem.MainName,
                         ImgList: [{
@@ -222,10 +221,9 @@
                         }],
                         MainDesc: dItem.MainDesc
                       });
+                    }
                   })
-                  newObj.SubList.push(dinnerObj);
-                  newObj.SubList.push(dinnerObj);
-                } else if (tripObj.dinnerArray.length == 2) {
+                } else if (tripObj.dinnerArray.length > 1) {
                   tripObj.dinnerArray.forEach(dItem => {
                     newObj.SubList.push({
                       MainName: dItem.MainName,
@@ -237,9 +235,9 @@
                   })
                   newObj.SubList.push(dinnerObj);
 
-                } else if (tripObj.dinnerArray.length >= 3) {
-                  tripObj.dinnerArray.forEach((dItem, dIndex) => {
-                    if (dIndex <= 2) {
+                } else if (tripObj.dinnerArray.length > 0) {
+                  tripObj.dinnerArray.forEach(dItem => {
+                    var tempImaList = dItem.ImgList;
                     newObj.SubList.push({
                       MainName: dItem.MainName,
                       ImgList: [{
@@ -247,8 +245,9 @@
                       }],
                       MainDesc: dItem.MainDesc
                     });
-                    }
                   })
+                  newObj.SubList.push(dinnerObj);
+                  newObj.SubList.push(dinnerObj);
                 }
               }
             }