diff --git a/pages/components/pages/balance/bill.vue b/pages/components/pages/balance/bill.vue index 181291c..9f1ce8f 100644 --- a/pages/components/pages/balance/bill.vue +++ b/pages/components/pages/balance/bill.vue @@ -78,9 +78,6 @@ const list = ref([ { name: '消费' }, - // { - // name: '充值' - // }, { name: '退款' } @@ -99,7 +96,7 @@ const current = ref(0) const swiperCurrent = ref(0) const tabsHeight = ref(0) const dx = ref(0) -const loadStatus = ref(['loadmore', 'loadmore', 'loadmore', 'loadmore']) +const loadStatus = ref(['loadmore', 'loadmore', 'loadmore']) const page = ref(1) const pageSize = ref(20) const tabs = ref() @@ -116,7 +113,13 @@ const getBill = async () => { return; } loadStatus.value.splice(swiperCurrent.value, 1, "loading") - let data = await balanceGetBillList({ cate: cate.value, type: swiperCurrent.value, page: page.value, pagesize: pageSize.value }); + let data; + if(swiperCurrent.value === 2) { + data = await balanceGetBillList({ cate: cate.value, type: 3, page: page.value, pagesize: pageSize.value }); + }else { + data = await balanceGetBillList({ cate: cate.value, type: swiperCurrent.value, page: page.value, pagesize: pageSize.value }); + } + if (page.value == 1) { orderList.value[swiperCurrent.value] = []; } @@ -137,8 +140,8 @@ const reachBottom = () => { } // tab栏切换 const change = (e) => { - if (e.name == '退款') { - swiperCurrent.value = 3; + if (e.index === 2) { + swiperCurrent.value = 2; page.value = 1; } else { diff --git a/pages/components/pages/pay/pay.vue b/pages/components/pages/pay/pay.vue index 17b4eaf..dbd7c15 100644 --- a/pages/components/pages/pay/pay.vue +++ b/pages/components/pages/pay/pay.vue @@ -215,20 +215,21 @@ --> -