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

pages/invite-details/index.vue

@@ -76,7 +76,7 @@
 
         </div>
         <div class="no-data" v-if="!inviteList.length">
-          <img src="~/assets/img/invite-details/icon-nodata.png" alt="">
+          <img src="~/assets/img/icon-nodata.png" alt="">
           <p v-if="recordType==1">提醒您的医生好友领取课程您将获得奖励哦！</p>
           <p v-if="recordType==2" class="text-get">提醒您的医生好友领取课程后登录云鹊医APP您将再获得奖励哦！</p>
         </div>

pages/person-detail/index.less

@@ -118,7 +118,8 @@
               font-size: 13px;
               font-weight: 700;
               height: 13px;
-              margin-bottom: 9px;
+              margin-bottom: 9px ;
+              text-align: right;
               .num {
                 color: #FD5A2F;
               }
@@ -148,7 +149,6 @@
         -ms-transform: scaleY(0.5);
         transform: scaleY(0.5);
       }
-    }
       .no-more {
         height: 62px;
         display: flex;
@@ -167,4 +167,34 @@
         }
       }
     }
+    .no-data {
+      margin-top: 112px;
+      img {
+        width: 150px;
+        height: 150px;
+        display: block;
+        margin: 0 auto;
+      }
+      p {
+        color: #999999;
+        font-size: 15px;
+        line-height: 21px;
+        margin-top: 5px;
+        margin-bottom: 30px;
+        text-align: center;
+      }
+      .button {
+        color: #fff;
+        font-size: 15px;
+        font-weight: 700;
+        width: 180px;
+        height: 45px;
+        line-height: 45px;
+        text-align: center;
+        background: linear-gradient(270deg,rgba(255,88,36,1) 0%,rgba(254,163,86,1) 100%);
+        border-radius: 22.5px;
+        margin: 0 auto;
+      }
+    }
+  }
 }
\ No newline at end of file

pages/person-detail/index.vue

@@ -12,12 +12,12 @@
         <div class="content">
           <p class="item">
             <span class="label">累计排名</span>
-            <span class="value">105</span>
+            <span class="value">{{userRank?userRank.rank:'-'}}</span>
           </p>
           <p class="line"></p>
           <p class="item">
             <span class="label">累计勤奋分 </span>
-            <span class="value">105</span>
+            <span class="value">{{userRank?userRank.score:'0'}}</span>
           </p>
         </div>
       </div>
@@ -30,7 +30,7 @@
         </div>
         <div class="awards-details">血压计 1 支/温度计 1 支/小米电视4C 2 台/米家洗衣机 1 台/米家冰箱 2 台/华为荣耀Play3 2 部</div>
       </div>-->
-      <div class="detail-list" >
+      <div class="detail-list" v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" infinite-scroll-distance="10">
         <div class="item" v-for="item in personDetails">
           <div class="left">
             <img :src="detailTaskIcon(item.taskName)" alt="">
@@ -48,12 +48,17 @@
             </div>
           </div>
         </div>
-      </div>
-     <!-- <div class="no-more">
+        <div class="no-more" v-if="noMore">
           <span class="line"></span>
           <span class="text">到底啦</span>
           <span class="line"></span>
-      </div>-->
+        </div>
+      </div>
+      <div class="no-data" v-if="!personDetails.length">
+        <img src="~/assets/img/icon-nodata.png" alt="">
+        <p>暂无记录,您还没有参加活动</p>
+        <div class="button">立即参加</div>
+      </div>
     </div>
   </section>
 </template>
@@ -73,12 +78,17 @@
         barHeight: 0,
         barColor: '#fff',
         personDetails: [],
+        busy: true, //分页参数--start
+        pageNo: 0,
+        noMore: false,//分页参数--end
+        userRank: null
       };
     },
     computed: {
 
     },
     mounted() {
+      this.pageNo++;
       this.getPersonDetails();
     },
     methods: {
@@ -100,15 +110,43 @@
         }
       },
       getPersonDetails() {
-        getPersonDetails().then(res => {
+        getPersonDetails({
+          pageNo: this.pageNo,
+          activityId: 2
+        }).then(res => {
           console.log(res)
           if(res.code == '000000') {
+            this.userRank = res.data.userRank
+            if(res.data.personDetails) {
+              if(this.pageNo ==1) {
                 this.personDetails = res.data.personalDetails
+                if(res.data.hasNextPage) {
+                  this.noMore = true;
+
+                } else {
+                  this.busy = false;
+                }
+              } else {
+                if(res.data.hasNextPage) {
+                  this.personDetails = this.personDetails.concat(res.data.personalDetails);
+                  this.busy = false;
+                } else {
+                  this.noMore = true
+                }
+
+              }
+            } else {
+              this.personDetails = []
+            }
+
           }
         })
       },
       loadMore() {
-
+        this.busy = true;
+        this.pageNo++
+        //this.changeRecordType();
+        this.getPersonDetails()
       }
     },
   };

pages/person-ranking/index.vue

@@ -6,12 +6,12 @@
         <img src="https://file.yunqueyi.com/jpg/2019/01/30/1548836156602-019ADC3F.jpg" alt="">
         <div class="content">
           <p class="item">
-            <span class="label">累计排名</span>
+            <span class="label">今日排名</span>
             <span class="value">105</span>
           </p>
           <p class="line"></p>
           <p class="item">
-            <span class="label">累计勤奋分 </span>
+            <span class="label">今日勤奋分 </span>
             <span class="value">105</span>
           </p>
         </div>
@@ -70,6 +70,7 @@
         title: '个人明细',
         barHeight: 0,
         barColor: '#fff',
+        rankList: []
       };
     },
     computed: {

service/detailsAndRanking.js

@@ -20,7 +20,7 @@ export const getTwoInviteDetails = (params) => {
 // 获取个人明细列表
 export const getPersonDetails = (params) => {
   return request({
-    url: `/campaign/tims/personalDetails?activityId=2`,
+    url: `/campaign/tims/personalDetails`,
     params: params,
     withCredentials: true
   })