diff --git a/src/pages/index/components/detail.vue b/src/pages/index/components/detail.vue index baf450f..e4a46f1 100644 --- a/src/pages/index/components/detail.vue +++ b/src/pages/index/components/detail.vue @@ -6,6 +6,7 @@ import { storeToRefs } from 'pinia' import { toHttpsUrl } from '@/utils' // import { onLoad, onReachBottom, onShow } from '@dcloudio/uni-app' import { getBorrowReturnDynamicApi, type BorrowReturnDynamicDTO, type SearchBorrowReturnDynamicQuery } from '@/api/order' +import { TabsInstance } from 'wot-design-uni/components/wd-tabs/types' // 定义组件接收的属性 const props = defineProps<{ @@ -19,7 +20,9 @@ const emit = defineEmits<{ // 状态管理 const cartStore = useCartStore() -const { cartItems } = storeToRefs(cartStore) +const { cartItems } = storeToRefs(cartStore); + +const tabsRef = ref(); // 购物车控制 const showAddCart = ref(false) @@ -45,7 +48,6 @@ const scrollHeight = computed(() => { const headerHeight = 60 // 顶部操作栏高度 const actionBarHeight = 64 // 底部操作栏高度 const tabHeight = 44 // 标签栏高度 - console.log('scrollHeight', windowHeight, headerHeight, actionBarHeight, tabHeight) return `${windowHeight - headerHeight - actionBarHeight - tabHeight}px` }) @@ -103,8 +105,6 @@ function doShowAddCart(): boolean { // 获取借还动态数据(带分页) async function loadDynamicList(page: number = 1) { - console.log('loadDynamicList', page) - console.log('props.product', props.product) if (!props.product?.id) return loading.value = true @@ -118,7 +118,6 @@ async function loadDynamicList(page: number = 1) { } const response = await getBorrowReturnDynamicApi(query) - console.log('response', response) if (response?.data?.rows) { if (page === 1) { @@ -132,7 +131,6 @@ async function loadDynamicList(page: number = 1) { pageNum.value = page // 判断是否已加载全部 - console.log('dynamicList.value.length', dynamicList.value.length, 'total.value', total.value) if (dynamicList.value.length >= total.value) { loadmoreState.value = 'finished' } else { @@ -149,7 +147,6 @@ async function loadDynamicList(page: number = 1) { // 加载更多数据 function loadMoreData() { - console.log('loadMoreData', pageNum.value, loadmoreState.value, loading.value, dynamicList.value.length, total.value) if (loadmoreState.value === 'finished' || loading.value) return if (dynamicList.value.length >= total.value) { loadmoreState.value = 'finished' @@ -160,7 +157,6 @@ function loadMoreData() { // scroll-view 滚动到底部事件处理 function handleScrollToLower() { - console.log('handleScrollToLower', pageNum.value, loadmoreState.value, loading.value, dynamicList.value.length, total.value) loadMoreData() } @@ -178,15 +174,14 @@ const refreshDynamicList = () => { loadDynamicList(1); } -onShow(() => { - refreshDynamicList(); -}) - - - watch(() => props.product, () => { // 重置参数 - activeTab.value = 0; + // activeTab.value = 0; + wx.pageScrollTo({ + scrollTop: 0, + duration: 300 + }); + tabsRef.value?.updateLineStyle(false); quantity.value = 1; showAddCart.value = false; refreshDynamicList(); @@ -207,7 +202,7 @@ watch(() => props.product, () => { - +