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

src/assets/css/UpgradedVersion.css

@@ -77,11 +77,11 @@
   overflow: hidden;
 }
 .UpgradedVersion-homebj{
-  background: url('http://192.168.10.214:8130/Upload/NewTripFeature/otherBjTwo.png')no-repeat center;
+  background: url('http://imgfile.oytour.com/Static/NewTripFeature/otherBjTwo.png')no-repeat center;
   background-size: 100% 100%;
 }
 .UpgradedVersion-introduceBj{
-  background: url('http://192.168.10.214:8130/Upload/NewTripFeature/otherBjTwo.png')no-repeat center;
+  background: url('http://imgfile.oytour.com/Static/NewTripFeature/otherBjTwo.png')no-repeat center;
   background-size: 100% 100%;
 }
 .UpgradedVersion-otherBj{

src/components/newTravelmanager/TravelGroupControl/TravelTemp/VEditDiv.vue

@@ -23,17 +23,21 @@
       changeText: function () {
         let sel = window.getSelection();
         let offset = sel.anchorOffset;
-        if (this.textLength&&this.$el.innerText.length > this.textLength) {
+        if (this.textLength && this.$el.innerText.length > this.textLength) {
           this.$el.innerText = this.$el.innerText.slice(0, this.textLength);
         }
         this.$emit("input", this.$el.innerText);
         setTimeout(() => {
-          var range = sel.getRangeAt(0);
-          var textNode = range.startContainer;
-          console.log("textNode",textNode.nodeName);
-          range.setStart(textNode, offset);
-          sel.removeAllRanges();
-          sel.addRange(range);
+          try {
+            var range = sel.getRangeAt(0);
+            var textNode = range.startContainer;
+            console.log("textNode", textNode.nodeName);
+            range.setStart(textNode, offset);
+            sel.removeAllRanges();
+            sel.addRange(range);
+          } catch (err) {
+            console.log(err);
+          }
         }, 0);
       }
     }

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

@@ -23,7 +23,7 @@
                 <img :src="item.ImgList[0].url" />
               </template>
               <template v-else>
-                <img src="http://192.168.10.214:8130/Upload/NewTripFeature/homeBj.png" />
+                <img src="http://imgfile.oytour.com/Static/NewTripFeature/homeBj.png" />
               </template>
             </div>
             <div class="UpgradedVersionDetails-detailsTop absolute"></div>
@@ -233,7 +233,7 @@
   .UpgradedVersionDetails-detailsTop {
     width: 40px;
     height: 56px;
-    background: url("http://192.168.10.214:8130/Upload/NewTripFeature/detailsTop.png") no-repeat center;
+    background: url("http://imgfile.oytour.com/Static/NewTripFeature/detailsTop.png") no-repeat center;
     background-size: 100% 100%;
     left: 136px;
     bottom: -84px;
@@ -246,20 +246,15 @@
   }
 
   .UpgradedVersionDetails-Img-one {
-    /* width: 72px;
-  height: 32px;
-  background: url("http://192.168.10.214:8130/Upload/NewTripFeature/one.png") no-repeat center;
-  background-size: 100% 100%; */
+ 
   }
 
   .UpgradedVersionDetails-two .UpgradedVersionDetails-Img-one {
-    /* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/two.png") no-repeat center;
-  background-size: 100% 100%; */
+ 
   }
 
   .UpgradedVersionDetails-three .UpgradedVersionDetails-Img-one {
-    /* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/three.png") no-repeat center;
-  background-size: 100% 100%; */
+ 
   }
 
   .UpgradedVersionDetails-num {
@@ -278,20 +273,17 @@
   .UpgradedVersionDetails-Img-two {
     width: 264px;
     height: 21px;
-    /* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/fooding.png") no-repeat center;
-  background-size: 100% 100%; */
+ 
     margin-top: 77px;
     margin-bottom: 20px;
   }
 
   .UpgradedVersionDetails-two .UpgradedVersionDetails-Img-two {
-    /* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/experience.png") no-repeat center;
-  background-size: 100% 100%; */
+ 
   }
 
   .UpgradedVersionDetails-three .UpgradedVersionDetails-Img-two {
-    /* background: url("http://192.168.10.214:8130/Upload/NewTripFeature/delicious.png") no-repeat center;
-  background-size: 100% 100%; */
+ 
   }
 
   .UpgradedVersionDetails-Img-two p {

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

@@ -64,15 +64,15 @@
       return {
         TemplateType: 1,
         TemplateList: [{
-            url: 'http://192.168.10.214:8130/Upload/NewTripFeature/featureTemplateOne.png',
+            url: 'http://imgfile.oytour.com/Static/NewTripFeature/featureTemplateOne.png',
             id: 1,
           },
           {
-            url: 'http://192.168.10.214:8130/Upload/NewTripFeature/featureTemplateTwo.png',
+            url: 'http://imgfile.oytour.com/Static/NewTripFeature/featureTemplateTwo.png',
             id: 2,
           },
           {
-            url: 'http://192.168.10.214:8130/Upload/NewTripFeature/featureTemplateThree.png',
+            url: 'http://imgfile.oytour.com/Static/NewTripFeature/featureTemplateThree.png',
             id: 3,
           }
         ]

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

@@ -166,9 +166,7 @@
     top: 827px;
     width: 154px;
     height: 155px;
-    /* background: url('http://192.168.10.214:8130/Upload/NewTripFeature/titleBj.png')no-repeat center;
-  background-size: 100% 100%; */
-    /* overflow: hidden; */
+ 
   }
 
   .UpgradedVersion-subIdeBj1 {
@@ -180,15 +178,7 @@
     border-radius: 100%;
   }
 
-  /* .UpgradedVersion-subIdeBj2{
-  right: 0;
-  left: 7px;
-  top: 10px;
-  width: 100%;
-  height: 100%;
-  border-radius: 50%;
-  background: black;
-} */
+ 
   .UpgradedVersion-subIdeBj-h {
     width: 109px;
     height: 71px;

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

@@ -327,8 +327,6 @@
   .featureHome-right-three {
     width: 143px;
     height: 747px;
-    /* background: url('http://192.168.10.214:8130/Upload/NewTripFeature/featureHomeTextBox.png')no-repeat center;
-  background-size: 100% 100%; */
     top: 240px;
     right: 42px;
   }

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

@@ -122,7 +122,6 @@
       },
       //添加页面
       AddPages(index, featureDataObj) {
- 
         var pageData = this.getPageObj();
         pageData.isDeletePage = true;
         pageData.pageType = featureDataObj.pageType;
@@ -153,7 +152,7 @@
           } else {
             newObj.DetailsName = "景点介绍";
             newObj.ImgList = [{
-              url: "http://imgfile.oytour.com//Static/NewTripFeature/homeBg1.jpg"
+              url: "http://imgfile.oytour.com//Static/NewTripFeature/homeBg2.jpg"
             }];
             newObj.MainDesc = "景点描述";
           }
@@ -184,10 +183,13 @@
         var oldJson = this.FeatureData.FeatureHtmlJson ?
           JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) :
           "";
-        console.log("oldJson", oldJson);
+
         if (oldJson && oldJson.length > 0) {
+          console.log("oldJson", oldJson);
           this.pageList = oldJson;
         } else {
+          var tripObj = this.getTripData();
+          console.log("tropObj", tripObj);
           this.pageList.forEach(pItem => {
             var newObj = this.getDetailsObj();
             newObj.LineName = this.FeatureData.LineName;
@@ -215,7 +217,7 @@
               } else {
                 newObj.DetailsName = "景点介绍";
                 newObj.ImgList = [{
-                  url: "http://imgfile.oytour.com//Static/NewTripFeature/homeBg1.jpg"
+                  url: "http://imgfile.oytour.com/Static/NewTripFeature/homeBg2.jpg"
                 }];
                 newObj.MainDesc = "景点描述";
               }
@@ -225,19 +227,28 @@
               newObj.MainName = "日本旅行专家";
               newObj.SubName = "『印象日本』日本豪华游代名词";
               newObj.ImgList = [{
-                url: "http://imgfile.oytour.com/Upload/DMC/a2Fn2zajwMsxNHaWPdD5idKJD8RyCG5H.jpg"
+                url: "http://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg"
               }];
               newObj.MainDesc = "描述信息";
             }
             //详情页面
             else if (pItem.pageType == 3) {
               var dinnerObj = {
-                MainName: "特色餐1",
+                MainName: "行程特色餐1",
                 ImgList: [{
-                  url: "http://imgfile.oytour.com/Upload/DMC/a2Fn2zajwMsxNHaWPdD5idKJD8RyCG5H.jpg"
+                  url: "http://imgfile.oytour.com/Static/NewTripFeature/dinner1.jpg"
                 }],
-                MainDesc: "特色餐描述"
+                MainDesc: "行程特色餐1描述"
               };
+              var dinnerObj2 = JSON.parse(JSON.stringify(dinnerObj));
+              dinnerObj2.MainName = "行程特色餐2";
+              dinnerObj2.ImgList[0].url = "http://imgfile.oytour.com/Static/NewTripFeature/dinner2.jpg"
+              dinnerObj2.MainDesc = "行程特色餐2描述";
+
+              var dinnerObj3 = JSON.parse(JSON.stringify(dinnerObj));
+              dinnerObj3.MainName = "行程特色餐3";
+              dinnerObj3.ImgList[0].url = "http://imgfile.oytour.com/Static/NewTripFeature/dinner3.jpg"
+              dinnerObj3.MainDesc = "行程特色餐3描述";
               if (tripObj.dinnerArray && tripObj.dinnerArray.length > 0) {
                 if (tripObj.dinnerArray.length > 2) {
                   tripObj.dinnerArray.forEach((dItem, dIndex) => {
@@ -261,8 +272,7 @@
                       MainDesc: dItem.MainDesc
                     });
                   })
-                  newObj.SubList.push(dinnerObj);
-
+                  newObj.SubList.push(dinnerObj2);
                 } else if (tripObj.dinnerArray.length > 0) {
                   tripObj.dinnerArray.forEach(dItem => {
                     var tempImaList = dItem.ImgList;
@@ -274,9 +284,13 @@
                       MainDesc: dItem.MainDesc
                     });
                   })
-                  newObj.SubList.push(dinnerObj);
-                  newObj.SubList.push(dinnerObj);
+                  newObj.SubList.push(dinnerObj2);
+                  newObj.SubList.push(dinnerObj3);
                 }
+              } else {
+                newObj.SubList.push(dinnerObj);
+                newObj.SubList.push(dinnerObj2);
+                newObj.SubList.push(dinnerObj3);
               }
             }
             //酒店
