页面修改

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

@@ -6,23 +6,18 @@
       </div>
       <div class="featureHome-text-box">
         <div class="featureHome-text-box-sod" :style="{'border':borderBox,'color':TripColor}">
-          <vEditDiv :canEdit='canEdit1' v-model="FeatureItem.dataObj.LtName"></vEditDiv>
+          <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.LtName"></vEditDiv>
         </div>
       </div>
       <div class="featureHome-text-titleTwo">
-        <vEditDiv :canEdit='canEdit2' v-model="FeatureItem.dataObj.Title"></vEditDiv>
+        <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.Title"></vEditDiv>
       </div>
     </div>
     <div class="featureHome-left UpgradedVersion-Hover">
       <div class="featureHome-vToolBar-one absolute z-index3">
-        <FeatureControls
-        :index="index"
-        :FeatureData="FeatureItem"
-        :ControlsType="'row'"
-        :isDeletePage="FeatureItem.isDeletePage"
-        :pagesType="1"
-        @toAddPages="toAddPages"
-        @toDeletePages="toDeletePages">
+        <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'"
+          :isDeletePage="FeatureItem.isDeletePage" :pagesType="1" @toAddPages="toAddPages"
+          @toDeletePages="toDeletePages">
         </FeatureControls>
         <input type="file" style="display:none" :id="'homefile_'+(FeatureItem * 2 + 1) + '_0'" @change="uploadpic">
       </div>
@@ -37,19 +32,19 @@
         </template>
       </div>
       <div class="featureHome-left-two absolute z-index1" :style="{'background':TripColor}">
-        <vEditDiv :canEdit='canEdit3' v-model="FeatureItem.dataObj.DetailsName"></vEditDiv>
+        <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.DetailsName"></vEditDiv>
       </div>
       <div class="featureHome-Markers Markers absolute z-index1" :style="{'background':TripColor}"></div>
       <div class="featureHome-left-three absolute z-index2">
-        <vEditDiv :canEdit='canEdit4' v-model="FeatureItem.dataObj.MainDesc"></vEditDiv>
+        <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainDesc"></vEditDiv>
       </div>
     </div>
     <div class="featureHome-right">
       <div class="featureHome-right-text featureHome-right-one absolute z-index1">
-        <vEditDiv :canEdit='canEdit5' v-model="FeatureItem.dataObj.SubShadowName"></vEditDiv>
+        <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubShadowName"></vEditDiv>
       </div>
       <div class="featureHome-right-text featureHome-right-two absolute z-index1">
-        <vEditDiv :canEdit='canEdit6' v-model="FeatureItem.dataObj.ShadowName"></vEditDiv>
+        <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.ShadowName"></vEditDiv>
       </div>
       <div class="featureHome-right-three absolute z-index1">
         <div>
@@ -59,10 +54,10 @@
           <div class="featureHomeBjW1 featureHomeBj4 relative" :style="{'background':TripColor}">&nbsp;</div>
         </div>
         <div class="featureHome-three-text featureHome-three-textOne absolute">
-          <vEditDiv :canEdit='canEdit7' v-model="FeatureItem.dataObj.MainName"></vEditDiv>
+          <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainName"></vEditDiv>
         </div>
         <div class="featureHome-three-text featureHome-three-textTwo absolute">
-          <vEditDiv :canEdit='canEdit8' v-model="FeatureItem.dataObj.SubName"></vEditDiv>
+          <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.SubName"></vEditDiv>
         </div>
         <div>
           <div class="featureHomeBjH2 featureHomeBj5 relative" :style="{'background':TripColor}">&nbsp;</div>
