diff --git a/fir_admin/src/api/developer.js b/fir_admin/src/api/developer.js index 1437d94..23b8f70 100644 --- a/fir_admin/src/api/developer.js +++ b/fir_admin/src/api/developer.js @@ -15,3 +15,34 @@ export function updatedeveloperInfo(data) { data }) } + +export function getBillInfo(query) { + return request({ + url: '/bill/info', + method: 'get', + params: query + }) +} + +export function addBillInfo(data) { + return request({ + url: '/bill/info', + method: 'post', + data + }) +} +export function delBillInfo(data) { + return request({ + url: '/bill/info', + method: 'delete', + data + }) +} + +export function getUserBillInfo(query) { + return request({ + url: '/bill/userinfo', + method: 'get', + params: query + }) +} diff --git a/fir_admin/src/router/index.js b/fir_admin/src/router/index.js index 2b024db..b65cb67 100644 --- a/fir_admin/src/router/index.js +++ b/fir_admin/src/router/index.js @@ -278,6 +278,27 @@ export const constantRoutes = [ meta: { title: '设备消耗', icon: 'form' } } ] + }, + { + path: 'bill', + name: 'bill', + redirect: '/supersign/bill/list', + component: () => import('@/views/supersign/index'), + meta: { title: '设备账单', icon: 'form' }, + children: [ + { + path: 'list', + name: 'bill_info_list', + component: () => import('@/views/supersign/bill/list'), + meta: { title: '消耗账单', icon: 'form' } + }, + { + path: 'add', + name: 'bill_info_add', + component: () => import('@/views/supersign/bill/add'), + meta: { title: '设备充值', icon: 'form' } + } + ] } ] }, diff --git a/fir_admin/src/views/supersign/bill/add.vue b/fir_admin/src/views/supersign/bill/add.vue new file mode 100644 index 0000000..b853dda --- /dev/null +++ b/fir_admin/src/views/supersign/bill/add.vue @@ -0,0 +1,117 @@ + + + diff --git a/fir_admin/src/views/supersign/bill/list.vue b/fir_admin/src/views/supersign/bill/list.vue new file mode 100644 index 0000000..2adfc1c --- /dev/null +++ b/fir_admin/src/views/supersign/bill/list.vue @@ -0,0 +1,203 @@ + + + diff --git a/fir_client/src/components/user/FirSuperSignBase.vue b/fir_client/src/components/user/FirSuperSignBase.vue index 855cbad..76771bc 100644 --- a/fir_client/src/components/user/FirSuperSignBase.vue +++ b/fir_client/src/components/user/FirSuperSignBase.vue @@ -132,23 +132,27 @@ + > + label="设备状态"> @@ -174,15 +178,15 @@ 搜索 -
- 总设备量:{{ developer_used_info.all_usable_number }} 已经使用:【平台:{{ +
+ 私有总设备量:{{ developer_used_info.all_usable_number }} 已经使用:【平台:{{ developer_used_info.all_use_number - }} 】【其他:{{ developer_used_info.other_used_sum }} 】 + }} 】【其他:{{ developer_used_info.other_used_sum }}】 还剩:{{ developer_used_info.all_usable_number - developer_used_info.flyapp_used_sum }} 可用 @@ -566,7 +637,18 @@ 搜索 - +
+ 公共签名池设备数量:{{ balance_info.all_balance }} 已经使用:【 {{ + balance_info.used_balance + }} 】 + 还剩:【 {{ balance_info.all_balance - balance_info.used_balance }} 】 可用 + + +
+ width="100"> @@ -644,7 +726,7 @@