5-16-1

api/user.js

@@ -288,10 +288,9 @@ export function getChildList(data) {
 	});
 }
 
-//user/getInviteCountRank
-export function getInviteCountRank(data) {
+export function getInviterRanking(data) {
 	return request({
-		url: '/api/user/getInviteCountRank',
+		url: '/api/user/getInviterRanking',
 		method: 'post',
 		data
 	});

pages/user/model/phb.vue

@@ -85,11 +85,13 @@
 				navList: [{
 					title: '周排行',
 					time: ((new Date().setHours(0, 0, 0) - (new Date().getDay() - 1) *24 * 60 * 60 *1000)/1000).toFixed(0),
+					times: ((new Date().setHours(0, 0, 0) + (7 - new Date().getDay()) *24 * 60 * 60 *1000)/1000).toFixed(0),
 					list: [],
 					loaded: false
 				}, {
 					title: '月排行',
 					time: (new Date(new Date(new Date().getFullYear(), new Date().getMonth(), 1).setHours(0, 0, 0)).getTime()/1000).toFixed(0),
+					times: ((new Date(new Date().getFullYear(), new Date().getMonth()+ 1, 0).setHours(23, 59, 59, 59))/1000).toFixed(0),
 					list: [],
 					loaded: false
 				}],
@@ -122,7 +124,8 @@
 					return
 				}
 				getCardLookCountRank({
-					time: that.times
+					time: navitem.time,
+					times: navitem.times
 				}).then(res => {
 					console.log(res);
 					navitem.list = res.data

pages/user/teamph.vue

@@ -12,53 +12,53 @@
 
 				<view class="ph-item flex">
 					<view class="item-logo yj-logo">
-						<image src="" mode="" class="avt"></image>
+						<image :src="navList[currentIndex].list[1].avatar" mode="" class="avt"></image>
 					</view>
 					<view class="item-name">
-						李淡淡
+						{{navList[currentIndex].list[1].nickname}}
 					</view>
 					<view class="item-id">
-						ID: 09124
+						ID: {{navList[currentIndex].list[1].uid}}
 					</view>
 					<view class="item-tit">
 						团队数
 					</view>
 					<view class="item-val">
-						40215
+						{{navList[currentIndex].list[1].count}}
 					</view>
 				</view>
 				<view class="ph-item flex">
 					<view class="item-logo gj-logo">
-						<image src="" mode="" class="avt"></image>
+						<image :src="navList[currentIndex].list[0].avatar" mode="" class="avt"></image>
 					</view>
 					<view class="item-name">
-						李淡淡
+						{{navList[currentIndex].list[0].nickname}}
 					</view>
 					<view class="item-id">
-						ID: 09124
+						ID: {{navList[currentIndex].list[0].uid}}
 					</view>
 					<view class="item-tit">
 						团队数
 					</view>
 					<view class="item-val">
-						40215
+						{{navList[currentIndex].list[0].count}}
 					</view>
 				</view>
 				<view class="ph-item flex">
 					<view class="item-logo jj-logo">
-						<image src="" mode="" class="avt"></image>
+						<image :src="navList[currentIndex].list[2].avatar" mode="" class="avt"></image>
 					</view>
 					<view class="item-name">
-						李淡淡
+						{{navList[currentIndex].list[2].nickname}}
 					</view>
 					<view class="item-id">
-						ID: 09124
+						ID: {{navList[currentIndex].list[2].uid}}
 					</view>
 					<view class="item-tit">
 						团队数
 					</view>
 					<view class="item-val">
-						40215
+						{{navList[currentIndex].list[2].count}}
 					</view>
 				</view>
 			</view>
@@ -92,7 +92,7 @@
 </template>
 
 <script>
-	import { getInviteCountRank } from '@/api/user.js'
+	import { getInviterRanking } from '@/api/user.js'
 	export default {
 		data() {
 			return {
@@ -100,6 +100,7 @@
 				navList: [{
 					title: '周排行',
 					time: ((new Date().setHours(0, 0, 0) - (new Date().getDay() - 1) *24 * 60 * 60 *1000)/1000).toFixed(0),
+					times: ((new Date().setHours(0, 0, 0) + (7 - new Date().getDay()) *24 * 60 * 60 *1000)/1000).toFixed(0),
 					list: [],
 					page: 1,
 					limit: 10,
@@ -108,6 +109,7 @@
 				}, {
 					title: '月排行',
 					time: (new Date(new Date(new Date().getFullYear(), new Date().getMonth(), 1).setHours(0, 0, 0)).getTime()/1000).toFixed(0),
+					times: ((new Date(new Date().getFullYear(), new Date().getMonth()+ 1, 0).setHours(23, 59, 59, 59))/1000).toFixed(0),
 					list: [],
 					page: 1,
 					limit: 10,
@@ -118,7 +120,12 @@
 			}
 		},
 		onLoad() {
-			this.getInviteCountRank()
+			this.getInviterRanking()
+		},
+		computed: {
+			showList() {
+				return this.navList[this.currentIndex].list
+			}
 		},
 		onShow() {
 			
@@ -142,8 +149,9 @@
 		methods: {
 			navClick(index) {
 				this.currentIndex = index
+				this.getInviterRanking()
 			},
-			getInviteCountRank() {
+			getInviterRanking() {
 				let that = this
 				let navitem = that.navList[that.currentIndex]
 				if(navitem.loadingType == 'loading' || navitem.loadingType == 'noMore') {
@@ -152,13 +160,20 @@
 				if(navitem.loaded) {
 					return
 				}
-				getInviteCountRank({
+				navitem.loadingType = 'loading'
+				getInviterRanking({
 					time: navitem.time,
+					times: navitem.times,
 					page: navitem.page,
 					pageSize: navitem.pageSize
 				}).then(res => {
 					console.log(res);
-					navitem.list = res.data
+					navitem.list = navitem.list.concat(res.data.list)
+					if(navitem.limit == res.data.list.length) {
+						navitem.loadingType = 'more'
+					}else {
+						navitem.loadingType = 'noMore'
+					}
 					navitem.loaded = true
 				}).catch(err => {
 					navitem.loaded = false