翻页

pages/finance/allMiner.vue

@@ -1,17 +1,7 @@
 <template>
 	<view class="container">
 		<view class="info-box">
-			<view class="nav flex">
-				<view class="next" @click="last" v-if="page != 1">
-					上一页
-				</view>
-				<view class="next" v-else>
-					已经是第一页了
-				</view>
-				<view class="next" @click="next">
-					下一页
-				</view>
-			</view>
+			
 			
 			<view class="list-cell" v-if="list.length > 0">
 				<view class="cell-name flex">
@@ -36,6 +26,20 @@
 						<view class="level">V{{ls.level}}</view>
 					</view>
 				</view>
+				<view class="nav flex">
+					<view class="next" @click="last" v-if="page != 1">
+						上一页
+					</view>
+					<view class="next" v-else>
+						已经是第一页了
+					</view>
+					<view class="next" v-if="isLast" @click="next">
+						下一页
+					</view>
+					<view class="next" v-else>
+						已经是最后一页了
+					</view>
+				</view>
 			</view>
 			<view class="empty-box" v-show="list.length === 0"><empty></empty></view>
 		</view>
@@ -56,6 +60,7 @@ export default {
 			list:'',
 			page: 1,
 			limit: 5,
+			isLast: true,
 		};
 	},
 	onLoad(option){
@@ -65,7 +70,7 @@ export default {
 	},
 	methods: {
 		// 请求载入数据
-		async loadData(type = "add",loading) {
+		async loadData() {
 			let obj = this;
 			// if (type === 'add'){
 			// 	if (obj.loadingType === 'nomore'){
@@ -86,18 +91,32 @@ export default {
 				obj.list = data.list;
 			});
 		},
+		async loadDataNext() {
+			let obj = this;
+			console.log(obj.page)
+			miner({
+				page: obj.page + 1,
+				limit: obj.limit,
+				
+			}).then(({ data }) => {
+				if(data.list.length === 0){
+					obj.isLast = false;
+				}else{
+					obj.isLast = true;
+				}
+			});
+		},
 		next(){
 			this.page = this.page + 1;
-			if(this.list.length != this.limit){
-				this.page = 1;
-			}
 			this.loadData();
+			this.loadDataNext();
 		},
 		last(){
 			if(this.page != 1){
 				this.page = this.page - 1;
 			}
 			this.loadData();
+			this.loadDataNext();
 		}
 	}
 }
@@ -185,10 +204,15 @@ export default {
 		width: 100%;
 		height: 500rpx;
 	}
-	.next{
-		width: 50%;
-		text-align: center;
-		padding: 20rpx;
-		
+	.nav{
+		.next{
+			margin: 40rpx;
+			width: 50%;
+			background-color: #5771DF;
+			color: #FFFFFF;
+			text-align: center;
+			padding:26rpx 0rpx;
+			border-radius: 50rpx;
+		}
 	}
 </style>

pages/set/set.vue

@@ -85,6 +85,11 @@ export default {
 				nickname: this.userInfo.nickname
 			}).then( e =>{
 				that.$api.msg('修改成功');
+				setTimeout(()=> {
+					uni.switchTab({
+						url:'/pages/user/user'
+					});
+				}, 1000);
 			}).catch(e =>{
 				console.log(e);
 				that.$api.msg('修改失败');

pages/user/myTeam.vue

@@ -17,11 +17,11 @@
 					<view class="cell">{{data.recommend_achievement || 0}}T</view>
 					<view class="cell-title">分享业绩</view>
 				</view>
-				<view class="info-cell" @click="nav('/pages/finance/allMiner')">
+				<view class="info-cell" >
 					<view class="cell">{{data.group_achievenent || 0}}T</view>
 					<view class="cell-title">我的业绩</view>
 				</view>
-				<view class="info-cell" @click="nav('/pages/finance/allMiner')">
+				<view class="info-cell" >
 					<view class="cell">{{data.today_achievement || 0}}T</view>
 					<view class="cell-title">今日新增业绩</view>
 				</view>
@@ -49,6 +49,20 @@
 						<view class="level">V{{ls.level}}</view>
 					</view>
 				</view>
+				<view class="nav flex" v-show="page == 1 && isLast">
+					<view class="next" @click="last" v-if="page != 1">
+						上一页
+					</view>
+					<view class="next" v-else>
+						已经是第一页了
+					</view>
+					<view class="next" v-if="isLast" @click="next">
+						下一页
+					</view>
+					<view class="next" v-else>
+						已经是最后一页了
+					</view>
+				</view>
 			</view>
 			<view class="empty-box" v-show="list.length === 0"><empty></empty></view>
 		</view>
@@ -63,12 +77,16 @@ export default {
 	},
 	data() {
 		return {
+			page: 1,
+			limit: 5,
 			data:'',
 			list:'',
+			isLast: true,
 		};
 	},
 	onLoad(option){
 		this.loadData();
+		this.loadDataNext();
 	},
 	onShow() {
 	},
@@ -76,16 +94,46 @@ export default {
 		// 请求载入数据
 		async loadData() {
 			let obj = this;
-			spread({}).then(({ data }) => {
+			spread({
+				page: obj.page,
+				limit: obj.limit
+			}).then(({ data }) => {
 				obj.data = data;
 				obj.list = data.list;
 			   console.log(obj.list)
 			});
 		},
+		async loadDataNext() {
+			let obj = this;
+			console.log(obj.page)
+			spread({
+				page: obj.page + 1,
+				limit: obj.limit,
+				
+			}).then(({ data }) => {
+				if(data.list.length === 0){
+					obj.isLast = false;
+				}else{
+					obj.isLast = true;
+				}
+			});
+		},
 		nav(url){
 			uni.navigateTo({
 				url:url
 			})
+		},
+		next(){
+			this.page = this.page + 1;
+			this.loadData();
+			this.loadDataNext();
+		},
+		last(){
+			if(this.page != 1){
+				this.page = this.page - 1;
+			}
+			this.loadData();
+			this.loadDataNext();
 		}
 	}
 };
@@ -206,4 +254,15 @@ page {
 	width: 100%;
 	height: 500rpx;
 }
+.nav{
+	.next{
+		margin: 40rpx;
+		width: 50%;
+		background-color: #5771DF;
+		color: #FFFFFF;
+		text-align: center;
+		padding:26rpx 0rpx;
+		border-radius: 50rpx;
+	}
+}
 </style>