Merge remote-tracking branch 'origin/release' into release

pages/hospital-ranking/index.less

@@ -107,8 +107,13 @@
       font-size: 14px;
       padding: 0 25px 0 13px;
       margin-bottom: 3px;
+      .rank-name {
+        display: inline-block;
+        width: 56px;
+        text-align: center;
+      }
       .marginL {
-        margin-left: 11px;
+        margin-left: 7.5px;
       }
       .marginAuto {
         margin-left: auto;

pages/hospital-ranking/index.vue

@@ -29,11 +29,11 @@
       </div>
       <div class="info info-doctor" v-else>
         <img :src="contributionRanking.avatarImageUrl" alt="">
-        <div class="content" v-if="contributionRanking.score">
+        <div class="content" v-if="contributionRanking.userTotalScore">
           <div class="con details details-d">
             <p class="item">
               <span class="label">我的贡献排名</span>
-              <span class="value">{{contributionRanking.rank}}</span>
+              <span class="value">{{contributionRanking.score?contributionRanking.rank:'-'}}</span>
             </p>
             <p class="line"></p>
             <p class="item">
@@ -53,7 +53,7 @@
       <div class="description description-h" v-if="activeBtnType"><span>{{dealRankName(hospitalRanking.hospitalType)}}</span>排行实时刷新，部分原因存在几分钟延迟</div>
       <div class="description description-d" v-else>排行实时刷新，部分原因存在几分钟延迟</div>
       <div class="ranking-title">
-        <span>TOP100</span>
+        <span class="rank-name">{{activeBtnType?'TOP100':'排行'}}</span>
         <!--<span class="marginL">机构名称</span>
         <span class="marginAuto">机构勤奋分</span>-->
         <span class="marginL">{{activeBtnType?'机构名称':'机构成员'}}</span>