@@ -289,9 +303,14 @@
               } else {
                 newObj.MainName = "行程酒店";
                 newObj.ImgList = [{
-                  url: "https://imgfile.oytour.com/Upload/DMC/202305290204327370000000012.jpg"
+                  url: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg"
                 }];
                 newObj.MainDesc = "行程酒店描述信息";
+                newObj.SubList = [{
+                  url: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg"
+                }, {
+                  url: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg"
+                }];
               }
             } //餐
             else if (pItem.pageType == 5) {
@@ -303,9 +322,14 @@
               } else {
                 newObj.MainName = "行程餐食";
                 newObj.ImgList = [{
-                  url: "http://imgfile.oytour.com/Upload/DMC/Z4DbAPRPmBPkaJQyxwesEWAz3sbZadNj.jpg"
+                  url: "https://imgfile.oytour.com/Static/NewTripFeature/dinner4.jpg"
                 }];
                 newObj.MainDesc = "行程餐食描述";
+                newObj.SubList = [{
+                  url: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg"
+                }, {
+                  url: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg"
+                }];
               }
             }
             //景点
@@ -313,27 +337,26 @@
               newObj.SubName = "特色景点";
               if (tripObj.scenicArray && tripObj.scenicArray.length > 0) {
                 newObj.MainName = tripObj.scenicArray[0].MainName;
-                newObj.ImgList = tripObj.scenicArray[0].ImgList;
-                newObj.MainDesc = tripObj.scenicArray[0].MainDesc;
+                if (tripObj.scenicArray[0])
+                  newObj.ImgList =
+                  newObj.MainDesc = tripObj.scenicArray[0].MainDesc;
               } else {
                 newObj.MainName = "行程景点";
                 newObj.ImgList = [{
-                  url: "http://imgfile.oytour.com/Upload/DMC/20200201061804955.jpg"
+                  url: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg1.jpg"
                 }];
                 newObj.MainDesc = "行程景点描述信息";
+                newObj.SubList = [{
+                  url: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg"
+                }, {
+                  url: "https://imgfile.oytour.com/Static/NewTripFeature/homeBg3.jpg"
+                }];
               }
             }
