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

@@ -130,9 +130,9 @@
         } else if(rankData.targetRank == 1) {
           this.rankAwards = `再获${rankData.targetRequiredScore}分即可上升到第1名并可获得${getFirstAwards(firstTime)}`;
         } else if(rankData.targetRank == 3) {
-          this.rankAwards = `再获${rankData.targetRequiredScore}分即可上升到第3名并可获得血压计`;
+          this.rankAwards = `再获${rankData.targetRequiredScore}分即可上升到第3名并可获得欧姆龙血压计`;
         } else if(rankData.targetRank == 10) {
-          this.rankAwards = `再获${rankData.targetRequiredScore}分即可上升到第10名并可获得体温计`;
+          this.rankAwards = `再获${rankData.targetRequiredScore}分即可上升到第10名并可获得欧姆龙体温计`;
         }
       },
       getTodayRankingList() {