滚动更多修改

src/assets/js/mui.js

@@ -5151,13 +5151,13 @@ Function.prototype.bind = Function.prototype.bind || function(to) {
 	};
 	$.ready(function() {
 		//		setTimeout(function() {
-		$('.mui-slider').slider();
+		/*$('.mui-slider').slider();
 		$('.mui-scroll-wrapper.mui-slider-indicator.mui-segmented-control').scroll({
 			scrollY: false,
 			scrollX: true,
 			indicators: false,
 			snap: '.mui-control-item'
-		});
+		});*/
 		//		}, 500); //临时处理slider宽度计算不正确的问题(初步确认是scrollbar导致的)
 
 	});

src/projects/business/views/Master/Attendance/VerifyLeaveList.vue

@@ -5,17 +5,21 @@
 		<top-header :pageTitle="pageTitle"></top-header>
 
 		<div class="mui-content vongi-wordcard-sp">
-			<div id="slider" class="mui-slider mui-fullscreen vongi-over">
-				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
-					<div class="mui-scroll">
-						<a class="mui-control-item " @click="reloadList(0)" :class="listForm.type=='0'?'mui-active':''">
-							<span class="fyy-badge">待处理<span class="mui-badge" v-if="num">{{num}}</span></span>
-						</a>
-						<a class="mui-control-item" @click="reloadList(1)" :class="listForm.type=='1'?'mui-active':''">
-							已处理
-						</a>
-					</div>
+			<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
+				<div class="mui-scroll">
+					<a class="mui-control-item " @click="reloadList(0)" :class="listForm.type=='0'?'mui-active':''">
+						<span class="fyy-badge">待处理<span class="mui-badge" v-if="num">{{num}}</span></span>
+					</a>
+					<a class="mui-control-item" @click="reloadList(1)" :class="listForm.type=='1'?'mui-active':''">
+						已处理
+					</a>
 				</div>
+			</div>
+
+			<NullList :remark="'暂无审批记录'" v-if="!recordList.length"></NullList>
+
+			<div v-if="recordList.length" id="slider" class="mui-slider mui-fullscreen vongi-over">
+
 				<div class="mui-slider-group">
 					<div class="mui-slider-item mui-control-content mui-active">
 						<div id="scroll1" class="mui-scroll-wrapper vongi-over-hei">
@@ -34,7 +38,6 @@
 										</router-link>
 									</li>
 								</ul>
-								<NullList :remark="'暂无请假申请记录'" v-if="!recordList.length"></NullList>
 
 								<form class="mui-input-group fyy-checkbox" v-if="listForm.type==0">
 
