|
@@ -17,22 +17,22 @@ import {
|
|
|
onShow
|
|
onShow
|
|
|
} from '@dcloudio/uni-app';
|
|
} from '@dcloudio/uni-app';
|
|
|
import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js";
|
|
import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js";
|
|
|
-import {
|
|
|
|
|
- store
|
|
|
|
|
-} from "@/store/index.js"
|
|
|
|
|
-
|
|
|
|
|
|
|
|
|
|
// 调用mescroll的hook (注: mescroll-uni不用传onPageScroll,onReachBottom, 而mescroll-body必传)
|
|
// 调用mescroll的hook (注: mescroll-uni不用传onPageScroll,onReachBottom, 而mescroll-body必传)
|
|
|
const {
|
|
const {
|
|
|
mescrollInit,
|
|
mescrollInit,
|
|
|
- downCallback,
|
|
|
|
|
getMescroll
|
|
getMescroll
|
|
|
} = useMescroll()
|
|
} = useMescroll()
|
|
|
|
|
|
|
|
const windowHeight = computed(() => {
|
|
const windowHeight = computed(() => {
|
|
|
- return store.clientHeight - props.diffHeight
|
|
|
|
|
|
|
+ const sys = uni.getSystemInfoSync()
|
|
|
|
|
+ return sys.windowHeight - props.diffHeight
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
|
|
+const downCallback = (mescroll) => {
|
|
|
|
|
+ mescroll.resetUpScroll()
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
const emit = defineEmits(['updateList', 'update:total'])
|
|
const emit = defineEmits(['updateList', 'update:total'])
|
|
|
const props = defineProps({
|
|
const props = defineProps({
|
|
|
request: {
|
|
request: {
|