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

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

+<template>
+  <span :data-name="isLocked" class="edit_div" :contenteditable="canEdit" v-html="innerText" @focus="isLocked = true"
+    @blur="isLocked = false" @input="changeText">
+  </span>
+</template>
+<script>
+  export default {
+    props: ["value", "canEdit", "textLength"],
+    data() {
+      return {
+        innerText: this.value,
+        isLocked: false
+      };
+    },
+    watch: {
+      value() {
+        if (!this.isLocked || !this.innerText) {
+          this.$el.innerText = this.value;
+        }
+      }
+    },
+    methods: {
+      changeText: function () {
+        let sel = window.getSelection();
+        let offset = sel.anchorOffset;
+        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(() => {
+          try {
+            var range = sel.getRangeAt(0);
+            var textNode = range.startContainer;
+            range.setStart(textNode, offset);
+            sel.removeAllRanges();
+            sel.addRange(range);
+          } catch (err) {
+            console.warn(err);
+          }
+        }, 0);
+      },
+    }
+  };
+
+</script>
+
+<style>
+  .edit_div {}
+
+</style>

src/components/newTravelmanager/TravelGroupControl/quoTation2.vue

@@ -77,7 +77,7 @@
               </div>
             </td>
             <td rowspan="2">
-              <span class="bianji opbd" @click="goUrl('TravelManager2',item.ID,false)">
+              <span class="bianji opbd" @click="goUrl('TravelManager',item.ID,false)">
                 <el-tooltip class="item" effect="dark" content="行程修改" placement="top-start" popper-class="max-w250">
                   <i class="iconfont icon-bianji-smal"></i>
                 </el-tooltip>

src/components/newTravelmanager/travelLineTrip/components/travelDays.vue

@@ -52,32 +52,27 @@
           </div>
         </div>
         <div class="travelDaysContent">
-          <div class="travelDaysContent-text" v-for="(jindian,j) in item.ScenicArray" v-if="item.ScenicArray.length>0"
-            :key="j">
+          <template v-if="item.ScenicArray.length>0">
+            <div class="travelDaysContent-text" v-for="(jindian,j) in item.ScenicArray" :key="j">
               <span class="textBold">
                 【{{jindian.CouponsName}}】
               </span>
-            <span>
-              <vEditDiv :canEdit='canEdit' v-model="jindian.Description"></vEditDiv>
-            </span>
+              <vEditSpan :canEdit='canEdit' v-model="jindian.Description"></vEditSpan>
             </div>
+          </template>
           <div v-if="item.ScenicArray.length==0" class="travelDaysContent-text">
             <span class="textBold">
               <vEditDiv class="dayCouponsName" :canEdit='canEdit'
                 v-model="'【'+item.TrafficObj.trafficIntroduce.IntroduceTitle+'】'"></vEditDiv>
             </span>
-            <span>
-              <vEditDiv :canEdit='canEdit' v-model="item.TrafficObj.trafficIntroduce.IntroduceDetail"></vEditDiv>
-            </span>
+            <vEditSpan :canEdit='canEdit' v-model="item.TrafficObj.trafficIntroduce.IntroduceDetail"></vEditSpan>
           </div>
         </div>
-        <div class="travelDaysdetails-tsTextBox">
+        <div class="travelDaysdetails-tsTextBox"
+          v-if="item.WarmTipObj.Description&&getHtmlPlainText(item.WarmTipObj.Description).length>0">
           <div class="travelDaysdetails-tsText" :style="{'background':backgroundColor2}">
             <span class="travelDaysdetails-text0">温馨提示：</span>
-            <template v-if="item.WarmTipObj.Description&&getHtmlPlainText(item.WarmTipObj.Description).length>0">
-              <div v-html="item.WarmTipObj.Description"></div>
-            </template>
-            <template v-else>暂无提示</template>
+            <span v-html="item.WarmTipObj.Description"></span>
           </div>
         </div>
         <div class="travelDaysdetails">
@@ -150,12 +145,14 @@
 <script>
   import Header from "./header";
   import vEditDiv from "../../TravelGroupControl/TravelTemp/VEditDiv";
+  import vEditSpan from "../../TravelGroupControl/TravelTemp/VEditSpan";
   import FeatureControls from "../../TravelGroupControl/UpgradedVersion/components/featureControls";
   import DMCchooseImg from "../../../commonPage/DMCchooseImg.vue";
   import VueDraggableResizable from "vue-draggable-resizable";
   export default {
     components: {
       vEditDiv,
+      vEditSpan,
       Header,
       FeatureControls,
       DMCchooseImg,
@@ -350,9 +347,6 @@
               }
             });
           }
-          if (this.ScenicArrayList && this.ScenicArrayList.length > 0) this.ScenicArrayList.sort((a, b) => {
-            return a.Rank - b.Rank
-          })
           this.RenderingOk = true;
         },
         deep: true,