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

assets/style/index.less

@@ -304,7 +304,7 @@
           }
         }
         button{
-          width:56px;
+          width:60px;
           height:40px;
           top: 2.5px;
           right: 20px;

pages/person-detail/index.vue

@@ -130,10 +130,9 @@
               if(this.pageNo ==1) {
                 this.personDetails = res.data.personalDetails
                 if(res.data.hasNextPage) {
-                  this.noMore = true;
-
-                } else {
                   this.busy = false;
+                } else {
+                  this.noMore = true;
                 }
               } else {
                 if(res.data.hasNextPage) {
@@ -142,7 +141,6 @@
                 } else {
                   this.noMore = true
                 }
-
               }
             } else {
               this.personDetails = []

pages/person-ranking/index.vue

@@ -23,7 +23,7 @@
             </p>
           </div>
           <div class="not-join" v-else>
-            <div class="con main-name">您还未参加活动</div>
+            <div class="con main-name">{{activeBtnType?'今日您还未参加活动':'您还未参加活动'}}</div>
             <div class="con details">赶快参与活动赢每日奖品</div>
           </div>
           <p class="text" v-if="activeBtnType&&rankData.score">再获得{{rankData.targetRequiredScore}}分即可上升到前{{rankData.targetRank}}名并可获得{{firstAwards}}</p>