wolyshaw 4 vuotta sitten
vanhempi
commit
bf346753be

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

@@ -6,10 +6,10 @@
     <div class="m-core">
       <div class="buttons">
         <el-button type="primary" @click="openUpload()">上传照片</el-button>
-        <el-button type="primary" v-if="!editing" @click="changeMode()">编辑照片</el-button>
+        <el-button type="primary" :disabled="list.length == 0" v-if="!editing" @click="changeMode()">编辑照片</el-button>
         <el-button type="danger" v-if="editing" @click="remove()">删除照片</el-button>
         <el-button type="primary" v-if="editing" @click="confirm()">确定</el-button>
-        <el-button type="primary" v-if="editing" @click="cancel">取消</el-button>
+        <el-button type="primary" v-if="editing" @click="cancel()">取消</el-button>
       </div>
       <el-alert
         v-if="editing"

+ 23 - 3
src/views/resetTeaming/components/training-photos/group/index.vue

@@ -10,10 +10,20 @@
         :preview-src-list="list">
       </el-image> -->
       <el-image
-        :src="detail.coverUrl || require('../icons/initbg.svg')"
+        v-if="detail.coverUrl"
+        :src="detail.coverUrl"
         class="img"
         fit="contain"
       />
+      <el-image
+        v-else
+        class="img"
+        fit="contain"
+      >
+        <div slot="error" class="image-slot">
+          <i class="el-icon-picture-outline"></i>
+        </div>
+      </el-image>
     </div>
     <el-tooltip class="item" effect="dark" :content="name" placement="top" :open-delay=".3">
       <div class="title">{{name}}</div>
@@ -37,9 +47,10 @@ export default {
 </script>
 <style scoped lang="less">
   .group{
-    width: 290px;
+    width: 200px;
+    cursor: pointer;
     .list{
-      width: 290px;
+      width: 200px;
       padding: 10px;
       background-color: rgba(0, 0, 0, .05);
       border-radius: 6px;
@@ -70,4 +81,13 @@ export default {
       }
     }
   }
+  /deep/.image-slot{
+    display: flex;
+    height: 100%;
+    i{
+      margin: auto;
+      font-size: 36px;
+      color: #909399;
+    }
+  }
 </style>

+ 21 - 2
src/views/resetTeaming/components/training-photos/index.vue

@@ -17,7 +17,15 @@
       />
       <div class="ctrls">
         <div class="photoNum">{{item.photoNum}} 张</div>
-        <el-dropdown class="dropdown" @command="command => handleCommand(command, item)">
+        <div class="dropdown">
+          <el-tooltip effect="dark" content="重命名" placement="top" :open-delay=".5">
+            <i class="el-icon-edit" @click="openForm(item)"></i>
+          </el-tooltip>
+          <el-tooltip effect="dark" content="删除" placement="top" :open-delay=".5">
+            <i style="color: #f56c6c" class="el-icon-delete" @click="removeItem(item)"></i>
+          </el-tooltip>
+        </div>
+        <!-- <el-dropdown class="dropdown" @command="command => handleCommand(command, item)">
           <span class="el-dropdown-link">
             更多操作 <i class="el-icon-arrow-down el-icon--right"></i>
           </span>
@@ -25,7 +33,7 @@
             <el-dropdown-item command="realName">重命名</el-dropdown-item>
             <el-dropdown-item command="remove" style="color: red;">删除</el-dropdown-item>
           </el-dropdown-menu>
-        </el-dropdown>
+        </el-dropdown> -->
       </div>
     </div>
     <empty v-if="list.length == 0"/>
@@ -130,6 +138,7 @@ export default {
   position: relative;
   display: inline-block;
   margin-top: 20px;
+  margin-right: 20px;
   .ctrls{
     position: absolute;
     top: 0;
@@ -143,6 +152,7 @@ export default {
     text-align: right;
     display: flex;
     flex-direction: column;
+    cursor: pointer;
     .photoNum{
       margin: auto;
       text-align: center;
@@ -154,6 +164,15 @@ export default {
       position: absolute;
       top: 10px;
       right: 0;
+      color: #fff;
+      i{
+        margin-right: 5px;
+        cursor: pointer;
+      }
+      padding-right: 10px;
+      border-bottom: 1px solid #fff;
+      width: 100%;
+      padding-bottom: 10px;
     }
     .el-dropdown-link{
       color: #fff;