页面修改

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

@@ -28,9 +28,13 @@
           var range = sel.getRangeAt(0);
           if (range) {
             var textNode = range.startContainer;
-            range.setStart(textNode, offset)
-            sel.removeAllRanges()
-            sel.addRange(range)
+            if (textNode) {
+              range.setStart(textNode, offset)
+            }
+            if (sel) {
+              sel.removeAllRanges()
+              sel.addRange(range)
+            }
           }
         }, 0)
       }

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

@@ -214,38 +214,47 @@
             }
             //酒店 
             else if (pItem.pageType == 4) {
+              newObj.SubName = "特色酒店";
               if (tripObj.hotelArray && tripObj.hotelArray.length > 0) {
                 newObj.MainName = tripObj.hotelArray[0].MainName;
-                newObj.SubName = "特色酒店";
                 newObj.ImgList = tripObj.hotelArray[0].ImgList;
                 newObj.MainDesc = tripObj.hotelArray[0].MainDesc;
               } else {
-                newObj.MainName = "富士山花园酒店";
-                newObj.SubName = "特色酒店";
+                newObj.MainName = "默认酒店";
                 newObj.ImgList = [{
                   url: "https://imgfile.oytour.com/Upload/DMC/202305290204327370000000012.jpg"
                 }];
-                newObj.MainDesc = "新大谷INN东京位于山手线大崎车站徒步一分钟，离品川，涉谷，原宿，都非常近，方便购物 观光，酒店房间干净 舒适，";
+                newObj.MainDesc = "默认酒店描述信息";
               }
             } //餐 
             else if (pItem.pageType == 5) {
-              
-              newObj.MainName = "箱根湖畔日式料理";
               newObj.SubName = "特色餐食";
-              newObj.ImgList = [{
-                url: "http://imgfile.oytour.com/Upload/DMC/Z4DbAPRPmBPkaJQyxwesEWAz3sbZadNj.jpg"
-              }];
-              newObj.MainDesc = "箱根湖畔日式料理箱根湖畔日式料理箱根湖畔日式料理箱根湖畔日式料理箱根湖畔日式料理箱根湖畔日式料理箱根湖畔日式料理";
+              if (tripObj.dinnerArray && tripObj.dinnerArray.length > 0) {
+                newObj.MainName = tripObj.dinnerArray[0].MainName;
+                newObj.ImgList = tripObj.dinnerArray[0].ImgList;
+                newObj.MainDesc = tripObj.dinnerArray[0].MainDesc;
+              } else {
+                newObj.MainName = "默认餐食";
+                newObj.ImgList = [{
+                  url: "http://imgfile.oytour.com/Upload/DMC/Z4DbAPRPmBPkaJQyxwesEWAz3sbZadNj.jpg"
+                }];
+                newObj.MainDesc = "默认餐食描述";
+              }
             }
             //景点 
             else if (pItem.pageType == 6) {
-              newObj.MainName = "东京秋叶原动漫.电器";
               newObj.SubName = "特色景点";
-              newObj.ImgList = [{
-                url: "http://imgfile.oytour.com/Upload/DMC/20200201061804955.jpg"
-              }];
-              newObj.MainDesc =
-                "秋叶原是与时代尖端产业同步的电器大街，亦是目前世界上数一数二的电子科技街，集和了各种世界尖端科技产品，以及动漫商店，是许多年轻游客赴日必到的景点之一。秋叶原动漫大道这里可以说是动漫控们的天堂，因为不仅仅可以看到原汁原味的日本萌妹子化装成各种动漫造型，你也可以购买动漫人物的各种Q版造型，这条街上随处可见这种COS造型";
+              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;
+              } else {
+                newObj.MainName = "默认景点";
+                newObj.ImgList = [{
+                  url: "http://imgfile.oytour.com/Upload/DMC/20200201061804955.jpg"
+                }];
+                newObj.MainDesc = "默认景点描述信息";
+              }
             }
             pItem.dataObj = newObj;
           });
@@ -329,9 +338,13 @@
                       });
                     })
                   }
+                  var description = "暂无描述";
+                  if (sItem.Description && sItem.Description != '') {
+                    description = sItem.Description;
+                  }
                   var dObj = {
                     MainName: sItem.DinnerName,
-                    MainDesc: sItem.Description,
+                    MainDesc: description,
                     ImgList: tempImgList,
                     SourceType: 5
                   };