From 2a0cd6ba1679df3e271402100dbacc271c481983 Mon Sep 17 00:00:00 2001
From: HK <461671400@qq.com>
Date: Thu, 20 May 2021 15:21:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Hotel/GnHotelInfo.vue        |  6 +-
 src/components/Hotel/GnHotelManagement.vue  |  2 -
 src/components/Hotel/HotelProductManage.vue |  1 -
 src/components/commonPage/comHotelImg.vue   |  5 +-
 src/components/commonPage/comImgList.vue    | 99 ++++++++++-----------
 5 files changed, 47 insertions(+), 66 deletions(-)

diff --git a/src/components/Hotel/GnHotelInfo.vue b/src/components/Hotel/GnHotelInfo.vue
index 73f9fcc43..c70eef491 100644
--- a/src/components/Hotel/GnHotelInfo.vue
+++ b/src/components/Hotel/GnHotelInfo.vue
@@ -143,7 +143,7 @@
                 </div>
                 <div>
                   <el-tabs>
-                    <el-tab-pane v-for="(subItem,subIndex) in addMsg.InnerHotelImaList" :key="subIndex" :label="subItem.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" />
@@ -156,7 +156,6 @@
             </div>
           </template>
           <template v-if="activeName==2">
-            <!-- <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>
@@ -406,7 +405,6 @@
     methods: {
       //获取子组件新增分类和图片
       getHotelImg(data){
-        console.log(data,'datasss');
         this.addMsg.InnerHotelImaList = data;
         this.isShowHotelImg=false;
       },
@@ -490,7 +488,6 @@
         this.addMsg.RoomFacilities = this.chooseObj.RoomFacilities.toString();
         this.addMsg.ServiceItems = this.chooseObj.ServiceItems.toString();
         this.addMsg.Bookings = this.chooseObj.Bookings;
-        // this.addMsg.InnerHotelImaList = this.HotelImgArr;
         this.addMsg.ID = this.hotelID;
         this.addMsg.Tags = this.TagsList.toString();
         this.addMsg.HotelImageList = this.HotelImageArray;
@@ -528,7 +525,6 @@
           msg,
           res => {
             if (res.data.resultCode == 1) {
-              console.log("res.data", res.data);
               var tempMsg = res.data.data;
               _self.addMsg.ID = tempMsg.ID;
               _self.addMsg.HotelRealName = tempMsg.HotelRealName;
diff --git a/src/components/Hotel/GnHotelManagement.vue b/src/components/Hotel/GnHotelManagement.vue
index 54d7478c0..7d94c0b21 100644
--- a/src/components/Hotel/GnHotelManagement.vue
+++ b/src/components/Hotel/GnHotelManagement.vue
@@ -420,7 +420,6 @@
         );
       },
       handleSelectionChange(val){
-        console.log(val,'x多选');
         this.multipleSelection = val;
       },
       handleCurrentChange(val) {
@@ -499,7 +498,6 @@
               this.tableData.forEach(x => {
                 x.starArr = new Array(x.Star);
               });
-              console.log(this.tableData,'数据来也');
             }
           },
           null
diff --git a/src/components/Hotel/HotelProductManage.vue b/src/components/Hotel/HotelProductManage.vue
index 05c358c3f..123086608 100644
--- a/src/components/Hotel/HotelProductManage.vue
+++ b/src/components/Hotel/HotelProductManage.vue
@@ -455,7 +455,6 @@
               PicId: item.Pic
             }
             that.apipost("hotel_post_RemoveHotelImage", msg, res => {
-              console.log(res)
               if (res.data.resultCode == 1) {
                 that.addMsg.RoomImage.splice(index, 1);
               }
diff --git a/src/components/commonPage/comHotelImg.vue b/src/components/commonPage/comHotelImg.vue
index 9369bd6fe..8dd43b7d0 100644
--- a/src/components/commonPage/comHotelImg.vue
+++ b/src/components/commonPage/comHotelImg.vue
@@ -96,7 +96,7 @@
     created() {},
     computed: {},
     mounted() {
-      console.log(this.saveObj, 'saveObj');
+
     },
     methods: {
       //新增分组
@@ -137,8 +137,6 @@
       },
       //选定
       SelectImgId() {
-        console.log('1111');
-        console.log(this.saveObj,'saveObj');
       },
       //上传酒店图片
       UploadImage(file) {
@@ -156,7 +154,6 @@
           var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
           obj.Path = str;
           obj.ShowPath = imgUrl;
-          console.log(obj,'obj');
           this.saveObj[this.commonIndex].imgArr.push(obj.ShowPath);
         });
       },
