任一存 3 лет назад
Родитель
Сommit
a5ab34db3d
2 измененных файлов с 25 добавлено и 39 удалено
  1. 1 0
      src/assets/style/common.less
  2. 24 39
      src/components/tableSelect2.vue

+ 1 - 0
src/assets/style/common.less

@@ -12,4 +12,5 @@
   top: 0;
   top: 0;
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
+  background: rgba(0, 0, 0, 0.5);
 }
 }

+ 24 - 39
src/components/tableSelect2.vue

@@ -59,11 +59,11 @@
       </div>
       </div>
       <!-- 无数据时的提示 -->
       <!-- 无数据时的提示 -->
       <div v-if="imageList.length === 0 && !hasMoreImageData" class="no-data">
       <div v-if="imageList.length === 0 && !hasMoreImageData" class="no-data">
-        <div v-if="lastestUsedSearchKey">
+        <div v-if="latestUsedSearchKey">
           <img :src="require('@/assets/images/default/empty_04_search.png')" alt="">
           <img :src="require('@/assets/images/default/empty_04_search.png')" alt="">
           <span>{{'未搜索到结果~'}}</span>
           <span>{{'未搜索到结果~'}}</span>
         </div>
         </div>
-        <div v-if="!lastestUsedSearchKey">
+        <div v-if="!latestUsedSearchKey">
           <img :src="require('@/assets/images/default/empty_04.png')" alt="">
           <img :src="require('@/assets/images/default/empty_04.png')" alt="">
           <span>{{'暂无素材~'}}</span>
           <span>{{'暂无素材~'}}</span>
         </div>
         </div>
@@ -105,11 +105,11 @@
       </div>
       </div>
       <!-- 无数据时的提示 -->
       <!-- 无数据时的提示 -->
       <div v-if="panoList.length === 0 && !hasMorePanoData" class="no-data">
       <div v-if="panoList.length === 0 && !hasMorePanoData" class="no-data">
-        <div v-if="lastestUsedSearchKey">
+        <div v-if="latestUsedSearchKey">
           <img :src="require('@/assets/images/default/empty_04_search.png')" alt="">
           <img :src="require('@/assets/images/default/empty_04_search.png')" alt="">
           <span>{{'未搜索到结果~'}}</span>
           <span>{{'未搜索到结果~'}}</span>
         </div>
         </div>
-        <div v-if="!lastestUsedSearchKey">
+        <div v-if="!latestUsedSearchKey">
           <img :src="require('@/assets/images/default/empty_04.png')" alt="">
           <img :src="require('@/assets/images/default/empty_04.png')" alt="">
           <span>{{'暂无素材~'}}</span>
           <span>{{'暂无素材~'}}</span>
         </div>
         </div>
@@ -117,8 +117,13 @@
     </div>
     </div>
 
 
     <div class="btns">
     <div class="btns">
-      <a @click="$emit('cancle')">取消</a>
-      <a :class="{disable: !select.length}" @click="$emit('submit', select)">确定</a>
+      <button class="ui-button">上传素材</button>
+      <div>
+        <button class="ui-button deepcancel" @click="$emit('cancle')">取消</button>
+        <button class="ui-button submit" :class="{disable: !select.length}" @click="$emit('submit', select)">
+          确定
+        </button>
+      </div>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -178,7 +183,7 @@ export default {
       
       
       select: [],
       select: [],
       searchKey:'', // 搜索关键词
       searchKey:'', // 搜索关键词
-      lastestUsedSearchKey: '',
+      latestUsedSearchKey: '',
 
 
       currentMaterialType: 'image',
       currentMaterialType: 'image',
       
       
@@ -199,7 +204,7 @@ export default {
     },
     },
     requestMoreImageData() {
     requestMoreImageData() {
       this.isRequestingMoreImageData = true
       this.isRequestingMoreImageData = true
-      const lastestUsedSearchKey = this.searchKey
+      const latestUsedSearchKey = this.searchKey
       getMaterialList(
       getMaterialList(
         {
         {
           pageNum: Math.floor(this.imageList.length / config.PAGE_SIZE) + 1,
           pageNum: Math.floor(this.imageList.length / config.PAGE_SIZE) + 1,
@@ -220,17 +225,17 @@ export default {
             this.hasMoreImageData = false
             this.hasMoreImageData = false
           }
           }
           this.isRequestingMoreImageData = false
           this.isRequestingMoreImageData = false
-          this.lastestUsedSearchKey = lastestUsedSearchKey
+          this.latestUsedSearchKey = latestUsedSearchKey
         },
         },
         () => {
         () => {
           this.isRequestingMoreImageData = false
           this.isRequestingMoreImageData = false
-          this.lastestUsedSearchKey = lastestUsedSearchKey
+          this.latestUsedSearchKey = latestUsedSearchKey
         }
         }
       );
       );
     },
     },
     requestMorePanoData() {
     requestMorePanoData() {
       this.isRequestingMorePanoData = true
       this.isRequestingMorePanoData = true
-      const lastestUsedSearchKey = this.searchKey
+      const latestUsedSearchKey = this.searchKey
       getMaterialList(
       getMaterialList(
         {
         {
           pageNum: Math.floor(this.panoList.length / config.PAGE_SIZE) + 1,
           pageNum: Math.floor(this.panoList.length / config.PAGE_SIZE) + 1,
@@ -251,11 +256,11 @@ export default {
             this.hasMorePanoeData = false
             this.hasMorePanoeData = false
           }
           }
           this.isRequestingMorePanoeData = false
           this.isRequestingMorePanoeData = false
-          this.lastestUsedSearchKey = lastestUsedSearchKey
+          this.latestUsedSearchKey = latestUsedSearchKey
         },
         },
         () => {
         () => {
           this.isRequestingMorePanoeData = false
           this.isRequestingMorePanoeData = false
-          this.lastestUsedSearchKey = lastestUsedSearchKey
+          this.latestUsedSearchKey = latestUsedSearchKey
         }
         }
       );
       );
     },
     },
@@ -421,9 +426,6 @@ export default {
       border-bottom: 1px solid #404040;
       border-bottom: 1px solid #404040;
       display: flex;
       display: flex;
       align-items: center;
       align-items: center;
-      &:last-of-type {
-        border-bottom: none;
-      }
       > .table-data {
       > .table-data {
         font-size:14px;
         font-size:14px;
         line-height:50px;
         line-height:50px;
@@ -563,30 +565,13 @@ export default {
 // }
 // }
 
 
 .btns {
 .btns {
-  text-align: center;
-  > a {
-    width:120px;
-    height:40px;
-    text-align: center;
-    line-height: 40px;
-    opacity:1;
-    border-radius:20px;
-    font-size:12px;
-    cursor: pointer;
-    display: inline-block;
-    color: @color;
-    margin: 0 10px;
-    &:nth-child(2) {
-      background-color: @color;
-      color: #fff;
-    }
-    &:nth-child(1) {
-      border:1px solid @color;
+  display: flex;
+  justify-content: space-between;
+  margin-top: 40px;
+  > div {
+    .deepcancel {
+      margin-right: 16px;
     }
     }
   }
   }
-  .disable{
-    pointer-events: none!important;
-    opacity: 0.5!important;
-  }
 }
 }
 </style>
 </style>