From beba60aa924af26cfd1cdc1f12a3b5f432ddad4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com> Date: Sat, 27 Jul 2024 17:58:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ss/account.js | 44 ++++ src/views/ss/account/index.vue | 357 +++++++++++++++++++++++++++++ src/views/system/smUser/detail.vue | 6 +- 3 files changed, 406 insertions(+), 1 deletion(-) create mode 100644 src/api/ss/account.js create mode 100644 src/views/ss/account/index.vue 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/views/ss/account/index.vue b/src/views/ss/account/index.vue new file mode 100644 index 0000000..8296c9e --- /dev/null +++ b/src/views/ss/account/index.vue @@ -0,0 +1,357 @@ + + + diff --git a/src/views/system/smUser/detail.vue b/src/views/system/smUser/detail.vue index e45ac16..ae51a21 100644 --- a/src/views/system/smUser/detail.vue +++ b/src/views/system/smUser/detail.vue @@ -43,6 +43,9 @@ + + + @@ -67,11 +70,12 @@ import Access from '@/views/ss/access/index.vue' import { $serviceType, $view } from '@/utils/mixins' import Store from '@/views/ss/store/index.vue' import RecordBalance from '@/views/ss/recordBalance/index.vue' +import Account from '@/views/ss/account/index.vue' export default { name: 'deviceDetail', mixins: [$view, $serviceType], - components: { RecordBalance, Store, Access, UserRechargeReport, UserAccount, UserDevice, LineChart}, + components: { Account, RecordBalance, Store, Access, UserRechargeReport, UserAccount, UserDevice, LineChart}, dicts: ['sm_user_type', 'service_type'], computed: { serviceUnit() { From 9540661a2c2f23239170d1b3a497494d93df0c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com> Date: Mon, 29 Jul 2024 10:33:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B8=A0=E9=81=93=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=81=E6=8F=90=E7=8E=B0=E5=85=85=E5=80=BC=E6=89=8B=E7=BB=AD?= =?UTF-8?q?=E8=B4=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/smUser.js | 17 +-- src/utils/constants.js | 8 + src/utils/mixins.js | 14 +- src/views/ss/account/index.vue | 95 ++++++++---- src/views/system/channel/index.vue | 139 ++++++++++++++---- src/views/system/device/detail.vue | 2 +- src/views/system/device/index.vue | 2 +- .../smUser/components/serviceRateForm.vue | 76 ---------- src/views/system/smUser/detail.vue | 2 +- src/views/system/smUser/index.vue | 77 ++++++++-- src/views/system/withdraw/index.vue | 7 +- 11 files changed, 270 insertions(+), 169 deletions(-) delete mode 100644 src/views/system/smUser/components/serviceRateForm.vue 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 d5f9c04..a200627 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -2,3 +2,11 @@ export const views = { user: 'user', } + +// 收款账户类型 +export const AccountType = { + BANK_CARD: "1", // 银行卡 + WECHAT: "2", // 微信 + ALI_PAY: "3", // 支付宝 + OFFLINE_IMAGE: "4" // 线下收款 +} 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 index 8296c9e..07572b2 100644 --- a/src/views/ss/account/index.vue +++ b/src/views/ss/account/index.vue @@ -78,6 +78,7 @@ :prop="column.key" :align="column.align" :min-width="column.minWidth" + :width="column.width" :sort-orders="orderSorts" :sortable="column.sortable" :show-overflow-tooltip="column.overflow" @@ -86,12 +87,18 @@ -