From a881ddd959b851522795793d518e3d40b2d2e980 Mon Sep 17 00:00:00 2001 From: 15233722133 <15233722133@163.com> Date: Fri, 26 Jun 2026 16:32:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=B6=E6=94=AF=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=94=B6=E7=9B=8A=E4=B8=8B=E6=B7=BB=E5=8A=A0=E4=B8=89=E4=B8=AA?= =?UTF-8?q?tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + pages/home/noReleaseAmount.vue | 81 +++++++++++++++++++++++++++++++--- 2 files changed, 77 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2a986d..cf56879 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ ### 新增 - 选品广场添加`风云榜` - 选品广场商品列表添加`七数商角标` + - 收支明细收益下添加`店长收益、权益收益、代理收益` ### 修改 - 金种子`池体量增长动态`数量展示调整为分 diff --git a/pages/home/noReleaseAmount.vue b/pages/home/noReleaseAmount.vue index 6441910..58546a3 100644 --- a/pages/home/noReleaseAmount.vue +++ b/pages/home/noReleaseAmount.vue @@ -27,6 +27,17 @@ + + + {{ tab.text }} + + @@ -55,6 +66,7 @@ const detailList = ref([]); const cardPages = ref(null); const filterOpen = ref(false); const filterIndex = ref(0); +const incomeTabValue = ref(null); const filterOptions = [ // { // value: 0, @@ -72,12 +84,21 @@ const filterOptions = [ value: 3, text: '分红', }, - { - value: 4, - text: '其他', - }, ]; +const incomeTabs = [ + { value: 4, text: '店长收益' }, + { value: 5, text: '权益收益' }, + { value: 6, text: '代理收益' }, +]; + +const isIncomeFilter = ref(false); + +const syncIncomeFilterFlag = () => { + const opt = filterOptions[filterIndex.value]; + isIncomeFilter.value = Number(opt?.value) === 2; +}; + const sysInfo = uni.getSystemInfoSync(); const listHeight = sysInfo.windowHeight - @@ -102,6 +123,7 @@ const getList = async (mescroll) => { pageNo: mescroll.num, pageSize: mescroll.size, ...(opt.value ? { transactionType: opt.value } : {}), + ...(isIncomeFilter.value && incomeTabValue.value ? { sourceType: incomeTabValue.value } : {}), }) .catch(() => ({ code: -1 })); @@ -117,7 +139,19 @@ const getList = async (mescroll) => { }; const getItemTitle = (item) => { - return item?.remark || item?.title || sourceTypeObj[Number(item?.sourceType) || 1] || '未行权金额'; + const incomeSourceTypeLabelMap = { + 4: '店长收益', + 5: '权益收益', + 6: '代理收益', + }; + const sourceType = Number(item?.sourceType); + return ( + item?.remark || + item?.title || + incomeSourceTypeLabelMap[sourceType] || + sourceTypeObj[sourceType || 1] || + '未行权金额' + ); }; const getItemAmount = (item) => { @@ -129,11 +163,20 @@ const getItemAmount = (item) => { const onFilterChange = (i) => { filterIndex.value = i; filterOpen.value = false; + incomeTabValue.value = null; + syncIncomeFilterFlag(); + cardPages.value?.mescrollTrigger(); +}; + +const onIncomeTabChange = (val) => { + const next = Number(val); + incomeTabValue.value = incomeTabValue.value === next ? null : next; cardPages.value?.mescrollTrigger(); }; onShow(() => { getHeaderData(); + syncIncomeFilterFlag(); cardPages.value?.mescrollTrigger(); }); @@ -230,6 +273,34 @@ onShow(() => { overflow: hidden; } +.income-tabs { + display: flex; + align-items: center; + justify-content: space-around; + padding: 0 0 20rpx; +} + +.income-tab { + width: 146rpx; + height: 62rpx; + line-height: 62rpx; + text-align: center; + background: #fff; + border-radius: 14rpx; + overflow: hidden; + font-size: 24rpx; + font-weight: 400; + color: #111111; + border: 2rpx solid #d9d9d9; + box-sizing: border-box; +} + +.income-tab.active { + color: #fb4d32; + background: #ffefe5; + border-color: transparent; +} + .detail-filter-item { text-align: center; line-height: 72rpx;