Răsfoiți Sursa

feat: 对接google验证器

叶静 2 luni în urmă
părinte
comite
e68f036ff2

+ 2 - 2
src/views/agent/list/form.vue

@@ -53,7 +53,7 @@
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="12" class="mb20">
+				<!-- <el-col :span="12" class="mb20">
 					<el-form-item :label="$t('agentUser.offlineRechargeRate')" prop="offlineRechargeRate">
 						<el-input-number
 							:placeholder="$t('agentUser.inputOfflineRechargeRateTip')"
@@ -65,7 +65,7 @@
 							style="width: 100%"
 						/>
 					</el-form-item>
-				</el-col>
+				</el-col> -->
 
 				<el-col :span="12" class="mb20">
 					<el-form-item :label="$t('agentUser.status')" prop="status">

+ 15 - 0
src/views/agent/list/index.vue

@@ -40,6 +40,21 @@
 				<el-table-column align="center" type="selection" width="40" />
 				<el-table-column :label="$t('agentUser.agentId')" prop="userId" show-overflow-tooltip />
 				<el-table-column :label="$t('agentUser.agentName')" prop="agentName" show-overflow-tooltip />
+				<el-table-column label="可用余额" prop="totalAmount" show-overflow-tooltip>
+					<template #default="scope">
+						{{ scope.row.availableAmount ? `¥${scope.row.availableAmount.toFixed(2)}` : '¥0.00' }}
+					</template>
+				</el-table-column>
+				<el-table-column label="冻结金额" prop="freezeAmount" show-overflow-tooltip>
+					<template #default="scope">
+						{{ scope.row.freezeAmount ? `¥${scope.row.freezeAmount.toFixed(2)}` : '¥0.00' }}
+					</template>
+				</el-table-column>
+				<el-table-column label="总提现金额" prop="withdrawnAmount" show-overflow-tooltip>
+					<template #default="scope">
+						{{ scope.row.withdrawnAmount ? `¥${scope.row.withdrawnAmount.toFixed(2)}` : '¥0.00' }}
+					</template>
+				</el-table-column>
 				<el-table-column :label="$t('agentUser.status')" prop="status" show-overflow-tooltip>
 					<template #default="scope">
 						<el-switch

+ 2 - 2
src/views/merchant/list/form.vue

@@ -73,7 +73,7 @@
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="12" class="mb20">
+				<!-- <el-col :span="12" class="mb20">
 					<el-form-item :label="$t('merchantUser.offlineRechargeRate')" prop="offlineRechargeRate">
 						<el-input-number
 							:placeholder="$t('merchantUser.inputOfflineRechargeRateTip')"
@@ -85,7 +85,7 @@
 							style="width: 100%"
 						/>
 					</el-form-item>
-				</el-col>
+				</el-col> -->
 
 				<el-col :span="12" class="mb20">
 					<el-form-item :label="$t('merchantUser.status')" prop="status">

+ 3 - 3
src/views/merchant/list/index.vue

@@ -41,12 +41,12 @@
 				<el-table-column :label="$t('merchantUser.merchantId')" prop="userId" show-overflow-tooltip />
 				<el-table-column :label="$t('merchantUser.merchantName')" prop="merchantName" show-overflow-tooltip />
 				<el-table-column :label="$t('merchantUser.agentName')" prop="agentName" show-overflow-tooltip />
-				<el-table-column :label="$t('merchantUser.totalAmount')" prop="totalAmount" show-overflow-tooltip>
+				<el-table-column label="可用余额" prop="availableAmount" show-overflow-tooltip>
 					<template #default="scope">
-						{{ scope.row.totalAmount ? `¥${scope.row.totalAmount.toFixed(2)}` : '¥0.00' }}
+						{{ scope.row.availableAmount ? `¥${scope.row.availableAmount.toFixed(2)}` : '¥0.00' }}
 					</template>
 				</el-table-column>
-				<el-table-column :label="$t('merchantUser.freezeAmount')" prop="freezeAmount" show-overflow-tooltip>
+				<el-table-column label="冻结金额" prop="freezeAmount" show-overflow-tooltip>
 					<template #default="scope">
 						{{ scope.row.freezeAmount ? `¥${scope.row.freezeAmount.toFixed(2)}` : '¥0.00' }}
 					</template>

+ 3 - 2
src/views/merchant/list/merchantPaymentConfigDialog.vue

@@ -284,10 +284,11 @@ const openDialog = (row: any, merchantUserId: string, paymentType: 'PAY' | 'HARV
 		formData.merchantUserFeeType = row.merchantUserFeeType || 'PERCENTAGE';
 		formData.merchantUserFeeEvery = row.merchantUserFeeEvery || 0;
 	}
-	formData.singleMinAmount = row.singleMinAmount || 0;
-	formData.singleMaxAmount = row.singleMaxAmount || 0;
 	formData.baseSingleMinAmount = row.baseSingleMinAmount || 0;
 	formData.baseSingleMaxAmount = row.baseSingleMaxAmount || 0;
+	// 如果没有值,默认等于通道限制金额
+	formData.singleMinAmount = row.singleMinAmount || formData.baseSingleMinAmount;
+	formData.singleMaxAmount = row.singleMaxAmount || formData.baseSingleMaxAmount;
 
 	nextTick(() => {
 		formRef.value?.clearValidate();