wolyshaw 4 år sedan
förälder
incheckning
9e1d05085e

+ 4 - 2
src/views/photo-detail/index.vue

@@ -53,6 +53,7 @@
             <el-image
               :src="item.url"
               class="img"
+              fit="contain"
               :preview-src-list="list.map(item => item.url)">
             </el-image>
             <el-tooltip v-if="!editing" class="item" effect="dark" :content="item.name" placement="top" :open-delay=".5">
@@ -286,9 +287,10 @@ export default {
   z-index: 1;
 }
 .img{
-  width: 150px;
-  height: 150px;
+  width: 200px;
+  height: 112.5px;
   border-radius: 3px;
+  background-color: rgba(0, 0, 0, .05);
 }
 .alert{
   margin-top: 20px;

+ 6 - 4
src/views/resetTeaming/components/training-photos/group/index.vue

@@ -51,7 +51,7 @@ export default {
     cursor: pointer;
     .list{
       width: 200px;
-      padding: 10px;
+      // padding: 10px;
       background-color: rgba(0, 0, 0, .05);
       border-radius: 6px;
     }
@@ -68,8 +68,9 @@ export default {
     .img{
       width: 100%;
       // width: 130px;
-      height: 130px;
+      height: 112.5px;
       border-radius: 3px;
+      // background-color: rgba(0, 0, 0, .05);
     }
     .viewer{
       img {
@@ -84,10 +85,11 @@ export default {
   /deep/.image-slot{
     display: flex;
     height: 100%;
+    // background-color: rgba(0, 0, 0, .05);
     i{
       margin: auto;
-      font-size: 36px;
-      color: #909399;
+      font-size: 48px;
+      color: #ccc;
     }
   }
 </style>

+ 9 - 4
src/views/resetTeaming/components/training-photos/index.vue

@@ -33,7 +33,7 @@
                       <i class="el-icon-edit" @click.stop="openForm(item)"></i>
                     </el-tooltip>
                     <el-tooltip effect="dark" content="删除" placement="top" :open-delay=".5">
-                      <i style="color: #f56c6c" class="el-icon-delete" @click.stop="removeItem(item)"></i>
+                      <i class="el-icon-delete" @click.stop="removeItem(item)"></i>
                     </el-tooltip>
                   </div>
                   <!-- <el-dropdown class="dropdown" @command="command => handleCommand(command, item)">
@@ -168,7 +168,7 @@ export default {
     async removeItem(item) {
       try {
         await this.$confirm('相册内的照片将一起删除无法恢复,请谨慎操作', '提示')
-        await photoAlbumDel({id: item.id})
+        await photoAlbumDel({ids: item.id})
         this.submited()
       } catch (error) {
         console.log(error)
@@ -202,7 +202,7 @@ export default {
     top: 0;
     left: 0;
     width: 100%;
-    bottom: 40px;
+    bottom: 55px;
     visibility: hidden;
     opacity: 0;
     border-radius: 10px;
@@ -226,9 +226,10 @@ export default {
       i{
         margin-right: 5px;
         cursor: pointer;
+        font-size: 18px;
       }
       padding-right: 10px;
-      border-bottom: 1px solid #fff;
+      // border-bottom: 1px solid #fff;
       width: 100%;
       padding-bottom: 10px;
     }
@@ -252,6 +253,10 @@ export default {
 }
 .timeline{
   margin-top: 20px;
+  margin-left: 10px;
+  /deep/ .el-timeline-item__node{
+    background-color: #14928A;
+  }
 }
 // .group{
 // }