Merge remote-tracking branch 'origin/feature/v1.0.78' into feature/v1.0.78

apps/mobile/src/views/search/result/bidding/index.vue

@@ -1094,7 +1094,7 @@ export default {
     this.calcDropdownMenuMaxHeight()
     this.$nextTick(() => {
       const scrollWrap = this.$refs.listContainer
-      scrollWrap.addEventListener('scroll', throttle(this.scrollWrapFn, 300))
+      scrollWrap.addEventListener('scroll', throttle(this.scrollWrapFn, 200))
     })
     this.getWhiteListInfo()
   },
@@ -2836,9 +2836,14 @@ export default {
     setScrollWrapState(e) {
       const scrollDOM = e.target
       const scrollTop = scrollDOM.scrollTop
+      const scrollHeight = scrollDOM.scrollHeight
+      const offsetHeight = scrollDOM.offsetHeight
       // this.recommendInfo.showContent = false
-
+      // console.log('scrollTop:'+ scrollTop, 'scrollHeight:'+ scrollHeight, 'offsetHeight:'+ offsetHeight, 'lastScroll:' + this.lastScroll)
+      // 加载中 return
       if (this.listState.loading) return
+      // 滚动到底部 return
+      if (scrollTop + offsetHeight >= scrollHeight) return
       if (scrollTop >= this.lastScroll) {
         this.pageState.tabSwitchShow = false
       } else {