Merge branch 'feature_优化' of zhangs/surveyMaker into develop

src/views/myHistoryTest/myHistoryTest.html

@@ -31,7 +31,7 @@
     <div class="item" v-for="(item,index) in dataList" :key="item.created"
       :class="[ (isCopy && index == 0) ? itemCopyClass :'', item.isMore ? morehoverClass : '' ]">
       <!-- <img  mode="" :src="" alt=""> -->
-      <el-image class="item-img" :src="item.coverImg" fit="cover">
+      <el-image class="item-img1" :src="item.coverImg" fit="cover">
         <div slot="error" class="outline">
           <img class="item-img-outline" src="../../assets/images/picture-error.png" alt="">
           <!-- <i class="el-icon-picture-outline"></i> -->
@@ -77,7 +77,9 @@
         text-overflow: ellipsis;
         word-break: break-all;
         word-wrap: break-word;">备注：{{item.remark || '无'}}</span>
-        <span class="editBtn" @click='clickEditBtn(item,index)'>编辑备注</span>
+        <div class="remBottom">
+          <span class="editBtn" @click='clickEditBtn(item,index)'>编辑备注</span>
+        </div>  
       </div>
     </div>
     <div class="item add" @click="createTest">

src/views/myHistoryTest/myHistoryTest.scss

@@ -63,7 +63,7 @@
   .item {
     position: relative;
     width: 220px;
-    height: 270px;
+    height: 330px;
     background: #FFFFFF;
     box-shadow: 0 5px 11px 0 rgba(78,93,255,0.14);
     border-radius: 6px;
@@ -134,9 +134,10 @@
         background-size: cover;
       }
     }
-    .item-img {
+    .item-img1 {
       width: 100%;
-      height:156px;
+      min-height:141px;
+      max-height: 141px;
       border-radius:6px 6px 0px 0px;
       object-fit: cover;
       display: flex;
@@ -180,18 +181,22 @@
         line-height: 17px;
         margin-bottom: 5px;
       }
-      .editBtn{
-        border: 1px solid #4F5DFF;
-        border-radius: 10px;
-        font-size: 10px;
-        color: #000000;
-        padding: 0 5px;
-        height: 20px;
-        line-height: 20px;
-        text-align: center;
-        margin-left: 120px;
-        cursor: pointer;
+      .remBottom{
+        display: flex;
+        justify-content: flex-end;
+        .editBtn{
+          border: 1px solid #4F5DFF;
+          border-radius: 10px;
+          font-size: 10px;
+          color: #000000;
+          padding: 0 5px;
+          height: 20px;
+          line-height: 20px;
+          text-align: center;
+          cursor: pointer;
+        }
       }
+      
     }
   }
   .morehover {