照片墙

src/pages/HuiShengHuo/PhotoList/index.vue

@@ -11,10 +11,10 @@
         </view>
         <view class="ListContainer">
           <view v-for="(item, index) in PageList" :key="index">
-            <view class="Title flex-h">
+            <view class="Title flex-h" @tap="ShowItemList(item, index)">
               <text class="flex-item">{{item.name}}</text>
-              <text class="iconfont iconxiala" v-if="!item.Show" @tap="ShowItemList(item, index)"></text>
-              <text class="iconfont iconshangla" v-else @tap="item.Show = false"></text>
+              <text class="iconfont iconxiala" v-if="!item.Show"></text>
+              <text class="iconfont iconshangla" v-else></text>
             </view>
             <view class="List" v-show="item.Show">
               <view v-for="(subItem, subIndex) in item.List" :key="subIndex">
@@ -96,7 +96,7 @@ export default {
       this.PhotoUrlArr = []
       this.EmptyPhotoList() // 清空照片墙列表
       this.EmptyGalleryTypeList() // 清空照片墙类型列表
-      this.GetGalleryType({ queryData: { pageNum: 1, pageSize: 10000 } }).then(() => {
+      this.GetGalleryType({ queryData: { pageNum: 1, pageSize: 10000, hasImages: false } }).then(() => {
         this.GalleryTypeList.map((item) => {
           this.PageList.push({ ...item, List: [], Show: false, pageNum: 1, pageSize: 10, pages: 2, Loading: false })
         })
@@ -121,26 +121,30 @@ export default {
       })
     },
     ShowItemList (item, index) { // 显示图片列表
-      if (item.List.length) {
-        item.Show = true
+      if (item.Show) {
+        item.Show = false
       } else {
-        if (this.DataLock) return
-        this.DataLock = true
-        item.Loading = true
-        item.List = []
-        this.GetPhotoList({ queryData: { pageNum: item.pageNum, pageSize: item.pageSize, typeId: item.typeId } }).then((res) => {
-          item.pageNum = res.data.data.current - 0
-          item.pages = res.data.data.pages - 0
-          this.PhotoList.map((subItem) => {
-            item.List.push({ ...subItem })
-          })
+        if (item.List.length) {
           item.Show = true
-          this.DataLock = false
-          item.Loading = false
-        }).catch((res) => {
-          this.DataLock = false
-          item.Loading = false
-        })
+        } else {
+          if (this.DataLock) return
+          this.DataLock = true
+          item.Loading = true
+          item.List = []
+          this.GetPhotoList({ queryData: { pageNum: item.pageNum, pageSize: item.pageSize, typeId: item.typeId } }).then((res) => {
+            item.pageNum = res.data.data.current - 0
+            item.pages = res.data.data.pages - 0
+            this.PhotoList.map((subItem) => {
+              item.List.push({ ...subItem })
+            })
+            item.Show = true
+            this.DataLock = false
+            item.Loading = false
+          }).catch((res) => {
+            this.DataLock = false
+            item.Loading = false
+          })
+        }
       }
     },
     CheckBigImg (item, url) { // 查看大图