ct

src/apps/AppBuilding/list.vue

@@ -29,7 +29,8 @@ export default {
     return {
       title: '',
       current: 1,
-      list: []
+      list: [],
+      isMore: false
     }
   },
   computed: {...mapState(['user'])},
@@ -57,13 +58,17 @@ export default {
         }
       }).then(res => {
         if (res?.data) {
+          if (res.data.records.length < 10) {
+            this.isMore = true
+          }
+
           res.data.records.forEach(e => {
             e.cellName = `${e.communityName + e.buildingNumber}栋`
           })
           if (this.current > 1 && this.current > res.data.pages) {
             return
           }
-          this.list = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
           this.pages = res.data.pages
         }
       })
@@ -77,14 +82,20 @@ export default {
 
   },
   onReachBottom() {
-    this.current++;
-    this.getList()
+    if (this.isMore) return
+
+    this.current++
+
+    this.$nextTick(() => {
+      this.getList()
+    })
   },
 }
 </script>
 
 <style lang="scss" scoped>
 .list {
+  padding-bottom: 20px;
   .list-content {
     padding: 32px 32px 0;
     background-color: #F5F5F5;

src/apps/AppBuilding/map.vue

@@ -138,7 +138,7 @@ uni-page-body {
 }
 
 .map {
-  height: 100%;
+  height: 100vh;
 
   .build-btn {
     width: 80px;

src/apps/AppEpidemicSituation/Health.vue

@@ -38,12 +38,12 @@
       <div class="line2"></div>
 
       <u-tabs :list="tabList" :is-scroll="false" :current="currentTabs" height="96" bg-color="#fff" inactive-color="#333" bar-width="192" active-color="#135AB8 " @change="change"></u-tabs>
+
+      <div class="line3"></div>
     </AiTopFixed>
 
     <div class="bottoms">
       <template v-if="data.length">
-        <div class="line3"></div>
-
         <div class="templates" v-for="(item, i) in data" :key="i" @click="goDetail(item)">
           <img :src="item.avatar" alt="" v-if="item.avatar" />
           <img src="./components/img/user-img.png" alt="" v-else />
@@ -246,7 +246,7 @@ export default {
 
   .line1 {
     height: 4px;
-    background: #f3f6f9;
+    background: #f5f5f5;
   }
 
   .middle {
@@ -267,15 +267,15 @@ export default {
 
   .line2 {
     height: 8px;
-    background: #f3f6f9;
+    background: #f5f5f5;
+  }
+
+  .line3 {
+    height: 6px;
+    background: #f5f5f5;
   }
 
   .bottoms {
-    .line3 {
-      height: 6px;
-      background: #f3f6f9;
-    }
-
     .templates {
       display: flex;
       align-items: center;

src/apps/AppGridManagement/FamilyList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="FamilyList">
     <div class="title">户主列表</div>
-    <div class="main">
+    <div class="main" v-if="list.length">
       <ul v-for="item in list" :key="item.id">
         <li>
           <div class="user">
@@ -68,7 +68,6 @@ export default {
 
 <style lang="scss" scoped>
 .FamilyList {
-  background-color: #FFFFFF;
   .title {
     padding: 24px 32px;
     background-color: #F3F6F9;

src/apps/AppGridManagement/Map.vue

@@ -81,7 +81,7 @@ export default {
     getLeafNodes() {
       this.$http.post(`/app/appgirdinfo/queryGirdMemberGirdsById`).then((res) => {
         if (res?.data) {
-          this.treeList = res.data
+          this.treeList = res.data.filter(v => v.girdLevel === '2')
 
           const arr = res.data.filter(v => v.points).map(e => {
             return {