Browse Source

feat: 完善功能

叶静 1 month ago
parent
commit
13e52266bd
2 changed files with 3 additions and 6 deletions
  1. 2 2
      src/views/settlement/fundFlow/index.vue
  2. 1 4
      src/views/settlement/record/index.vue

+ 2 - 2
src/views/settlement/fundFlow/index.vue

@@ -132,8 +132,8 @@ import { fetchFundFlowList, getMerchantBalance } from '/@/api/settlement';
 
 // 余额卡片配置
 const balanceCards = [
-	{ key: 'totalUseAmount', label: '账户余额' },
-	{ key: 'totalAmount', label: '总交易金额' },
+	{ key: 'totalUseAmount', label: '可用余额' },
+	{ key: 'totalAmount', label: '总金额' },
 	{ key: 'freezeAmount', label: '总冻结金额' },
 	{ key: 'withdrawnAmount', label: '总提现金额' },
 ];

+ 1 - 4
src/views/settlement/record/index.vue

@@ -3,9 +3,6 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row class="ml10" v-show="showSearch">
 				<el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
-					<el-form-item label="代理名称" prop="merchantName">
-						<el-input placeholder="请输入代理名称" style="max-width: 180px" v-model="state.queryForm.merchantName" clearable />
-					</el-form-item>
 					<el-form-item label="真实姓名" prop="realName">
 						<el-input placeholder="请输入真实姓名" style="max-width: 180px" v-model="state.queryForm.realName" clearable />
 					</el-form-item>
@@ -47,7 +44,7 @@
 				:header-cell-style="tableStyle.headerCellStyle"
 			>
 				<el-table-column align="center" type="selection" width="40" />
-				<el-table-column label="代理名称" prop="merchantName" show-overflow-tooltip>
+				<el-table-column label="商户名称" prop="merchantName" show-overflow-tooltip>
 					<template #default="scope">
 						{{ scope.row.merchantName || '--' }}
 					</template>