|
@@ -130,30 +130,25 @@ export default create({
|
|
|
/** 获取需要滚动的距离 */
|
|
/** 获取需要滚动的距离 */
|
|
|
const getScrollHeight = () => {
|
|
const getScrollHeight = () => {
|
|
|
const parentElement = getParentElement('scroller');
|
|
const parentElement = getParentElement('scroller');
|
|
|
- // state.scrollEl = props.useWindow ? window : parentElement;
|
|
|
|
|
|
|
|
|
|
parentElement
|
|
parentElement
|
|
|
.boundingClientRect(rect => {
|
|
.boundingClientRect(rect => {
|
|
|
state.scrollHeight = rect.height;
|
|
state.scrollHeight = rect.height;
|
|
|
- console.log(rect.height);
|
|
|
|
|
})
|
|
})
|
|
|
.exec();
|
|
.exec();
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
/** 滚动到底部 */
|
|
/** 滚动到底部 */
|
|
|
const lower = () => {
|
|
const lower = () => {
|
|
|
- // console.log('加载到底部', props.containerId);
|
|
|
|
|
if (state.direction == 'up' || !props.hasMore || state.isInfiniting) {
|
|
if (state.direction == 'up' || !props.hasMore || state.isInfiniting) {
|
|
|
return false;
|
|
return false;
|
|
|
} else {
|
|
} else {
|
|
|
- console.log('加载到底部1111');
|
|
|
|
|
state.isInfiniting = true;
|
|
state.isInfiniting = true;
|
|
|
emit('load-more', infiniteDone);
|
|
emit('load-more', infiniteDone);
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
const scroll = e => {
|
|
const scroll = e => {
|
|
|
- console.log('加载到底部', props.containerId);
|
|
|
|
|
// 滚动方向
|
|
// 滚动方向
|
|
|
if (e.detail.scrollTop <= 0) {
|
|
if (e.detail.scrollTop <= 0) {
|
|
|
// 滚动到最顶部
|
|
// 滚动到最顶部
|
|
@@ -171,7 +166,6 @@ export default create({
|
|
|
state.direction = 'up';
|
|
state.direction = 'up';
|
|
|
}
|
|
}
|
|
|
state.scrollTop = e.detail.scrollTop;
|
|
state.scrollTop = e.detail.scrollTop;
|
|
|
- console.log(state.scrollTop);
|
|
|
|
|
|
|
|
|
|
emit('scroll-change', e.detail.scrollTop);
|
|
emit('scroll-change', e.detail.scrollTop);
|
|
|
};
|
|
};
|
|
@@ -186,7 +180,6 @@ export default create({
|
|
|
state.isTouching = true;
|
|
state.isTouching = true;
|
|
|
getParentElement('refreshTop')
|
|
getParentElement('refreshTop')
|
|
|
.boundingClientRect(rect => {
|
|
.boundingClientRect(rect => {
|
|
|
- console.log(rect);
|
|
|
|
|
state.refreshMaxH = Math.floor(rect.height * 1 + 10);
|
|
state.refreshMaxH = Math.floor(rect.height * 1 + 10);
|
|
|
})
|
|
})
|
|
|
.exec();
|
|
.exec();
|