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

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -813,8 +813,10 @@
                 }
                 //如果当前config配置主色就使用当前config配置的主色，没有配置，就取线路配置的主色
                 if (tempData.TripColor && tempData.TripColor != '') {
+                  this.PostConfig.TripColor=tempData.TripColor;
                   this.FeatureData.TripColor = tempData.TripColor;
                 } else if (tempData.LineTripColor && tempData.LineTripColor != '') {
+                  this.PostConfig.TripColor=tempData.LineTripColor;
                   this.FeatureData.TripColor = tempData.LineTripColor;
                 }
                 this.FeatureData.LtName = tempData.LtName;

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

@@ -78,11 +78,11 @@
     props: [
       'index',
       'TripColor',
-      'FeatureData'
+      'FeatureData',
+      'canEdit'
     ],
     data() {
       return {
-        canEdit: true,
         backgroundColor: null,
         subscriptText: [{
             Name: 'FOODING',
@@ -186,139 +186,5 @@
 </script>
 
 <style>
-  .UpgradedVersionDetails-form {
-    left: 0;
-    top: 301px;
+  @import url("../../../../assets/css/UpgradedVersion.css");
+</style>
\ No newline at end of file
-    right: 0;
-    padding: 43px 35px 0 35px;
-  }
-
-  .UpgradedVersionDetails-form-Box {
-    width: 100%;
-    height: 438px;
-    left: 0;
-    top: -40px;
-  }
-
-  .UpgradedVersionDetails-formBox1 {
-    top: 12px;
-  }
-
-  .UpgradedVersionDetails-imgbox {}
-
-  .UpgradedVersionDetails-img {
-    width: 332px;
-    height: 332px;
-    background: #fff;
-    border-radius: 50%;
-    padding: 10px;
-  }
-
-  .UpgradedVersionDetails-imgOne {
-    left: 0;
-    top: 0;
-    width: 312px;
-    height: 312px;
-    border-radius: 50%;
-    overflow: hidden;
-  }
-
-  .UpgradedVersionDetails-imgOne img {
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-  }
-
-  .UpgradedVersionDetails-detailsTop {
-    width: 40px;
-    height: 56px;
-    background: url("http://imgfile.oytour.com/Static/NewTripFeature/detailsTop.png") no-repeat center;
-    background-size: 100% 100%;
-    left: 136px;
-    bottom: -84px;
-  }
-
-  .UpgradedVersionDetails-Title {
-    width: 276px;
-    margin: 111px auto 44px;
-    padding: 0 26px;
-  }
-
-  .UpgradedVersionDetails-Img-one {
- 
-  }
-
-  .UpgradedVersionDetails-two .UpgradedVersionDetails-Img-one {
- 
-  }
-
-  .UpgradedVersionDetails-three .UpgradedVersionDetails-Img-one {
- 
-  }
-
-  .UpgradedVersionDetails-num {
-    height: 32px;
-    overflow: hidden;
-  }
-
-  .UpgradedVersionDetails-num span {
-    font-size: 76px;
-    font-weight: bold;
-    /* font-family: FZCuSong-B09S; */
-    left: 0;
-    top: -28px;
-  }
-
-  .UpgradedVersionDetails-Img-two {
-    width: 264px;
-    height: 21px;
- 
-    margin-top: 77px;
-    margin-bottom: 20px;
-  }
-
-  .UpgradedVersionDetails-two .UpgradedVersionDetails-Img-two {
- 
-  }
-
-  .UpgradedVersionDetails-three .UpgradedVersionDetails-Img-two {
- 
-  }
-
-  .UpgradedVersionDetails-Img-two p {
-    left: 0;
-    right: 0;
-    font-size: 24px;
-    font-weight: 500;
-  }
-
-  .UpgradedVersionDetails-T {
-    width: 276px;
-    height: 44px;
-    overflow: hidden;
-    font-size: 38px;
-    font-family: FZCuSong-B09S;
-    font-weight: 400;
-    color: #2A2A2A;
-    left: -7px;
-    bottom: -53px;
-  }
-
-  .UpgradedVersionDetails-T-two {
-    width: 276px;
-    height: 499px;
-    overflow: hidden;
-    font-size: 23px;
-    font-family: Microsoft YaHei;
-    font-weight: 400;
-    color: #444444;
-    line-height: 42px;
-  }
-
-  .UpgradedVersionDetails1 {
-    left: 16px;
-    top: 122px;
-  }
-
-</style>

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

@@ -126,74 +126,6 @@
   };
 
 </script>
-
 <style>
-  .featureControls {
-    opacity: 0;
-    transition: opacity 2s ease;
-    -webkit-transition: opacity 2s ease;
-    -moz-transition: opacity 2s ease;
-    -ms-transition: opacity 2s ease;
-    -o-transition: opacity 2s ease;
-  }
-
-  .featureControls-bottom {
-    font-size: 20px;
-    color: #fff;
-    cursor: pointer;
-    background: rgba(0, 0, 0, 0.7);
-    border-radius: 2px;
-  }
-
-  .featureControls-bottomOne {
-    padding: 1px 10px;
-  }
-
-  .featureControls-bottomTwo {
-    padding: 5px 0;
-  }
-
-  .featureControls-bottomOne div {
-    padding: 0 5px;
-  }
-
-  .featureControls-bottomTwo div {
-    padding: 5px;
-  }
-
-  .featureControls-Template {
-    width: 150px;
-    top: -5px;
-    left: 85px;
-    background: #fff;
-    border: 4px;
-  }
-
-  .featureControls-Template div {
-    padding: 0;
-  }
-
-  .Template-img {
-    background: #e6e6e6;
-    margin: 5px 8px;
-    border-radius: 4px;
-    overflow: hidden;
-    cursor: pointer;
-  }
-
-  .Template-img img {
-    width: 100%;
-    padding: 10px;
-    display: block;
-  }
-
-  .Template-imgSelect {
-    background: rgba(0, 0, 0, 0.7);
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    color: #e95252;
-  }
-
+  @import url("../../../../../assets/css/UpgradedVersion.css");
 </style>

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

@@ -19,11 +19,11 @@
     },
     props: [
       'TripColor',
-      'FeatureItem'
+      'FeatureItem',
+      'canEdit'
     ],
     data() {
-      return {
-        canEdit: true,
+      return {    
         backgroundImgBj2: 'http://imgfile.oytour.com/Static/NewTripFeature/logoBjTwo.png', //白色背景
       };
     },
@@ -39,51 +39,5 @@
 
 </script>
 <style>
-  .UpgradedVersion-header {
-    top: 0;
-    left: 0;
-    right: 0;
-  }
-
-  .UpgradedVersion-header-left {
-    width: 341px;
-    height: 65px;
-    border-radius: 0px 0px 18px 0px;
-    position: relative;
-  }
-
-  .header-leftImg {
-    width: 292px;
-    height: auto;
-    display: block;
-    margin-left: 19px;
-  }
-
-  .header-leftBj {
-    left: 314px;
-    top: 0;
-    width: 27px;
-    height: 100%;
-    background-size: 100% 100%;
-  }
-
-  .UpgradedVersion-header-title {
-    padding: 12px 19px 10px 19px;
-    margin-right: 53px;
-    margin-top: 20px;
-    border: 2px dashed #000;
-    border-radius: 14px;
-    -webkit-border-radius: 14px;
-    -moz-border-radius: 14px;
-    -ms-border-radius: 14px;
-    -o-border-radius: 14px;
-  }
-
-  .UpgradedVersion-header .edit_div {
-    font-size: 38px;
-    font-weight: 400;
-    font-family: FZCuSong-B09S;
-    color: #2A2A2A;
-  }
-
+  @import url("../../../../../assets/css/UpgradedVersion.css");
 </style>

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

@@ -19,11 +19,11 @@
     },
     props: [
       'TripColor',
-      'FeatureItem'
+      'FeatureItem',
+      'canEdit'
     ],
     data() {
       return {
-        canEdit: true,
         backgroundColor: null
       };
     },
@@ -48,47 +48,6 @@
 </script>
 
 <style>
-  .UpgradedVersion-headerTitle {
-    text-align: center;
-  }
-
-  .UpgradedVersion-headerTitle-one {
-    top: 139px;
-    left: 124px;
-    right: 124px;
-    height: 53px;
-    font-size: 49px;
-    font-family: FZCuSong-B09S;
-    font-weight: 400;
-    color: #2A2A2A;
-  }
-
-  .UpgradedVersion-headerTitle-two {
-    top: 205px;
-    left: 144px;
-    right: 144px;
-    font-size: 34px;
-    font-family: Microsoft YaHei;
-    font-weight: 400;
-    color: #2A2A2A;
-  }
-
-  .UpgradedVersion-headerTitle-one .edit_div,
-  .UpgradedVersion-headerTitle-two .edit_div {
-    white-space: nowrap;
-    overflow: hidden;
-  }
-
-  .UpgradedVersion-headerTitle-two .edit_div {
-    height: 40px;
-  }
-
-  .UpgradedVersion-headerTitle-three {
-    top: 237px;
-    left: 370px;
-    width: 379px;
-    height: 14px;
-    border-radius: 7px;
-  }
+  @import url("../../../../../assets/css/UpgradedVersion.css");
 
 </style>

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

@@ -65,7 +65,9 @@
                   :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
                   @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
               </div>
-              <img v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList" :src="FeatureData.dataObj.SubList[0].url" />
+              <template v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>0">
+                <img :src="FeatureData.dataObj.SubList[0].url" />
+              </template>
             </div>
           </div>
         </div>
@@ -79,7 +81,9 @@
                   :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
                   @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
               </div>
-              <img v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList" :src="FeatureData.dataObj.SubList[1].url" />
+              <template v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>1 ">
+                <img :src="FeatureData.dataObj.SubList[1].url" />
+              </template>
             </div>
           </div>
         </div>
@@ -159,299 +163,5 @@
 </script>
 
 <style>
-  .UpgradedVersion-subIde {}
-
-  .UpgradedVersion-subIdeBj {
-    left: 72px;
-    top: 827px;
-    width: 154px;
-    height: 155px;
- 
-  }
-
-  .UpgradedVersion-subIdeBj1 {
-    right: 7px;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    border-radius: 100%;
-  }
-
- 
-  .UpgradedVersion-subIdeBj-h {
-    width: 109px;
-    height: 71px;
-    overflow: hidden;
-    left: 22px;
-    top: 41px;
-    text-align: center;
-  }
-
-  .UpgradedVersion-otherSubheading .UpgradedVersion-subIdeBj-h {
-    width: 54px;
-    height: 71px;
-    left: 34px;
-    top: 20px;
-  }
-
-  .UpgradedVersion-otherSubheading .UpgradedVersion-subIdeBj {
-    left: 85px;
-    top: 840px;
-    width: 120px;
-    height: 120px;
-  }
-
-  .UpgradedVersion-subIdeBj .edit_div {
-    font-size: 53px;
-    font-family: Microsoft YaHei;
-    font-weight: bold;
-    color: #FFFFFF;
-  }
-
-  .UpgradedVersion-titleIcon {
-    width: 64px;
-    height: 28px;
-    left: 242px;
-    top: 748px;
-  }
-
-  .UpgradedVersion-otherSubheading .UpgradedVersion-titleIcon {
-    left: 236px;
-    top: 784px;
-  }
-
-  .UpgradedVersion-subIdeText-box {}
-
-  .UpgradedVersion-subIdeText {
-    width: 240px;
-    left: 237px;
-    top: 944px;
-    right: 350px;
-    height: 38px;
-    overflow: hidden;
-    font-size: 30px;
-    font-family: Microsoft YaHei;
-    font-weight: 400;
-    color: #2A2A2A;
-  }
-
-  .UpgradedVersion-subIdeTitle {
-    left: 67px;
-    top: 1001px;
-    right: 683px;
-  }
-
-  .UpgradedVersion-subIdeTitleBj {
-    width: 233px;
-    height: 234px;
-    /* background: #D23181; */
-    opacity: 0.2;
-    border-radius: 50%;
-    left: -24px;
-    top: -92px;
-  }
-
-  .UpgradedVersion-sT {
-    width: 354px;
-    left: 18px;
-    top: -230px;
-  }
-
-  .UpgradedVersion-sTL {
-    width: 17px;
-    height: 100%;
-    line-height: 62px;
-    /* background: #CC0066; */
-    border-radius: 9px;
-  }
-
-  .UpgradedVersion-sTR {
-    font-size: 45px;
-    font-family: FZCuSong-B09S;
-    font-weight: 400;
-    color: #2A2A2A;
-  }
-
-  .UpgradedVersion-sTR-h {
-    min-height: 60px;
-    max-height: 115px;
-    overflow: hidden;
-  }
-
-  .UpgradedVersion-sTR .edit_div {
-    padding: 8px 0;
-  }
-
-  .UpgradedVersion-subIdeImgBox {
-    top: 1008px;
-    right: 0;
-    width: 476px;
-    height: 39px;
-    overflow: hidden;
-    border-top-left-radius: 19px;
-    border-bottom-left-radius: 19px;
-  }
-
-  .subIdeImgBox .UpgradedVersion-subIdeImgBox {
-    top: 1062px;
-    width: 598px;
-  }
-
-  .UpgradedVersion-subIdeImgBox div {
-    height: 39px;
-  }
-
-  .UpgradedVersion-subIdeImgBoxL {
-    width: 44px;
-    flex-shrink: 0;
-  }
-
-  .UpgradedVersion-subIdeImgBoxL img {
-    width: 44px;
-    height: 1005;
-  }
-
-  .UpgradedVersion-subIdeImgBoxR {
-    margin-left: 12px;
-    flex-grow: 1;
-    /* background: #CC0066; */
-  }
-
-  .UpgradedVersion-subIdeImgForm1 {
-    top: 919px;
-    right: 81px;
-    width: 351px;
-    height: 207px;
-    overflow: hidden;
-    border-radius: 25px;
-    background: #ECF6FB;
-    padding: 10px;
-  }
-
-  .UpgradedVersion-subIdeImgForm1.subIdeImgForm2 {
-    left: 569px;
-    top: 933px;
-    right: 74px;
-    width: 270px;
-    height: 207px;
-  }
-
-  .UpgradedVersion-subIdeImgForm1.subIdeImgForm2-two {
-    left: 770px;
-    top: 843px;
-    right: 84px;
-    width: 270px;
-    height: 207px;
-  }
-
-  .UpgradedVersion-subIdeImgForm1.subIdeImgForm3 {
-    left: 569px;
-    top: 933px;
-    right: 74px;
-    width: 198px;
-    height: 207px;
-  }
-
-  .UpgradedVersion-subIdeImgForm1.subIdeImgForm3-two {
-    left: 787px;
-    top: 933px;
-    right: 84px;
-    width: 270px;
-    height: 207px;
-  }
-
-  .subIdeImgBox1 {
-    left: 0;
-    top: 0;
-  }
-
-  .subIdeImg1 {
-    height: 187px;
-    border-radius: 14px;
-    overflow: hidden;
-  }
-
-  .subIdeImg1relative {
-    left: 0px;
-    top: 0px;
-    width: 100%;
-    height: 100%;
-  }
-
-  .subIdeImg1relative img {
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-  }
-
-  .subIdeImgForm1Box {
-    left: 0;
-    top: 0;
-  }
-
-  .subIdeImgFormRelative {
-    width: 478px;
-    height: 214px;
-    left: 647px;
-    top: 911px;
-  }
-
-  .subIdeImgFormRelative2 {
-    width: 478px;
-    height: 295px;
-    left: 526px;
-    top: 843px;
-  }
-
-  .subIdeImgFormRelative3 {
-    height: 198px;
-    left: 526px;
-    top: 944px;
-  }
-
-  .subIdeImgForm2Box {
-    left: 0px;
-    top: 20px;
-  }
-
-  .subIdeImgForm2Box2 {
-    left: 0px;
-    top: 99px;
-  }
-
-  .subIdeImgForm2Box3 {
-    left: 0px;
-    top: 0;
-  }
-
-  .UpgradedVersion-intTitle {
-    text-align: center;
-  }
-
-  .UpgradedVersion-intTitle-one {
-    top: 944px;
-    left: 300px;
-    right: 300px;
-    height: 70px;
-    overflow: hidden;
-    font-size: 60px;
-    font-family: FZCuSong-B09S;
-    font-weight: 400;
-    color: #2A2A2A;
-  }
-
-  .UpgradedVersion-intTitle-two {
-    top: 1046px;
-    left: 200px;
-    right: 200px;
-    height: 50px;
-    overflow: hidden;
-    font-size: 42px;
-    font-family: Microsoft YaHei;
-    font-weight: bold;
-    color: #2A2A2A;
-  }
-
+  @import url("../../../../../assets/css/UpgradedVersion.css");
 </style>

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

@@ -90,10 +90,10 @@
       'TripColor',
       'index',
       'FeatureItem',
+      'canEdit',
     ],
     data() {
       return {
-        canEdit: true,
         //选取弹窗
         isShowScenicImg: false,
         choseType: 0,
@@ -166,247 +166,8 @@
 
     }
   };
-
 </script>
 
 <style>
-  .featureHome-form {}
-
-  .featureHome-text {
-    left: 0;
-    top: 99px;
-    right: 0;
-    padding: 0 0 0 83px;
-  }
-
-  .featureHome-text .edit_div {}
-
-  .featureHome-text-title {
-    height: 80px;
-    overflow: hidden;
-    font-size: 66px;
-    font-family: FZCuSong-B09S;
-    font-weight: 400;
-    color: #2A2A2A;
-    padding: 0 280px 0 0;
-  }
-
-  .featureHome-text-box {
-    margin: 17px 440px 22px 0;
-    overflow: hidden;
-  }
-
-  .featureHome-text-box-sod {
-    width: auto;
-    max-width: 100%;
-    height: 70px;
-    /* border: 2px solid #CC0066; */
-    display: inline-block;
-    overflow: hidden;
-    padding: 8px 14px;
-  }
-
-  .featureHome-text-box .edit_div {
-    font-size: 45px;
-    font-family: FZCuSong-B09S;
-    font-weight: bold;
-    /* color: #CC0066; */
-  }
-
-  .featureHome-text-titleTwo {
-    height: 46px;
-    overflow: hidden;
-    font-size: 34px;
-    font-family: Microsoft YaHei;
-    font-weight: 300;
-    color: #2A2A2A;
-    padding: 0 440px 0 0;
-  }
-
-  .featureHome-left {
-    width: 784px;
-  }
-
-  .featureHome-vToolBar-one {
-    top: 340px;
-    left: 0;
-  }
-
-  .featureHome-vToolBar-two {
-    top: 425px;
-    left: -30px;
-  }
-
-  .featureHome-left-one {
-    width: 697px;
-    height: 930px;
-    bottom: 290px;
-    left: 0;
-  }
-
-  .featureHome-left-one img {
-    width: 100%;
-    height: 100%;
-    display: block;
-  }
-
-  .featureHome-right {
-    width: 339px;
-  }
-
-  .featureHome-left-two {
-    width: 126px;
-    /* background: #CC0066; */
-    bottom: 267px;
-    right: 339px;
-    padding: 47px 0 47px 58px;
-  }
-
-  .featureHome-left-two .edit_div {
-    height: 540px;
-    overflow: hidden;
-    font-size: 45px;
-    font-family: FZCuSong-B09S;
-    font-weight: 400;
-    color: #FFFFFF;
-  }
-
-  .featureHome-left-three {
-    height: 167px;
-    overflow: hidden;
-    left: 85px;
-    right: 338px;
-    top: 1368px;
-    bottom: 53px;
-    font-size: 30px;
-    font-family: Microsoft YaHei;
-    font-weight: 400;
-    color: #444444;
-    line-height: 53px;
-  }
-
-  .featureHome-Markers {
-    left: 75px;
-    top: 1372px;
-  }
-
-  .Markers {
-    width: 23px;
-    height: 23px;
-    /* background: #CC0066; */
-    border-radius: 50%;
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
-    -ms-border-radius: 50%;
-    -o-border-radius: 50%;
-  }
-
-  .featureHome-right-text .edit_div {
-    width: 60px;
-    font-size: 60px;
-    font-family: Microsoft YaHei;
-    font-weight: bold;
-    color: #2A2A2A;
-    opacity: 0.1;
-  }
-
-  .featureHome-right-one {
-    height: 790px;
-    overflow: hidden;
-    right: 256px;
-    bottom: 53px;
-  }
-
-  .featureHome-right-two {
-    height: 632px;
-    overflow: hidden;
-    top: 564px;
-    right: 181px;
-  }
-
-  .featureHome-right-three {
-    width: 143px;
-    height: 747px;
-    top: 240px;
-    right: 42px;
-  }
-
-  .featureHomeBjH1 {
-    width: 7px;
-    height: 18px;
-  }
-
-  .featureHomeBjW1 {
-    width: 25px;
-    height: 7px;
-  }
-
-  .featureHomeBjH2 {
-    width: 7px;
-    height: 27px;
-  }
-
-  .featureHomeBjW2 {
-    width: 25px;
-    height: 7px;
-  }
-
-  .featureHomeBj2 {
-    left: 7px;
-    top: -18px;
-  }
-
-  .featureHomeBj3 {
-    left: 134px;
-    top: -25px;
-  }
-
-  .featureHomeBj4 {
-    left: 109px;
-    top: -43px;
-  }
-
-  .featureHomeBj5 {
-    left: 0;
-    top: 668px;
-  }
-
-  .featureHomeBj6 {
-    left: 7px;
-    top: 661px;
-  }
-
-  .featureHomeBj7 {
-    left: 134px;
-    top: 634px;
-  }
-
-  .featureHomeBj8 {
-    left: 109px;
-    top: 627px;
-  }
-
-  .featureHome-three-text .edit_div {
-    width: 34px;
-    line-height: 50px;
-    font-size: 34px;
-    font-family: Microsoft YaHei;
-    font-weight: bold;
-    color: #2A2A2A;
-  }
-
-  .featureHome-three-textOne {
-    height: 600px;
-    overflow: hidden;
-    top: 93px;
-    left: 24px;
-  }
-
-  .featureHome-three-textTwo {
-    height: 650px;
-    overflow: hidden;
-    top: 22px;
-    right: 31px;
-  }
-
+  @import url("../../../../assets/css/UpgradedVersion.css");
 </style>

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

@@ -13,8 +13,7 @@
       </div>
       <div class="MasterMapList-box-two absolute z-index3">
         <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'column'"
-          :isUploadImg="FeatureItem.pageType==2?true:false" :isSelectImg="FeatureItem.pageType==2?true:false"
-          :isAddImg="FeatureItem.pageType==2?false:
+          :isUploadImg="FeatureItem.pageType==2?true:false" :isSelectImg="FeatureItem.pageType==2?true:false" :isAddImg="FeatureItem.pageType==2?false:
           FeatureItem.pageType!=2&&FeatureItem.dataObj.ImgList
           &&FeatureItem.dataObj.ImgList.length!=9?true:false" :isDeleteImg="false" @toUploadImg="UploadImg"
           @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></FeatureControls>
@@ -22,15 +21,16 @@
     </div>
     <!-- 上传主图文件 -->
     <input type="file" style="display:none" :id="'MasterMapfile_'+(index * 2 + 1)" @change="uploadpic">
-    <MasterMapList :index="index" :FeatureData="FeatureItem.dataObj" :pageType="FeatureItem.pageType" @toUploadImg="UploadImg" @toSelectImg="SelectImg"
-      @toAddImg="AddImg" @toDeleteImg="DeleteImg"></MasterMapList>
+    <MasterMapList :index="index" :FeatureData="FeatureItem.dataObj" :pageType="FeatureItem.pageType"
+      @toUploadImg="UploadImg" @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></MasterMapList>
     <!-- 副标题 -->
 
     <subheading :Template="FeatureItem.pageTemplate" :index="index" :FeatureData="FeatureItem" :TripColor="TripColor"
       @toUploadImg="UploadImg" @toSelectImg="SelectImg" @setTemplate="setTemplate"></subheading>
 
     <!-- otherJourney-otherDetails 宿、食 景详情 -->
-    <div :class="[FeatureItem.pageType==4||FeatureItem.pageType==5||FeatureItem.pageType==6?'otherJourney-otherDetails':'']">
+    <div
+      :class="[FeatureItem.pageType==4||FeatureItem.pageType==5||FeatureItem.pageType==6?'otherJourney-otherDetails':'']">
       <div class="otherJourney-details absolute z-index1">
         <vEditDiv :canEdit='canEdit' v-model="FeatureItem.dataObj.MainDesc"></vEditDiv>
       </div>
@@ -61,31 +61,30 @@
     props: [
       'TripColor',
       'index',
-      'FeatureItem'
+      'FeatureItem',
+      'canEdit'
     ],
     data() {
       return {
-        canEdit: true,
-        canEdit1: true,
         isShowScenicImg: false,
         choseType: 0,
         queryItem: {
           queryName: '',
           queryId: 0,
         },
-        MasterMapIndex: null,//主图下标
-        StencilDrawing: false,//是否是模版图
+        MasterMapIndex: null, //主图下标
+        StencilDrawing: false, //是否是模版图
       };
     },
 
     methods: {
-      UploadImg(index,type) {
-        this.MasterMapIndex = index?index:0
-        if(type) this.StencilDrawing = true
+      UploadImg(index, type) {
+        this.MasterMapIndex = index ? index : 0
+        if (type) this.StencilDrawing = true
         else this.StencilDrawing = false
-        if(this.FeatureItem.pageType==2){
+        if (this.FeatureItem.pageType == 2) {
           document.querySelector(`#introducefile_${(this.index * 2 + 1)}_0`).click();
-        }else{
+        } else {
           document.querySelector(`#MasterMapfile_${(this.index * 2 + 1)}`).click();
         }
       },
@@ -102,9 +101,9 @@
             that.uploadSelfBlob(path, newArr, x => {
               let allPath = that.domainManager().ViittoFileUrl + x.data.FilePath;
               let i = e.target.id.split("_")[2];
-              if(that.StencilDrawing){
+              if (that.StencilDrawing) {
                 that.FeatureItem.dataObj.SubList[that.MasterMapIndex].url = allPath
-              }else{
+              } else {
                 that.FeatureItem.dataObj.ImgList[that.MasterMapIndex].url = allPath
               }
             });
@@ -112,30 +111,30 @@
           reader.readAsDataURL(e.target.files[0]);
         }
       },
-      SelectImg(index,type) {
-        this.MasterMapIndex = index?index:0
-        if(type) this.StencilDrawing = true
+      SelectImg(index, type) {
+        this.MasterMapIndex = index ? index : 0
+        if (type) this.StencilDrawing = true
         else this.StencilDrawing = false
-        if(this.FeatureItem.pageType==3) this.choseType = 2
-        else if(this.FeatureItem.pageType==4) this.choseType = 1
-        else if(this.FeatureItem.pageType==5) this.choseType = 2
-        else if(this.FeatureItem.pageType==6) this.choseType = 3
+        if (this.FeatureItem.pageType == 3) this.choseType = 2
+        else if (this.FeatureItem.pageType == 4) this.choseType = 1
+        else if (this.FeatureItem.pageType == 5) this.choseType = 2
+        else if (this.FeatureItem.pageType == 6) this.choseType = 3
         else this.choseType = 0
         this.isShowScenicImg = true
       },
       AddImg() {
         let obj = {
-          url:''
+          url: ''
         }
         this.FeatureItem.dataObj.ImgList.push(obj)
       },
-      DeleteImg(index,type) {
-        if(type) this.StencilDrawing = true
+      DeleteImg(index, type) {
+        if (type) this.StencilDrawing = true
         else this.StencilDrawing = false
-        if(this.StencilDrawing){
-          this.FeatureItem.dataObj.SubList.splice(index,1)
-        }else{
-          this.FeatureItem.dataObj.ImgList.splice(index,1)
+        if (this.StencilDrawing) {
+          this.FeatureItem.dataObj.SubList.splice(index, 1)
+        } else {
+          this.FeatureItem.dataObj.ImgList.splice(index, 1)
         }
       },
       toAddPages() {
@@ -152,32 +151,17 @@
       },
       getDMCimg(selectImgArr) {
         let Path = selectImgArr[0].Path
-        if(this.StencilDrawing){
+        if (this.StencilDrawing) {
           this.FeatureItem.dataObj.SubList[this.MasterMapIndex].url = Path
-        }else{
+        } else {
           this.FeatureItem.dataObj.ImgList[this.MasterMapIndex].url = Path
         }
         this.isShowScenicImg = false
       }
-
-
     },
     computed: {},
     watch: {
-      FeatureData: {
-        handler(val, oldVal) {
-
-        },
-        deep: true,
-        immediate: true
-      },
-      MasterMapIndex:{
-        handler(val,oldVal){
 
-        },
-        deep: true,
-        immediate: true
-      }
     },
     mounted() {
 
@@ -187,124 +171,6 @@
 </script>
 
 <style>
-  .MasterMapList-form {
-    left: 33px;
-    top: 268px;
-    width: 1054px;
-    height: 643px;
-    background: url('http://imgfile.oytour.com/Static/NewTripFeature/imgListBj.png')no-repeat center;
-    background-size: 100% 100%;
-  }
-
-  .MasterMapList-box {
-    width: 1019px;
-    height: 577px;
-    margin-left: 18px;
-    margin-top: 34px;
-    /* background: ##E8E8E8; */
-    border-radius: 14px;
-    overflow: hidden;
-  }
-
-  .MasterMapList-boxRelative {
-    width: 100%;
-    height: 684px;
-    left: 0px;
-    top: 251px;
-  }
-
-  .MasterMapList-box-one {
-    left: 0px;
-    top: -10px;
-  }
-
-  .MasterMapList-box-two {
-    left: -31px;
-    top: 104px;
-  }
-
-  .MasterMapList-2 .MasterMapList-1 {
-    border-radius: 14px;
-    overflow: hidden;
-  }
-
-  .MasterMapList-1,
-  .MasterMapList-2,
-  .MasterMapList-3,
-  .MasterMapList-4,
-  .MasterMapList-4,
-  .MasterMapList-8 {
-    left: 0px;
-    top: 0px;
-    width: 100%;
-    height: 100%;
-  }
-
-  .MasterMapList-1 img {
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-  }
-
-  .MasterMapList-4 .MasterMapList-2 {
-    height: 279px;
-  }
-
-  .MasterMapList-3 .MasterMapList-1,
-  .MasterMapList-4 .MasterMapList-1,
-  .MasterMapList-8 .MasterMapList-1 {
-    border-radius: 14px;
-    overflow: hidden;
-  }
-
-  .MasterMapList-8-oneL {
-    width: 776px;
-    height: 427px;
-  }
-
-  .MasterMapList-5 .MasterMapList-8-oneL,
-  .MasterMapList-6 .MasterMapList-8-oneL,
-  .MasterMapList-5 .MasterMapList-8-oneR,
-  .MasterMapList-6 .MasterMapList-8-oneR {
-    width: 504px;
-    height: 577px;
-  }
-
-  .MasterMapList-7 .MasterMapList-8-oneL {
-    width: 704px;
-    height: 577px;
-  }
-
-  .MasterMapList-8-oneR {
-    width: 240px;
-  }
-
-  .MasterMapList-7 .MasterMapList-8-oneR {
-    width: 332px;
-    height: 577px;
-  }
-
-  .MasterMapList-8-two .MasterMapList-8-oneR {
-    width: 100%;
-    height: 136px;
-  }
-
-  .otherJourney-details {
-    top: 1137px;
-    left: 70px;
-    right: 70px;
-    height: 330px;
-    overflow: hidden;
-    font-size: 23px;
-    font-family: Microsoft YaHei;
-    font-weight: 400;
-    color: #444444;
-    line-height: 42px;
-  }
-
-  .otherJourney-otherDetails .otherJourney-details {
-    top: 1164px;
-  }
+  @import url("../../../../assets/css/UpgradedVersion.css");
 
 </style>