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/person-ranking/index.vue

@@ -26,7 +26,7 @@
             <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>
+          <p class="text" v-if="activeBtnType&&rankData.score">{{rankAwards}}</p>
         </div>
       </div>
     </div>
@@ -79,7 +79,7 @@
         activeBtnType: true, //true今日，false累计
         btnText: '获得更多勤奋分',
         btnType: true,
-        firstAwards: '',
+        rankAwards: '',
         todayDate: ''
       };
     },
@@ -124,11 +124,22 @@
           this.getUserRankingList();
         }
       },
+      getRankAwards(rankData,firstTime) {
+        if(rankData.targetRank == 0) {
+          this.rankAwards = `今日保持第1名，即可获得${getFirstAwards(firstTime)}`;
+        } else if(rankData.targetRank == 1) {
+          this.rankAwards = `再获${rankData.targetRequiredScore}分即可上升到第1名并可获得${getFirstAwards(firstTime)}`;
+        } else if(rankData.targetRank == 3) {
+          this.rankAwards = `再获${rankData.targetRequiredScore}分即可上升到第3名并可获得血压计`;
+        } else if(rankData.targetRank == 10) {
+          this.rankAwards = `再获${rankData.targetRequiredScore}分即可上升到第10名并可获得体温计`;
+        }
+      },
       getTodayRankingList() {
         getTodayUserRanking().then(res => {
           if(res.code == '000000') {
             this.rankData = res.data;
-            this.firstAwards = getFirstAwards(res.data.todayDate);
+            this.getRankAwards(this.rankData,res.data.todayDate);
             this.todayDate = res.data.todayDate;
             if(this.rankData.score) {
               this.btnText = '获得更多勤奋分'