diff --git a/src/api/ss/account.js b/src/api/ss/account.js new file mode 100644 index 0000000..28dc6e8 --- /dev/null +++ b/src/api/ss/account.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询用户账户列表 +export function listAccount(query) { + return request({ + url: '/ss/account/list', + method: 'get', + params: query + }) +} + +// 查询用户账户详细 +export function getAccount(accountId) { + return request({ + url: '/ss/account/' + accountId, + method: 'get' + }) +} + +// 新增用户账户 +export function addAccount(data) { + return request({ + url: '/ss/account', + method: 'post', + data: data + }) +} + +// 修改用户账户 +export function updateAccount(data) { + return request({ + url: '/ss/account', + method: 'put', + data: data + }) +} + +// 删除用户账户 +export function delAccount(accountId) { + return request({ + url: '/ss/account/' + accountId, + method: 'delete' + }) +} diff --git a/src/api/system/smUser.js b/src/api/system/smUser.js index 5d1b9c0..86ee5c1 100644 --- a/src/api/system/smUser.js +++ b/src/api/system/smUser.js @@ -44,15 +44,6 @@ export function updateSmUser(data) { }) } -// 修改普通用户服务费 -export function updateServiceRate(data) { - return request({ - url: '/system/smUser/updateServiceRate', - method: 'put', - data: data - }) -} - // 删除普通用户信息 export function delSmUser(userId) { return request({ @@ -60,3 +51,11 @@ export function delSmUser(userId) { method: 'delete' }) } + +// 重置用户服务费 +export function resetSmUserService(userId) { + return request({ + url: `/system/smUser/${userId}/resetService`, + method: 'put' + }) +} diff --git a/src/utils/constants.js b/src/utils/constants.js index 9729655..659626f 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -3,6 +3,14 @@ export const views = { user: 'user', } +// 收款账户类型 +export const AccountType = { + BANK_CARD: "1", // 银行卡 + WECHAT: "2", // 微信 + ALI_PAY: "3", // 支付宝 + OFFLINE_IMAGE: "4" // 线下收款 +} + export const UserType = { ADMIN: "1", // 管理员 APP: "2" // 普通用户 diff --git a/src/utils/mixins.js b/src/utils/mixins.js index 73d301e..e68a313 100644 --- a/src/utils/mixins.js +++ b/src/utils/mixins.js @@ -65,7 +65,7 @@ export const $showColumns = { }, } -// 服务费 +// 充值服务费 export const $serviceType = { computed: { // 服务费单位 @@ -76,3 +76,15 @@ export const $serviceType = { } } } + +// 提现服务费 +export const $withdrawServiceType = { + computed: { + // 提现服务费单位 + withdrawServiceUnit() { + return (type) => { + return type === '2' ? '元' : '%'; + } + } + } +} diff --git a/src/views/ss/account/index.vue b/src/views/ss/account/index.vue new file mode 100644 index 0000000..07572b2 --- /dev/null +++ b/src/views/ss/account/index.vue @@ -0,0 +1,388 @@ + + + diff --git a/src/views/ss/mchApply/index.vue b/src/views/ss/mchApply/index.vue index 818ad7a..6dc9cbf 100644 --- a/src/views/ss/mchApply/index.vue +++ b/src/views/ss/mchApply/index.vue @@ -25,6 +25,16 @@ @keyup.enter.native="handleQuery" /> + + + + + - - 修改 - + + + + + + + + + + + @@ -64,16 +64,33 @@ - + - - + + - - + + + + + + + + + + +