Merge remote-tracking branch 'origin/dev-stage2-20191125' into dev-stage2-20191125

pages/person-detail/index.vue

@@ -28,8 +28,8 @@
         </div>
         <div class="awards-details">血压计 1 支/温度计 1 支/小米电视4C 2 台/米家洗衣机 1 台/米家冰箱 2 台/华为荣耀Play3 2 部</div>
       </div>-->
-      <div class="detail-list" v-if="personDetails.length" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="10">
-        <div class="item" v-for="item in personDetails">
+      <div class="detail-list"  v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="10">
+        <div class="item" v-for="item in personDetails" v-if="personDetails.length">
           <div class="left">
             <img :src="detailTaskIcon(item.resourceType)" alt="">
           </div>
@@ -46,7 +46,7 @@
             </div>
           </div>
         </div>
-        <div class="no-more" v-if="noMore">
+        <div class="no-more" v-if="noMore&&personDetails.length">
           <span class="line"></span>
           <span class="text">到底啦</span>
           <span class="line"></span>
@@ -135,8 +135,8 @@
                   this.noMore = true;
                 }
               } else {
+                this.personDetails = this.personDetails.concat(res.data.personalDetails);
                 if(res.data.hasNextPage) {
-                  this.personDetails = this.personDetails.concat(res.data.personalDetails);
                   this.busy = false;
                 } else {
                   this.noMore = true
@@ -145,7 +145,6 @@
             } else {
               this.personDetails = []
             }
-
           }
         })
       },