修改

src/components/Hotel/GnHotelInfo.vue

@@ -139,7 +139,7 @@
                 </div>
                 <div>
                   <el-tabs>
-                    <el-tab-pane v-for="(subItem,subIndex) in addMsg.InnerHotelImaList" :key="subIndex" :label="subItem.Label">
+                    <el-tab-pane v-for="(subItem,subIndex) in addMsg.InnerHotelImaList" :key="subIndex" :label="subItem.Label==''?'酒店图片':subItem.Label">
                       <div class="InnerHotelDiv">
                         <div class="InnerHoImgDiv" v-for="(sItem,sIndex) in subItem.ImgList" :key="sIndex">
                           <img :src="sItem.Path" />
@@ -152,7 +152,7 @@
             </div>
           </template>
           <template v-if="activeName==2">
-            <div class="jz_HotelName">{{addMsg.HotelRealName}}</div>
+            <!-- <div class="jz_HotelName">{{addMsg.HotelRealName}}</div> -->
             <el-form-item label="开业时间">
               <el-input placeholder="开业时间" class="w300" v-model="addMsg.HotelInfo.OpenTime"></el-input>
             </el-form-item>
@@ -209,13 +209,15 @@
             </template>
           </template>
           <template v-if="activeName==4">
-            <el-button type="primary" @click="addTraffic()" style="float:right;margin:0 165px 50px 0" icon="el-icon-plus" circle></el-button>
-            <div style="margin-top:60px;">
-              <div v-for="(item,index) in addMsg.TrafficInfo" :key="index" style="position:relative;margin-bottom:20px;">
-                <el-input type="text" v-model="item.TTitle" class="w400" style="margin-bottom:10px;" placeholder="地点名称">
-                </el-input>
-                <el-input type="text" v-model="item.TSubTitle" class="w400" placeholder="地点介绍"></el-input>
-                <el-button type="danger" class="delTrafic" @click="delTraffic(index)" icon="el-icon-delete" circle></el-button>
+            <div style="width:600px;">
+              <el-button type="primary" @click="addTraffic()" style="float:right;margin:-53px 165px 50px 0" icon="el-icon-plus" circle></el-button>
+              <div style="margin-top:60px;">
+                <div v-for="(item,index) in addMsg.TrafficInfo" :key="index" style="position:relative;margin-bottom:20px;">
+                  <el-input type="text" v-model="item.TTitle" class="w400" style="margin-bottom:10px;" placeholder="地点名称">
+                  </el-input>
+                  <el-input type="text" v-model="item.TSubTitle" class="w400" placeholder="地点介绍"></el-input>
+                  <el-button type="danger" class="delTrafic" @click="delTraffic(index)" icon="el-icon-delete" circle></el-button>
+                </div>
               </div>
             </div>
           </template>
@@ -226,7 +228,7 @@
       <DMCchooseImg @closeImg="closeDMCchooseImg" ref="DMCchooseImg1" @headCallBack="getDMCimg" v-bind:imgType="1">
       </DMCchooseImg>
     </el-dialog>
-    <el-dialog :title="$t('hotel.hotel_mapLocation')" center :visible.sync="isShowMap">
+    <el-dialog :title="$t('hotel.hotel_mapLocation')" center :visible.sync="isShowMap" width="958px">
       <tencentMap @map-submit="mapEvent" :address="addMsg.Address"></tencentMap>
     </el-dialog>
     <el-dialog title="酒店图片" :visible.sync="isShowHotelImg" width="1240px">
@@ -712,8 +714,6 @@
                 this.dropdownObj.BookingList = sItem.SubList
               }
             });
-            console.log(this.dropdownObj,'dropdownObj');
-            console.log(tempData,'tempData');
           }
         });
       }

src/components/commonPage/comImgList.vue

@@ -7,19 +7,19 @@
         <div class="el-scrollbar" style="height: 450px; width: 100%;overflow-y:auto;">
           <div style="margin-bottom: -8px; margin-right: -8px;">
             <div class="el-scrollbar__view">
