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

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -15,6 +15,7 @@
             v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)">
             <img v-bind:src="item.imgUrl">
             <div>{{item.ckTitle}}</div>
+
           </div>
         </template>
       </div>
@@ -30,7 +31,9 @@
       <div v-if="CurrentUserInfo.RB_Group_id==QjGroupId()" class="ScraList">{{$t('sm.imgLongtips')}}</div>
       <div class="TFContent">
         <div class="TFconTitle">
-          <span>{{ckTitle}}</span>
+          <el-tooltip class="item" effect="dark" content="点击重新加载行程特色" placement="top-start">
+            <span style="cursor:pointer;" @click="ReLoadFeature()">{{ckTitle}}</span>
+          </el-tooltip>
           <div class="TFBTline"></div>
         </div>
         <div class="TFchildContent clearfix">
@@ -252,6 +255,13 @@
     created: function () {},
 
     methods: {
+      //重新加载行程特色
+      ReLoadFeature() {
+        if (this.$refs.UpgradedVersion != undefined) {
+          this.FeatureData.FeatureHtmlJson = '';
+          this.$refs.UpgradedVersion.initFeature(true)
+        }
+      },
       // 初始化行程特色
       init: function () {},
       // 行程特色删除区块

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

@@ -194,10 +194,14 @@
         };
         return detailsObj;
       },
-      initFeature() {
+      initFeature(isReload) {
         var oldJson = this.FeatureData.FeatureHtmlJson ?
           JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) :
           "";
+        if (isReload) {
+          console.log("重新更新行程特色");
+          oldJson = [];
+        }
         if (oldJson && oldJson.length > 0) {
           oldJson.forEach(item => {
             item.isDeletePage = true;