叶静 пре 1 месец
родитељ
комит
68ec8c6790

+ 7 - 1
src/views/order/payOrder/index.vue

@@ -105,11 +105,17 @@
 						{{ scope.row.paymentChannelName || '--' }}
 					</template>
 				</el-table-column>
-				<el-table-column label="金额" prop="amount" show-overflow-tooltip>
+				<el-table-column label="提交金额" prop="amount" show-overflow-tooltip>
 					<template #default="scope">
+						<!-- 橙色 -->
 						<span style="color: #f56c6c; font-weight: bold">¥{{ scope.row.amount ? scope.row.amount.toFixed(2) : '0.00' }}</span>
 					</template>
 				</el-table-column>
+				<el-table-column label="实际金额" prop="noticeAmount" show-overflow-tooltip>
+					<template #default="scope">
+						<span style="color: #f56c6c; font-weight: bold">¥{{ scope.row.noticeAmount ? scope.row.noticeAmount.toFixed(2) : '0.00' }}</span>
+					</template>
+				</el-table-column>
 				<el-table-column label="订单状态" prop="orderStatus" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag :type="orderStatusMap[scope.row.orderStatus]?.type || 'info'" size="small">

+ 7 - 1
src/views/order/withdrawOrder/index.vue

@@ -67,11 +67,17 @@
 						{{ scope.row.paymentChannelName || '--' }}
 					</template>
 				</el-table-column>
-				<el-table-column label="金额" prop="amount" show-overflow-tooltip>
+				<el-table-column label="提交金额" prop="amount" show-overflow-tooltip>
 					<template #default="scope">
+						<!-- 橙色 -->
 						<span style="color: #f56c6c; font-weight: bold">¥{{ scope.row.amount ? scope.row.amount.toFixed(2) : '0.00' }}</span>
 					</template>
 				</el-table-column>
+				<el-table-column label="实际金额" prop="noticeAmount" show-overflow-tooltip>
+					<template #default="scope">
+						<span style="color: #f56c6c; font-weight: bold">¥{{ scope.row.noticeAmount ? scope.row.noticeAmount.toFixed(2) : '0.00' }}</span>
+					</template>
+				</el-table-column>
 				<el-table-column label="订单状态" prop="orderStatus" show-overflow-tooltip>
 					<template #default="scope">
 						<el-tag :type="orderStatusMap[scope.row.orderStatus]?.type || 'info'" size="small">

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

@@ -25,6 +25,15 @@
 							<el-option label="提现订单" value="WITHDRAW" />
 						</el-select>
 					</el-form-item>
+					<el-form-item label="操作钱包类型" prop="walletType">
+						<el-select v-model="state.queryForm.walletType" placeholder="请选择钱包类型" style="max-width: 180px" clearable>
+							<el-option label="总金额" value="TOTAL" />
+							<el-option label="可用金额" value="USE" />
+							<el-option label="冻结金额" value="FREEZE" />
+							<el-option label="提现金额" value="WITHDRAW" />
+							<el-option label="提现总金额" value="WITHDRAW_TOTAL" />
+						</el-select>
+					</el-form-item>
 					<el-form-item label="订单创建时间" prop="orderCreateTime">
 						<el-date-picker
 							v-model="state.queryForm.orderCreateTime"
@@ -100,6 +109,11 @@
 						</el-tag>
 					</template>
 				</el-table-column>
+				<el-table-column label="操作钱包类型" prop="walletType" show-overflow-tooltip align="center">
+					<template #default="scope">
+						{{ walletTypeMap[scope.row.walletType]?.label || '--' }}
+					</template>
+				</el-table-column>
 				<el-table-column label="业务订单" prop="orderNo" show-overflow-tooltip width="200">
 					<template #default="scope">
 						{{ scope.row.orderNo || '--' }}
@@ -153,6 +167,15 @@ const orderTypeMap: Record<string, { label: string; type: any }> = {
 	WITHDRAW: { label: '提现订单', type: 'warning' },
 };
 
+// 钱包类型映射
+const walletTypeMap: Record<string, { label: string; type: any }> = {
+	TOTAL: { label: '总金额', type: 'primary' },
+	USE: { label: '可用金额', type: 'success' },
+	FREEZE: { label: '冻结金额', type: 'warning' },
+	WITHDRAW: { label: '提现金额', type: 'danger' },
+	WITHDRAW_TOTAL: { label: '提现总金额', type: 'info' },
+};
+
 // 定义变量内容
 const queryRef = ref();
 const showSearch = ref(true);
@@ -164,7 +187,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {
 		query: '',
 		orderFlowType: '',
-		walletType: 'USE', // 默认传递可用金额
+		walletType: '', // 默认传递可用金额
 		orderCreateTime: '',
 		payTime: '',
 	},
@@ -197,7 +220,7 @@ const resetQuery = () => {
 	state.queryForm = {
 		query: '',
 		orderFlowType: '',
-		walletType: 'USE', // 重置时也保持默认值为可用金额
+		walletType: '',
 		orderCreateTime: '',
 		payTime: '',
 	};