liurongli 2 долоо хоног өмнө
parent
commit
523966df8e

+ 45 - 30
pages/teacherHonor/honorTeacher/index.vue

@@ -57,11 +57,13 @@
 			label:'姓名',
 			value:'2',
 		}],
+		pageLists:[],//全部数据
 		pageList:[],//列表数据
 		sortType:'0',
 		queryStr: '',
 		pageSize: 30,
 		pageNum: 1,
+		pages:0,
 		scrollTop:0,
 		oldScrollTop:0,
 		isRefreshing:false,//设置当前下拉刷新状态,true 表示下拉刷新已经被触发,false 表示下拉刷新未被触发
@@ -83,40 +85,53 @@
 	* initPage:初始分页 从第一开始
 	*/
 	const OnLoadData = (initPage) => {
-		// uni.showLoading({
-		// 	title: '加载中'
-		// });
 		state.isLoading = true;
 		state.loadStatus = 'loading';
 		if (initPage) {
+			// uni.showLoading({
+			// 	title: '加载中'
+			// });
 			state.pageNum = 1;//如果是下拉刷新、重新查询 默认加载第一页
+			queryHonorTeacherListData({
+				queryStr:state.queryStr,
+				sortType:state.sortType
+			}).then(res=>{
+				if(res.code == 200){
+					const recordsData = res?.data || [];
+					state.pageLists = recordsData;//全部数据
+					const total = recordsData?.length || 0;//总数
+					state.pages = Math.ceil(total / state.pageSize);//总页数
+					//默认加载
+					state.pageList = state.pageLists.slice(0, state.pageSize);
+					//没有更多了
+					state.noMoreData = state.pageNum == state.pages;
+					//分页+1
+					state.pageNum++;
+					console.log()
+					state.isLoading = false;
+					state.isRefreshing = false;//下拉刷新未被触发
+					state.loadStatus = state.noMoreData?'no-more':'more';
+				}
+			}).finally(()=>{
+				// uni.hideLoading();
+				//返回到页面顶部
+				if(initPage){
+					GoTop();
+				}
+			})
+		}else{
+			const start = (state.pageNum - 1) * state.pageSize;
+			const end = start + state.pageSize;
+			const list = state.pageLists.slice(start, end);
+			state.pageList = [...state.pageList, ...list];
+			state.noMoreData = state.pageNum == state.pages;
+			state.pageNum++;
+			setTimeout(() => {
+				state.isLoading = false;
+				state.isRefreshing = false; //下拉刷新未被触发
+				state.loadStatus = state.noMoreData?'no-more':'more';
+			}, 0)
 		}
-		queryHonorTeacherListData({
-			queryStr:state.queryStr,
-			sortType:state.sortType
-		}).then(res=>{
-			if(res.code == 200){
-				const recordsData = res?.data || [];
-				const total = recordsData.length;//总数
-				const pages = Math.ceil(total / state.pageSize);//总页数
-				state.pageList = initPage ? recordsData : [...state.pageList,...recordsData];
-				state.noMoreData = state.pageNum == pages;
-				state.pageNum++;
-			}
-		}).finally(()=>{
-			// uni.hideLoading();
-			state.isLoading = false;
-			state.isRefreshing = false;//下拉刷新未被触发
-			if(state.noMoreData){
-				state.loadStatus = 'no-more';
-			}else{
-				state.loadStatus = 'more';
-			}
-			//返回到页面顶部
-			if(initPage){
-				GoTop();
-			}
-		})
 	}
 	// 自定义下拉刷新被触发	 下拉刷新
 	const OnRefresh = () =>{
@@ -150,7 +165,7 @@
 
 <style lang="scss" scoped>
 	.page_content{
-		height: calc(100% - 448rpx);
+		height: calc(100% - 360rpx);
 		.scroll_view_y{
 			height: 100%;
 			.refresh_loading{

+ 4 - 1
pages/teacherHonor/index.vue

@@ -23,7 +23,7 @@
 	import { useStore } from 'vuex';
 	const store = useStore();
 	const state = reactive({
-		tabBarValue:'honorOverview',
+		tabBarValue:'',
 		tabBarList:[{
 			"pathName":"myHonor",
 			"iconPath": "/static/image/tabbar/myHonor.png",
@@ -56,6 +56,9 @@
 				"text": "荣誉教师"
 			}]
 			state.tabBarList = [...tabList,...state.tabBarList];
+			state.tabBarValue = 'honorOverview';
+		}else{
+			state.tabBarValue = 'myHonor';
 		}
 	})
 </script>