Просмотр исходного кода

Merge branch 'master' into dev-cym

armg 1 неделя назад
Родитель
Сommit
64e2226f14
3 измененных файлов с 8 добавлено и 4 удалено
  1. 1 1
      src/styles/index.scss
  2. 3 1
      src/views/AIDesign/diagnoseHistory.vue
  3. 4 2
      src/views/AIDesign/history.vue

+ 1 - 1
src/styles/index.scss

@@ -17,7 +17,7 @@ html {
       margin: 0 auto;
       overflow: hidden;
       width: 100%;
-      .header{
+      .header,.van-popup--bottom,.van-overlay{
         max-width: 420px!important;
         left:calc(50% - 210px)!important;
       }

+ 3 - 1
src/views/AIDesign/diagnoseHistory.vue

@@ -133,6 +133,7 @@ export default class Resout extends Vue {
         this.isLoadingMore = false;
         this.hasMore = true;
         this.isProcessing = false; // 防止重复加载的锁
+        this.isLongPressing = false;
     }
 
     // 处理滚动事件
@@ -412,7 +413,7 @@ export default class Resout extends Vue {
         width: 50px;
         position: absolute;
         right: 20px;
-        top: 14px;
+        top: 56px;
         border-radius: 8px;
         background-color: #2484F2;
         color: #fff;
@@ -421,6 +422,7 @@ export default class Resout extends Vue {
 
 .image-groups {
     flex: 1;
+    padding-top:15px;
 }
 
 .image-group {

+ 4 - 2
src/views/AIDesign/history.vue

@@ -8,7 +8,7 @@
       </van-nav-bar>
     </div>
     <div class="container">
-      <van-button class="selecBtn" size="small" @click="selectImage">
+      <van-button class="selecBtn" size="small" @click="selectImage"  v-show="Object.keys(groupedImages).length > 0">
         {{ isLongPressing ? "取消" : "选择" }}
       </van-button>
 
@@ -131,6 +131,7 @@ export default class Resout extends Vue {
     this.images = [];
     this.pagination.page = 1;
     this.hasMore = true;
+    this.isLongPressing = false;
     this.getDataInfioList();
     // 监听滚动事件
     window.addEventListener('scroll', this.handleScroll);
@@ -407,7 +408,7 @@ export default class Resout extends Vue {
     width: 50px;
     position: absolute;
     right: 20px;
-    top: 14px;
+    top: 56px;
     border-radius: 8px;
     background-color: #2484F2;
     color: #fff;
@@ -416,6 +417,7 @@ export default class Resout extends Vue {
 
 .image-groups {
   flex: 1;
+  padding-top:15px;
 }
 
 .image-group {