-            if (pItem.pageType == 4 || pItem.pageType == 5 || pItem.pageType == 6) {
-              newObj.SubList = [{
-                url: ''
-              }, {
-                url: ''
-              }]
-            }
+
             pItem.dataObj = newObj;
           });
         }
-  
       },
       //获取行程信息
       getTripData() {
@@ -341,6 +364,7 @@
         var scenicArray = [];
         var hotelArray = [];
         var dinnerArray = [];
+        console.log("this.FeatureData.DayList", this.FeatureData.DayList);
         if (this.FeatureData && this.FeatureData.DayList && this.FeatureData.DayList.length > 0) {
           this.FeatureData.DayList.forEach(dItem => {
             //城市
@@ -379,10 +403,11 @@
                 }
               });
             }
+
             if (dItem.HotelArray && dItem.HotelArray.length > 0) {
               dItem.HotelArray.forEach(sItem => {
                 //排除“温馨的家”和“机场附近酒店”
-                if (sItem.HotelId != 1568 && sItem.HotelId != 2353) {
+                if (sItem.HotelId && sItem.HotelId > 0 && sItem.HotelId != 1568 && sItem.HotelId != 2353) {
                   var tempImgList = [];
                   if (sItem.ImaArray && sItem.ImaArray.length > 0) {
                     sItem.ImaArray.forEach(iItem => {

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

@@ -192,7 +192,7 @@
     top: 268px;
     width: 1054px;
     height: 643px;
-    background: url('http://192.168.10.214:8130/Upload/NewTripFeature/imgListBj.png')no-repeat center;
+    background: url('http://imgfile.oytour.com/Static/NewTripFeature/imgListBj.png')no-repeat center;
     background-size: 100% 100%;
   }