diff --git a/src/api/trade/index.js b/src/api/trade/index.js
index e35ad43..6c9ab56 100644
--- a/src/api/trade/index.js
+++ b/src/api/trade/index.js
@@ -26,3 +26,55 @@ export function getUserChargeList(data) {
data: data
});
}
+
+// 用户分账记录
+export function getUserDivideList(data) {
+ return request({
+ url: `/trans/divide/list`,
+ method: 'post',
+ data: data
+ });
+}
+
+// 用户分账规则记录
+export function getUserDivideRuleList(data) {
+ return request({
+ url: `/trans/divide/rule/list`,
+ method: 'post',
+ data: data
+ });
+}
+
+// 用户分账规则新增
+export function addUserDivideRule(data) {
+ return request({
+ url: `/trans/divide/rule/add`,
+ method: 'post',
+ data: data
+ });
+}
+
+// 用户分账规则编辑
+export function editUserDivideRule(data) {
+ return request({
+ url: `/trans/divide/rule/update`,
+ method: 'post',
+ data: data
+ });
+}
+
+// 用户分账规则详情
+export function getUserDivideRuleDetail(id) {
+ return request({
+ url: `/trans/divide/rule/${id}`,
+ method: 'get'
+ });
+}
+
+// 删除分账规则
+export function deleteUserDivideRule(id) {
+ return request({
+ url: '/trans/divide/rule/' + id,
+ method: 'delete'
+ });
+}
diff --git a/src/views/trade/chargeManage/index.vue b/src/views/trade/chargeManage/index.vue
new file mode 100644
index 0000000..bd842d4
--- /dev/null
+++ b/src/views/trade/chargeManage/index.vue
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+ {{ getEmulistLabelById(scope.row.method, userWithdrawMethodMap) }}
+
+
+
+
+ {{ getEmulistLabelById(scope.row.type, userWithdrawTypeMap) }}
+
+
+
+
+ {{ getEmulistLabelById(scope.row.status, userWithdrawStatusMap) }}
+
+
+
+ ¥ {{ scope.row.money || '0.00' }}
+
+
+ ¥ {{ scope.row.fee || '0.00' }}
+
+
+
+ ¥ {{ scope.row.actualMoney || '0.00' }}
+
+
+
{
+ getList(userChargedrawInfo.record);
+ }
+ "
+ />
+
+
+
+
diff --git a/src/views/trade/divideManage/index.vue b/src/views/trade/divideManage/index.vue
new file mode 100644
index 0000000..3f5bea9
--- /dev/null
+++ b/src/views/trade/divideManage/index.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+ ¥ {{ scope.row.orderMoney || '0.00' }}
+
+
+ ¥ {{ scope.row.fee || '0.00' }}
+
+
+
+ ¥ {{ scope.row.actualMoney || '0.00' }}
+
+
+
+ {{ getEmulistLabelById(scope.row.type, userTypeMap) }}
+
+
+
+
+ {{ getEmulistLabelById(scope.row.status, userStatusMap) }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/trade/divideRuleManage/index.vue b/src/views/trade/divideRuleManage/index.vue
new file mode 100644
index 0000000..d80ddb6
--- /dev/null
+++ b/src/views/trade/divideRuleManage/index.vue
@@ -0,0 +1,353 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+ 新增
+
+
+
+
+
+
+ ¥ {{ scope.row.fee || '0.00' }}
+
+
+
+ ¥ {{ scope.row.actualMoney || '0.00' }}
+
+
+
+ {{ getEmulistLabelById(scope.row.status, userStatusMap) }}
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+ 序号
+ {{ index + 1 }}
+
+
+
+
+ 金额分配比例
+
+
+
+
+
+ 手续费分配比例
+
+
+
+
+
+ 账户类型
+
+
+
+
+
+
+
+
+
+ 操作
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/trade/withdrawManage/index.vue b/src/views/trade/withdrawManage/index.vue
index e79dd3b..645c4f1 100644
--- a/src/views/trade/withdrawManage/index.vue
+++ b/src/views/trade/withdrawManage/index.vue
@@ -207,8 +207,7 @@ export default {
},
// 提交审核
confirmSubmitAudit() {
- const { id, member = {} } = this.currentRecord;
- const { id: memberId } = member;
+ const { id, memberId } = this.currentRecord;
if (!this.auditStatus) {
return this.$modal.msgWarning(`请选择审核结果!`);
}
diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue
index 6f2af79..3ee2cdb 100644
--- a/src/views/ums/member/index.vue
+++ b/src/views/ums/member/index.vue
@@ -38,7 +38,7 @@
-
+
@@ -514,11 +514,9 @@ import {
getUserBalanceList,
deleteUser,
getUserBannelList,
- getUserBankCardList,
- getUserWithdrawList,
- setWithdrawStatus,
- getUserChargeList
+ getUserBankCardList
} from '@/api/ums/member';
+import { getUserChargeList } from '@/api/trade/index.js';
import dateUtil from '@/utils/DateUtil';
import { useUserStore } from '@/store/modules/user';
import AddressSelector from '@/views/components/AddressSelector/index.vue';
diff --git a/src/views/ums/member/userWithdraw.vue b/src/views/ums/member/userWithdraw.vue
index 3e3be0e..95c0e47 100644
--- a/src/views/ums/member/userWithdraw.vue
+++ b/src/views/ums/member/userWithdraw.vue
@@ -93,7 +93,7 @@