Merge branch 'dev-stage2-20191125' of...

Merge branch 'dev-stage2-20191125' of http://192.168.110.53/com.pica.cloud.foundation.frontend/year-end-activitiy into dev-stage2-20191125

pages/invite-details/index.vue

@@ -78,7 +78,7 @@
                 </p>
               </div>
             </div>
-            <div class="no-more" v-if="noMore&&inviteList.length>=10">
+            <div class="no-more" v-if="noMore&&inviteList.length>=8">
               <span class="line"></span>
               <span class="text">到底啦</span>
               <span class="line"></span>

pages/person-ranking/index.vue

@@ -160,6 +160,7 @@
         getAllUserRanking().then(res => {
           if(res.code == '000000') {
             this.rankData = res.data;
+            this.topRankList = res.data.topRankList
             if(this.rankData.score) {
               this.btnText = '获得更多勤奋分'
             } else {