diff --git a/src/components/commonPage/comImgList.vue b/src/components/commonPage/comImgList.vue
index 911ed5630..75234ab67 100644
--- a/src/components/commonPage/comImgList.vue
+++ b/src/components/commonPage/comImgList.vue
@@ -7,17 +7,12 @@
         <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;"
-                :class="commonIndex==-1?'selectActive' : ''" @click="getImgList(-1,saveObj)">
-                <i class="el-icon-tickets"></i>
-                <span>全部</span>
-              </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==''?'全部':item.Label}}</span>
+                    <span>{{item.Label==''?'默认':item.Label}}</span>
                   </el-col>
                   <el-col class="blue" :span="6" v-if="index!=0">
                     <span @click="editGroup(index)">编辑</span>
@@ -40,10 +35,11 @@
               </div>
             </el-upload>
           </div>
-            <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(item,index)"></i>
-            </div>
+          <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(item,index)"></i>
+          </div>
         </div>
       </el-col>
     </el-row>
@@ -97,42 +93,38 @@
       this.getAll();
     },
     methods: {
-      getAll(){
-        // this.commonIndex=-1;
-        this.comImgArr=[];
-        if(this.saveObj.length>0){
+      getAll() {
+        this.comImgArr = [];
+        if (this.saveObj.length > 0) {
           this.saveObj.forEach(item => {
-            this.comImgArr=this.comImgArr.concat(item.ImgList);
+            this.comImgArr = this.comImgArr.concat(item.ImgList);
           })
+        } else {
+          let obj = {
+            Label: '',
+            ImgList: this.comImgArr
+          }
+          this.saveObj.unshift(obj);
         }
-        let obj={
-          Label:'',
-          ImgList:this.comImgArr
-        }
-        this.saveObj.unshift(obj);
       },
       //删除图片
-      delHotelImg(item,index){
-        if(item.MappingId&&item.MappingId>0){
-          let msg = {
-            Id:item.MappingId,
-            PicId:item.PicId
-          }
-          this.$confirm('是否删除?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.apipost("hotel_post_RemoveHotelImage", msg, res => {
-              this.comImgArr.splice(index,1);
-              this.Success(res.data.message);
+      delHotelImg(item, index) {
+        var that = this
+        that.Confirm("删除图片将不能恢复?", function () {
+          if (item.MappingId && item.MappingId > 0) {
+            let msg = {
+              Id: item.MappingId,
+              PicId: item.PicId
+            }
+            that.apipost("hotel_post_RemoveHotelImage", msg, res => {
+              if (res.data.resultCode == 1) {
+                that.comImgArr.splice(index, 1);
+              }
             });
-          }).catch(() => {
-
-          });
-        }else{
-          this.comImgArr.splice(index,1);
-        }
+          } else {
+            that.comImgArr.splice(index, 1);
+          }
+        });
       },
       //清空消息
       clearGroupMsg() {
@@ -163,15 +155,18 @@
       },
       //删除
       delGroup(index) {
-        this.saveObj.splice(index, 1);
+        var that = this
+        that.Confirm("删除图片将不能恢复?", function () {
+          this.saveObj.splice(index, 1);
+        });
       },
       //点击获取图片arr
       getImgList(index, obj) {
         this.commonIndex = index;
         if (index == -1) {
-          this.comImgArr=[];
+          this.comImgArr = [];
           this.saveObj.forEach(item => {
-            this.comImgArr=this.comImgArr.concat(item.ImgList);
+            this.comImgArr = this.comImgArr.concat(item.ImgList);
           })
         } else {
           this.comImgArr = this.saveObj[index].ImgList;
@@ -179,21 +174,15 @@
       },
       //选定
       SelectImgId() {
-        this.$emit('getHotelImg',this.saveObj);
+        this.$emit('getHotelImg', this.saveObj);
       },
       //上传酒店图片
       UploadImage(file) {
-        // if (this.commonIndex == -2) {
-        //   this.Error('请选择分类')
-        //   return;
-        // }
         let newArr = [];
         newArr.push(file.file);
         let fileName = file.file.name;
         var path = "/Upload/DMC/";
         this.UploadSelfFileT(path, newArr, x => {
-          console.log(x,'xxxx');
-          ;
           var str = x.data.FilePath;
           var imgUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
           var obj = {
@@ -290,11 +279,13 @@
     border-left: none;
     padding: 0 15px;
   }
-  .hotel_DelIcon{
+
+  .hotel_DelIcon {
     position: absolute;
-    right:-5px;
-    top:-7px;
-    color:red;
+    right: -5px;
+    top: -7px;
+    color: red;
     cursor: pointer;
   }
+
 </style>
-- 
2.18.1