fix: bug
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 4m7s

This commit is contained in:
sexygoat
2026-04-25 12:01:21 +08:00
parent 17c299e4ce
commit 9247001643
9 changed files with 901 additions and 311 deletions

View File

@@ -3,30 +3,16 @@
<ArtTableFullScreen>
<div class="agent-commission-page" id="table-full-screen">
<!-- 搜索栏 -->
<ElCard shadow="never" class="search-card">
<ElForm :inline="true" :model="searchForm" class="search-form">
<ElFormItem label="店铺名称">
<ElInput
v-model="searchForm.shop_name"
placeholder="请输入店铺名称"
clearable
style="width: 200px"
/>
</ElFormItem>
<ElFormItem label="店铺编码">
<ElInput
v-model="searchForm.shop_code"
placeholder="请输入店铺编码"
clearable
style="width: 200px"
/>
</ElFormItem>
<ElFormItem>
<ElButton type="primary" @click="handleSearch">查询</ElButton>
<ElButton @click="handleReset">重置</ElButton>
</ElFormItem>
</ElForm>
</ElCard>
<ArtSearchBar
v-model:filter="searchForm"
:items="searchFormItems"
:gutter="16"
:el-col-span="6"
label-width="100"
:show-expand="false"
@reset="handleReset"
@search="handleSearch"
></ArtSearchBar>
<ElCard shadow="never" class="art-table-card">
<!-- 表格头部 -->
@@ -388,6 +374,7 @@
CommissionResolveAction,
MainWalletTransactionItem
} from '@/types/api/commission'
import type { SearchFormItem } from '@/types'
import { useCheckedColumns } from '@/composables/useCheckedColumns'
import { useAuth } from '@/composables/useAuth'
import ArtButtonTable from '@/components/core/forms/ArtButtonTable.vue'
@@ -413,7 +400,7 @@
// 搜索表单
const searchForm = reactive({
shop_name: '',
shop_code: ''
username: ''
})
// 主表格分页
@@ -501,6 +488,28 @@
{ label: '未提现', prop: 'unwithdraw_commission' }
]
// 搜索表单配置
const searchFormItems: SearchFormItem[] = [
{
label: '店铺名称',
prop: 'shop_name',
type: 'input',
config: {
clearable: true,
placeholder: '请输入店铺名称'
}
},
{
label: '主账号用户名',
prop: 'username',
type: 'input',
config: {
clearable: true,
placeholder: '请输入主账号用户名'
}
}
]
// 处理名称点击
const handleNameClick = (row: ShopFundSummaryItem) => {
if (hasAuth('agent_commission:detail')) {
@@ -515,13 +524,13 @@
{
prop: 'shop_code',
label: '店铺编码',
minWidth: 150,
minWidth: 140,
showOverflowTooltip: true
},
{
prop: 'shop_name',
label: '店铺名称',
minWidth: 180,
minWidth: 160,
showOverflowTooltip: true,
formatter: (row: ShopFundSummaryItem) => {
return h(
@@ -545,12 +554,12 @@
{
prop: 'phone',
label: '手机号',
width: 130
width: 120
},
{
prop: 'main_balance',
label: '预充值余额',
width: 130,
minWidth: 130,
formatter: (row: ShopFundSummaryItem) => {
return h(
'span',
@@ -562,13 +571,13 @@
{
prop: 'total_commission',
label: '总佣金',
width: 120,
minWidth: 120,
formatter: (row: ShopFundSummaryItem) => formatMoney(row.total_commission)
},
{
prop: 'available_commission',
label: '可提现',
width: 120,
minWidth: 120,
formatter: (row: ShopFundSummaryItem) => {
return h(
'span',
@@ -580,13 +589,13 @@
{
prop: 'frozen_commission',
label: '冻结中',
width: 120,
minWidth: 110,
formatter: (row: ShopFundSummaryItem) => formatMoney(row.frozen_commission)
},
{
prop: 'withdrawing_commission',
label: '提现中',
width: 120,
minWidth: 110,
formatter: (row: ShopFundSummaryItem) => {
return h(
'span',
@@ -598,13 +607,13 @@
{
prop: 'withdrawn_commission',
label: '已提现',
width: 120,
minWidth: 110,
formatter: (row: ShopFundSummaryItem) => formatMoney(row.withdrawn_commission)
},
{
prop: 'unwithdraw_commission',
label: '未提现',
width: 120,
minWidth: 110,
formatter: (row: ShopFundSummaryItem) => formatMoney(row.unwithdraw_commission)
}
])
@@ -621,7 +630,7 @@
page: pagination.page,
page_size: pagination.pageSize,
shop_name: searchForm.shop_name || undefined,
shop_code: searchForm.shop_code || undefined
username: searchForm.username || undefined
}
const res = await CommissionService.getShopFundSummary(params)
if (res.code === 0) {
@@ -645,7 +654,7 @@
// 重置
const handleReset = () => {
searchForm.shop_name = ''
searchForm.shop_code = ''
searchForm.username = ''
pagination.page = 1
getTableData()
}
@@ -907,13 +916,9 @@
}
.agent-commission-page {
.search-card {
:deep(.art-custom-card) {
margin-bottom: 16px;
}
.search-form {
margin-bottom: 0;
}
}
.detail-tabs {