@@ -109,7 +112,8 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader,NullList
+			TopHeader,
+			NullList
 		},
 		data() {
 			return {
@@ -292,4 +296,16 @@
 		color: #05c8af !important;
 		border: 1px solid #05c8af !important;
 	}
+
+	.mui-segmented-control {
+		position: fixed;
+		top: 44px;
+		z-index: 99;
+		background-color: #eee;
+	}
+
+	.mui-fullscreen {
+		position: unset;
+		margin-top: 45px;
+	}
 </style>

src/projects/business/views/Master/Attendance/VerifyList.vue

@@ -4,18 +4,21 @@
 		<top-header :pageTitle="pageTitle"></top-header>
 
 		<div class="mui-content vongi-wordcard-sp">
-			<div id="slider" class="mui-slider mui-fullscreen vongi-over">
-				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
-					<div class="mui-scroll">
-						<a @click="reloadList(0)" :class="'mui-control-item '+(listForm.status==0?'mui-active':'')">
-							<span class="fyy-badge">待处理<span class="mui-badge" v-if="firstRecordsTotal" v-text="firstRecordsTotal"></span></span>
-						</a>
-						<a @click="reloadList(3)" :class="'mui-control-item '+(listForm.status==3?'mui-active':'')">
-							已处理
-						</a>
-					</div>
+			<div class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
+				<div class="mui-scroll">
+					<a @click="reloadList(0)" :class="'mui-control-item '+(listForm.status==0?'mui-active':'')">
+						<span class="fyy-badge">待处理<span class="mui-badge" v-if="firstRecordsTotal" v-text="firstRecordsTotal"></span></span>
+					</a>
+					<a @click="reloadList(3)" :class="'mui-control-item '+(listForm.status==3?'mui-active':'')">
+						已处理
+					</a>
 				</div>
-				<NullList :remark="'暂无审批记录'" v-if="!recordList.length"></NullList>
+			</div>
+
+			<NullList :remark="'暂无审批记录'" v-if="!recordList.length"></NullList>
+
+			<div v-if="recordList.length" id="slider" class="mui-slider mui-fullscreen vongi-over">
+
 				<div class="mui-slider-group">
 
 					<div v-show="listForm.status==0" class="mui-slider-item mui-control-content">
@@ -108,7 +111,8 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader,NullList
+			TopHeader,
+			NullList
 		},
 		data() {
 			return {
@@ -269,4 +273,16 @@
 		color: #05c8af !important;
 		border: 1px solid #05c8af !important;
 	}
+
+	.mui-segmented-control {
+		position: fixed;
+		top: 44px;
+		z-index: 99;
+		background-color: #eee;
+	}
+
+	.mui-fullscreen {
+		position: unset;
+		margin-top: 45px;
+	}
 </style>

src/projects/business/views/Master/Company/RegisterExamine.vue

@@ -4,17 +4,21 @@
 		<top-header :pageTitle="pageTitle"></top-header>
 
 		<div class="mui-content vongi-wordcard-sp">
-			<div id="slider" class="mui-slider mui-fullscreen vongi-over">
-				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
-					<div class="mui-scroll">
-						<a @click="reloadList(0)" :class="'mui-control-item '+(listForm.status==0?'mui-active':'')">
-							<span class="fyy-badge">待处理<span class="mui-badge" v-if="firstRecordsTotal" v-text="firstRecordsTotal"></span></span>
-						</a>
-						<a @click="reloadList(1)" :class="'mui-control-item '+(listForm.status==1?'mui-active':'')">
-							已处理
-						</a>
-					</div>
+			<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
+				<div class="mui-scroll">
+					<a @click="reloadList(0)" :class="'mui-control-item '+(listForm.status==0?'mui-active':'')">
+						<span class="fyy-badge">待处理<span class="mui-badge" v-if="firstRecordsTotal" v-text="firstRecordsTotal"></span></span>
+					</a>
+					<a @click="reloadList(1)" :class="'mui-control-item '+(listForm.status==1?'mui-active':'')">
+						已处理
+					</a>
 				</div>
+			</div>
+
+			<NullList :remark="'暂无审批记录'" v-if="!recordList.length"></NullList>
+
+			<div v-if="recordList.length" id="slider" class="mui-slider mui-fullscreen vongi-over">
+
 				<div class="mui-slider-group">
 
 					<div v-show="listForm.status==0" class="mui-slider-item mui-control-content">
@@ -89,12 +93,14 @@
 		mapMutations
 	} from 'vuex'
 	import * as types from '$project/store/mutation-types'
+	import NullList from '$project/components/NullList.vue'
 	export default {
 		name: 'MasterCompanyRegisterExamine',
 		components: {
 			Common,
 			Loading,
-			TopHeader
+			TopHeader,
+			NullList
 		},
 		data() {
 			return {
@@ -297,4 +303,16 @@
 	.fyy-bindfyy-btn button {
 		width: 30%;
 	}
+
+	.mui-segmented-control {
+		position: fixed;
+		top: 44px;
+		z-index: 99;
+		background-color: #eee;
+	}
+
+	.mui-fullscreen {
+		position: unset;
+		margin-top: 45px;
+	}
 </style>

src/utils/isReachBottom.js

@@ -26,7 +26,7 @@ function isReachBottom() {
 	const winHeight = getWinHeight() // 一屏的高度
 	const scrollHeight = getScrollHeight() // 获取文档总高度
 	console.log('scrollTop:' + scrollTop + '/scrollHeight:' + scrollHeight + '/winHeight:' + winHeight)
-	return scrollTop >= parseInt(scrollHeight) - 20 - winHeight
+	return scrollTop >= parseInt(scrollHeight) - 10 - winHeight
 }
 
 export default isReachBottom