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

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -124,7 +124,6 @@
           </div>
           <!-- ppt 模版行程 -->
           <div v-if="FeatureData.FeatureType==9&&FeatureDataFlag">
-            <div style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div>
             <div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length>0">
               <template v-for="url in FeatureData.TripImageListNew">
                 <el-image
@@ -133,6 +132,7 @@
                 :preview-src-list="FeatureData.TripImageListNew"></el-image>
               </template>
             </div>
+            <div v-else style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div>
           </div>
         </div>
       </div>