-              <li class="el-menu-item" style="padding-left: 10px;padding-right: 10px;"
+              <!-- <li class="el-menu-item" style="padding-left: 10px;padding-right: 10px;"
                 :class="commonIndex==-1?'selectActive' : ''" @click="getImgList(-1,saveObj)">
                 <i class="el-icon-tickets"></i>
                 <span>全部</span>
-              </li>
+              </li> -->
               <li class="el-menu-item" v-for="(item,index) in saveObj" :class="commonIndex==index?'selectActive' : ''"
                 @click="getImgList(index,saveObj)" :key="index" style="padding-left: 10px;padding-right: 10px;">
                 <div flex="dir:left box:last">
                   <el-col :span="18" style="overflow: hidden; text-overflow: ellipsis;">
                     <i class="el-icon-tickets"></i>
-                    <span>{{item.Label}}</span>
+                    <span>{{item.Label==''?'酒店图片':item.Label}}</span>
                   </el-col>
-                  <el-col class="blue" :span="6">
+                  <el-col class="blue" :span="6" v-if="index!=0">
                     <span @click="editGroup(index)">编辑</span>
                     | <span @click="delGroup(index)">删除</span>
                   </el-col>
@@ -40,14 +40,15 @@
               </div>
             </el-upload>
           </div>
-            <div style="display:inline-block;margin-left:9px;" v-for="(item,index) in comImgArr" :key="index">
+            <div style="display:inline-block;margin-left:9px;position:relative" v-for="(item,index) in comImgArr" :key="index">
               <img :src="item.Path" class="app-attachment-img" style="width: 100px; height: 100px;">
+              <i class="iconfont icon-bumenguanli-shanchu hotel_DelIcon" @click="delHotelImg(index)"></i>
             </div>
         </div>
       </el-col>
     </el-row>
     <div style="margin-top:20px;text-align:right">
-      <el-button size="small" type="primary" @click="SelectImgId">选定</el-button>
+      <el-button size="small" type="primary" @click="SelectImgId">确定</el-button>
     </div>
     <!-- 新增分组 -->
     <el-dialog :modal="false" :modal-append-to-body='false' title="分组管理" :visible.sync="groupMsg.addGroupMsgDig"
@@ -83,7 +84,7 @@
           GroupName: '', //分组名称
           addGroupMsgDig: false,
         },
-        commonIndex: -1,
+        commonIndex: 0,
         comImgArr: [],
       }
     },
@@ -93,9 +94,27 @@
     created() {},
     computed: {},
     mounted() {
-
+      this.getAll();
     },
     methods: {
+      getAll(){
+        // this.commonIndex=-1;
+        this.comImgArr=[];
+        if(this.saveObj.length>0){
+          this.saveObj.forEach(item => {
+            this.comImgArr=this.comImgArr.concat(item.ImgList);
+          })
+        }
+        let obj={
+          Label:'',
+          ImgList:this.comImgArr
+        }
+        this.saveObj.unshift(obj);
+      },
+      //删除图片
+      delHotelImg(index){
+        this.comImgArr.splice(index,1);
+      },
       //清空消息
       clearGroupMsg() {
         this.groupMsg.isAdd = 0;
@@ -131,9 +150,9 @@
       getImgList(index, obj) {
         this.commonIndex = index;
         if (index == -1) {
-          console.log(this.saveObj,'this.saveObj');
+          this.comImgArr=[];
           this.saveObj.forEach(item => {
-            this.comImgArr.concat(item.ImgList);
+            this.comImgArr=this.comImgArr.concat(item.ImgList);
           })
         } else {
           this.comImgArr = this.saveObj[index].ImgList;
@@ -145,10 +164,10 @@
       },
       //上传酒店图片
       UploadImage(file) {
-        if (this.commonIndex == -1) {
-          this.Error('请选择分类')
-          return;
-        }
+        // if (this.commonIndex == -2) {
+        //   this.Error('请选择分类')
+        //   return;
+        // }
         let newArr = [];
         newArr.push(file.file);
         let fileName = file.file.name;
@@ -252,5 +271,11 @@
     border-left: none;
     padding: 0 15px;
   }
-
+  .hotel_DelIcon{
+    position: absolute;
+    right:-5px;
+    top:-7px;
+    color:red;
+    cursor: pointer;
+  }
 </style>