@@ -99,17 +94,6 @@
     data() {
       return {
         canEdit: true,
-        canEdit1: true,
-        canEdit2: true,
-        canEdit3: true,
-        canEdit4: true,
-        canEdit5: true,
-        canEdit6: true,
-        canEdit7: true,
-        canEdit8: true,
-        name: '',
-        currentIndex: 0,
-        imgIndex: 0,
         //选取弹窗
         isShowScenicImg: false,
         choseType: 0,
@@ -161,13 +145,12 @@
         this.$emit('toDeletePages', this.index)
       },
       closeDMCchooseImg() {
-        this.isShowScenicImg = false
+        this.isShowScenicImg = false;
       },
       getDMCimg(selectImgArr) {
-        this.FeatureItem.dataObj.ImgList[0].url = selectImgArr[0].Path
-        this.isShowScenicImg = false
+        this.FeatureItem.dataObj.ImgList[0].url = selectImgArr[0].Path;
+        this.isShowScenicImg = false;
       }
-
     },
     computed: {},
     watch: {

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

@@ -10,14 +10,14 @@
         @toAddPages="AddPages" @toDeletePages="DeletePages"></featureHome>
       <!-- 其余页 -->
       <div v-else>
-          <headerTitle :FeatureItem="item" :TripColor="TripColor"></headerTitle>
-          <!-- 介绍、宿食景页 -->
-          <otherJourney :index="index" :FeatureItem="item" :TripColor="TripColor" @toAddPages="AddPages"
-            @toDeletePages="DeletePages" v-if="item.pageType!=1&&item.pageType!=3">
-          </otherJourney>
-          <!-- 食详情页 -->
-          <UpgradedVersionDetails :index="index" :FeatureData="item" :TripColor="TripColor" @toAddPages="AddPages"
-            @toDeletePages="DeletePages" v-if="item.pageType==3"></UpgradedVersionDetails>
+        <headerTitle :FeatureItem="item" :TripColor="TripColor"></headerTitle>
+        <!-- 介绍、宿食景页 -->
+        <otherJourney :index="index" :FeatureItem="item" :TripColor="TripColor" @toAddPages="AddPages"
+          @toDeletePages="DeletePages" v-if="item.pageType!=1&&item.pageType!=3">
+        </otherJourney>
+        <!-- 食详情页 -->
+        <UpgradedVersionDetails :index="index" :FeatureData="item" :TripColor="TripColor" @toAddPages="AddPages"
+          @toDeletePages="DeletePages" v-if="item.pageType==3"></UpgradedVersionDetails>
         <!-- otherJourney-footer 食景 食详情 -->
         <div v-if="item.pageType!=1"
           :class="{'otherJourney-footer':item.pageType==5||item.pageType==6||item.pageType==3}">
@@ -202,9 +202,6 @@
             }
             //详情页面
             else if (pItem.pageType == 3) {
-              if (tripObj.dinnerArray && tripObj.dinnerArray.length > 0) {
-
-              }
               var dinnerObj = {
                 MainName: "特色餐1",
                 ImgList: [{
@@ -213,9 +210,47 @@
                 MainDesc: "特色餐描述"
               };
 
-              newObj.SubList.push(dinnerObj);
-              newObj.SubList.push(dinnerObj);
-              newObj.SubList.push(dinnerObj);
+              if (tripObj.dinnerArray && tripObj.dinnerArray.length > 0) {
+                if (tripObj.dinnerArray.length == 1) {
+                  tripObj.dinnerArray.forEach(dItem => {
+                    var tempImaList=dItem.ImgList;
+                 
+                    newObj.SubList.push({
+                      MainName: dItem.MainName,
+                      ImgList: [{
+                        url: "http://imgfile.oytour.com/Upload/DMC/a2Fn2zajwMsxNHaWPdD5idKJD8RyCG5H.jpg"
+                      }],
+                      MainDesc: dItem.MainDesc
+                    });
+                  })
+                  newObj.SubList.push(dinnerObj);
+                  newObj.SubList.push(dinnerObj);
+                } else if (tripObj.dinnerArray.length == 2) {
+                  tripObj.dinnerArray.forEach(dItem => {
+                    newObj.SubList.push({
+                      MainName: dItem.MainName,
+                      ImgList: [{
+                        url: "http://imgfile.oytour.com/Upload/DMC/a2Fn2zajwMsxNHaWPdD5idKJD8RyCG5H.jpg"
+                      }],
+                      MainDesc: dItem.MainDesc
+                    });
+                  })
+                  newObj.SubList.push(dinnerObj);
+
+                } else if (tripObj.dinnerArray.length >= 3) {
+                  tripObj.dinnerArray.forEach((dItem, dIndex) => {
+                    if (dIndex <= 2) {
+                      newObj.SubList.push({
+                        MainName: dItem.MainName,
+                        ImgList: [{
+                          url: "http://imgfile.oytour.com/Upload/DMC/a2Fn2zajwMsxNHaWPdD5idKJD8RyCG5H.jpg"
+                        }],
+                        MainDesc: dItem.MainDesc
+                      });
+                    }
+                  })
+                }
+              }
             }
             //酒店
             else if (pItem.pageType == 4) {
@@ -261,10 +296,12 @@
                 newObj.MainDesc = "行程景点描述信息";
               }
             }
-            if(pItem.pageType == 4||pItem.pageType == 5||pItem.pageType == 6){
-              newObj.SubList = [
-                {url:''}, {url:''}
-              ]
+            if (pItem.pageType == 4 || pItem.pageType == 5 || pItem.pageType == 6) {
+              newObj.SubList = [{
+                url: ''
+              }, {
+                url: ''
+              }]
             }
             pItem.dataObj = newObj;
           });