diff --git a/api/user.js b/api/user.js index a5ca471..a4859d4 100644 --- a/api/user.js +++ b/api/user.js @@ -79,7 +79,7 @@ export default { list:(data)=>request.get('/api/point/records',data) }, friend:{ - list:()=>request.get('/api/user/referrals') + list:(params)=>request.get('/api/user/referrals',params) }, updateUser:(data)=>request.put('/api/user/update',data), createPayment(order_id){ diff --git a/pages/my/firend/index.js b/pages/my/firend/index.js index a588fe9..4b1a982 100644 --- a/pages/my/firend/index.js +++ b/pages/my/firend/index.js @@ -39,12 +39,25 @@ Page({ this.setData({ pager:this.data.pager }); - userApi.friend.list().then((data)=>{ - this.data.pager.loading = false; - this.data.pager.loadAll = true; + userApi.friend.list({ + skip:this.data.pager.limit*this.data.pager.pageIndex, + limit:this.data.pager.limit + }).then((data)=>{ + + if(this.data.pager.pageIndex==0){ + this.data.list = data.items; + }else{ + this.data.list = this.data.list.concat(data.items); + } this.data.pager.refreshTrigger = false; + this.data.pager.loading = false; + this.data.pager.pageIndex++; + if(data.items.length{ diff --git a/pages/my/firend/index.wxss b/pages/my/firend/index.wxss index 8fb4666..8752e4f 100644 --- a/pages/my/firend/index.wxss +++ b/pages/my/firend/index.wxss @@ -32,6 +32,9 @@ .firend-list .item .status{ color:var(--main-color) } +.firend-list .item .status.un{ + color:#999; +} .list-empty{ padding-top:480rpx;