Merge remote-tracking branch 'origin/dev-stage2-20191125' into dev-stage2-20191125

pages/hospital-ranking/index.less

@@ -160,6 +160,23 @@
       }
     }
   }
+  .no-more {
+    height: 62px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .line {
+      display: inline-block;
+      width: 84px;
+      height: 1px;
+      background:#F7F7F7;
+    }
+    .text {
+      color: #BEC2CC;
+      font-size: 13px;
+      margin: 0 8px;
+    }
+  }
   .no-data {
     margin-top: 112px;
     img {

pages/hospital-ranking/index.vue

@@ -60,19 +60,29 @@
         <span class="marginAuto">{{activeBtnType?'机构勤奋分':'贡献勤奋分'}}</span>
       </div>
       <div class="ranking-list" :style="{marginBottom: `${50+homeIndicatorHeight}` + 'Px'}">
-        <div class="item" v-if="activeBtnType" v-for="(itemH,indexH) in hospitalRanking.topRankList" :key="indexH">
+        <div class="item" v-if="activeBtnType" v-for="(itemH,indexH) in topRankListH" :key="indexH">
           <img v-if="indexH<=2" :src="dealRankIcon(indexH)" alt="" class="ranking-icon">
           <p v-else class="icon-num" >{{indexH+1}}</p>
           <p class="hospital-name">{{itemH.name}}</p>
           <p class="num">{{itemH.score}}</p>
         </div>
-        <div class="item" v-if="!activeBtnType"  v-for="(itemD,indexD) in contributionRanking.topRankList" :key="indexD">
+        <div class="item" v-if="!activeBtnType"  v-for="(itemD,indexD) in topRankListC" :key="indexD">
           <img v-if="indexD<=2" :src="dealRankIcon(indexD)" alt="" class="ranking-icon">
           <p v-else class="icon-num" >{{indexD+1}}</p>
           <img :src="itemD.avatarImageUrl" alt="" class="doctor-photo">
           <p class="doctor-name">{{itemD.name}}</p>
           <p class="num">{{itemD.score}}</p>
         </div>
+        <div class="no-more" v-if="activeBtnType&&topRankListH.length>=10">
+          <span class="line"></span>
+          <span class="text">到底啦</span>
+          <span class="line"></span>
+        </div>
+        <div class="no-more" v-if="!activeBtnType&&topRankListC.length>=10">
+          <span class="line"></span>
+          <span class="text">到底啦</span>
+          <span class="line"></span>
+        </div>
       </div>
     </div>
     <div class="main-content" v-if="noContributionRanking">
@@ -111,7 +121,9 @@
         },
         activeBtnType: true, //true机构，false人员
         hospitalRanking: {},
+        topRankListH: [],//机构排行
         contributionRanking: {},
+        topRankListC: [], //贡献排行
         btnText: '助力机构 创造佳绩',
         btnType: true,
         noContributionRanking: false //是否有人员贡献榜单数据
@@ -156,6 +168,7 @@
         getHospitalRanking().then(res => {
           if(res.code == '000000') {
             this.hospitalRanking = res.data;
+            this.topRankListH = res.data.topRankList
           }
         })
       },
@@ -163,6 +176,7 @@
         getContributionRanking().then(res => {
           if(res.code == '000000') {
             this.contributionRanking = res.data;
+            this.topRankListC = res.data.topRankList
             if(this.contributionRanking.topRankList.length) {
               this.noContributionRanking = false;
             } else {

pages/invite-details/index.vue

@@ -78,7 +78,7 @@
                 </p>
               </div>
             </div>
-            <div class="no-more" v-if="noMore&&inviteList.length">
+            <div class="no-more" v-if="noMore&&inviteList.length>=10">
               <span class="line"></span>
               <span class="text">到底啦</span>
               <span class="line"></span>
@@ -138,7 +138,7 @@
       this.pageNo++
       this.getOneInviteDetails();
       this.getInviteDetailAward();
-
+      const _this = this
       window.addEventListener('scroll', function (e) {
         let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
 
@@ -154,7 +154,7 @@
         console.log('headDivHeight',headDivHeight);*/
        const tabNab=document.getElementsByClassName('tab-nav')[0];
         if(recordDetailsHeight<=headDivHeight) {
-          tabNab.setAttribute('style',`position:fixed;top: ${44}px;`);
+          tabNab.setAttribute('style',`position:fixed;top: ${44+_this.statusBarHeight}px;`);
         } else {
           tabNab.removeAttribute('style');
         }

pages/person-detail/index.vue

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

pages/person-ranking/index.less

@@ -130,5 +130,22 @@
         }
       }
     }
+    .no-more {
+      height: 62px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .line {
+        display: inline-block;
+        width: 84px;
+        height: 1px;
+        background:#F7F7F7;
+      }
+      .text {
+        color: #BEC2CC;
+        font-size: 13px;
+        margin: 0 8px;
+      }
+    }
   }
 }
\ No newline at end of file

pages/person-ranking/index.vue

@@ -38,13 +38,18 @@
         <span class="marginAuto">{{activeBtnType?'今日':'累计'}}勤奋分</span>
       </div>
       <div class="ranking-list" :style="{marginBottom: `${50+homeIndicatorHeight}Px`}">
-        <div class="item" v-for="(item,index) in rankData.topRankList" :key="index">
+        <div class="item" v-for="(item,index) in topRankList" :key="index">
           <img v-if="index<=2" :src="dealRankIcon(index)" alt="" class="ranking-icon">
           <p v-else class="icon-num" >{{index+1}}</p>
           <img :src="item.avatarImageUrl" alt="" class="doctor-photo">
           <p class="doctor-name">{{item.name}}</p>
           <p class="num">{{item.score}}</p>
         </div>
+        <div class="no-more" v-if="topRankList.length>=10">
+          <span class="line"></span>
+          <span class="text">到底啦</span>
+          <span class="line"></span>
+        </div>
       </div>
       <footer-button
         :btnText="btnText"
@@ -71,6 +76,7 @@
         showPop: false,
         title: '个人明细',
         rankData: {},
+        topRankList: [], //排行榜list
         rightBtn: '',
         headBtn: {
           leftName: '今日排行榜',
@@ -139,6 +145,7 @@
         getTodayUserRanking().then(res => {
           if(res.code == '000000') {
             this.rankData = res.data;
+            this.topRankList = res.data.topRankList
             this.getRankAwards(this.rankData,res.data.todayDate);
             this.todayDate = res.data.todayDate;
             if(this.rankData.score) {

pages/yesterday-prize/index.less

@@ -78,6 +78,22 @@
         transform: scaleY(0.5);
       }
     }
-
+    .no-more {
+      height: 62px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .line {
+        display: inline-block;
+        width: 84px;
+        height: 1px;
+        background:#F7F7F7;
+      }
+      .text {
+        color: #BEC2CC;
+        font-size: 13px;
+        margin: 0 8px;
+      }
+    }
   }
 }
\ No newline at end of file

pages/yesterday-prize/index.vue

@@ -21,6 +21,11 @@
           <p class="awards" v-if="index>2">体温计*1支</p>
         </div>
       </div>
+      <div class="no-more" v-if="rewardsList.length>=10">
+        <span class="line"></span>
+        <span class="text">到底啦</span>
+        <span class="line"></span>
+      </div>
     </div>
     <footer-button
       :btnText="btnText"