|
@@ -128,10 +128,13 @@ export default {
|
|
|
console.log(this.pullupUp,'pullingUp2')
|
|
console.log(this.pullupUp,'pullingUp2')
|
|
|
if(this.pullupUp) {
|
|
if(this.pullupUp) {
|
|
|
this.showLoadMoreText = true;
|
|
this.showLoadMoreText = true;
|
|
|
- this.loadMoreText = '正在加载...';
|
|
|
|
|
|
|
+ //this.loadMoreText = '正在加载...';
|
|
|
this.$emit('loadMore');
|
|
this.$emit('loadMore');
|
|
|
await this.upFn();
|
|
await this.upFn();
|
|
|
// 加载完成后,调用 this.loadMoreFinish() 结束加载更多
|
|
// 加载完成后,调用 this.loadMoreFinish() 结束加载更多
|
|
|
|
|
+ setTimeout(()=>{
|
|
|
|
|
+ this.loadMoreFinish();
|
|
|
|
|
+ },500)
|
|
|
}else {
|
|
}else {
|
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
|
this.loadMoreFinish();
|
|
this.loadMoreFinish();
|
|
@@ -157,7 +160,7 @@ export default {
|
|
|
|
|
|
|
|
// 结束上拉加载更多
|
|
// 结束上拉加载更多
|
|
|
loadMoreFinish() {
|
|
loadMoreFinish() {
|
|
|
- this.loadMoreText = '加载更多';
|
|
|
|
|
|
|
+ //this.loadMoreText = '加载更多';
|
|
|
this.showLoadMoreText = false;
|
|
this.showLoadMoreText = false;
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|