diff --git a/fir_admin/src/api/developer.js b/fir_admin/src/api/developer.js new file mode 100644 index 0000000..1437d94 --- /dev/null +++ b/fir_admin/src/api/developer.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +export function getDeveloperInfo(query) { + return request({ + url: '/developer/info', + method: 'get', + params: query + }) +} + +export function updatedeveloperInfo(data) { + return request({ + url: '/developer/info', + method: 'put', + data + }) +} diff --git a/fir_admin/src/api/devices.js b/fir_admin/src/api/devices.js new file mode 100644 index 0000000..3c8a91a --- /dev/null +++ b/fir_admin/src/api/devices.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +export function getDevicesInfo(query) { + return request({ + url: '/devices/info', + method: 'get', + params: query + }) +} + +export function updatedevicesInfo(data) { + return request({ + url: '/devices/info', + method: 'put', + data + }) +} diff --git a/fir_admin/src/router/index.js b/fir_admin/src/router/index.js index 5982724..93f8162 100644 --- a/fir_admin/src/router/index.js +++ b/fir_admin/src/router/index.js @@ -137,18 +137,6 @@ export const constantRoutes = [ hidden: true } ] - }, - { - path: '/sign', - component: Layout, - children: [ - { - path: 'index', - name: 'index', - component: () => import('@/views/form/index'), - meta: { title: '超级签名', icon: 'form' } - } - ] }, { path: '/authentication', component: Layout, @@ -185,8 +173,53 @@ export const constantRoutes = [ hidden: true } ] - }, - { + }, { + path: '/supersign', + component: Layout, + redirect: '/supersign/developer', + name: '超级签名', + meta: { + title: '超级签名', + icon: 'nested' + }, + children: [ + { + path: 'developer', + name: 'developer', + redirect: '/supersign/developer/list', + component: () => import('@/views/supersign/index'), + children: [ + { + path: 'list', + name: 'developer_user_info_list', + component: () => import('@/views/supersign/developer/list'), + meta: { title: '苹果开发者', icon: 'form' } + }, + { + path: 'edit/:id(\\d+)', + component: () => import('@/views/supersign/developer/Detail'), + name: 'developer_user_info_edit', + meta: { title: '编辑信息', noCache: true, activeMenu: '/supersign/list' }, + hidden: true + } + ] + }, + { + path: 'devices', + name: 'devices', + redirect: '/supersign/devices/list', + component: () => import('@/views/supersign/index'), + children: [ + { + path: 'list', + name: 'devices_info_list', + component: () => import('@/views/supersign/devices/list'), + meta: { title: '设备消耗', icon: 'form' } + }, + ] + } + ] + }, { path: '/settings', component: Layout, redirect: '/settings/email', diff --git a/fir_admin/src/views/order/list.vue b/fir_admin/src/views/order/list.vue index 7ce28c8..4bd7748 100644 --- a/fir_admin/src/views/order/list.vue +++ b/fir_admin/src/views/order/list.vue @@ -59,7 +59,7 @@ @@ -123,8 +123,10 @@ import Pagination from '@/components/Pagination' // secondary package based on e import waves from '@/directive/waves' // waves directive const sortOptions = [ - { label: '创建时间 Ascending', key: 'reviewed_time' }, - { label: '创建时间 Descending', key: '-reviewed_time' }, + { label: '创建时间 Ascending', key: 'created_time' }, + { label: '创建时间 Descending', key: '-created_time' }, + { label: '付款时间 Ascending', key: 'pay_time' }, + { label: '付款时间 Descending', key: '-pay_time' } ] export default { diff --git a/fir_admin/src/views/storage/list.vue b/fir_admin/src/views/storage/list.vue index f778aca..a56c59c 100644 --- a/fir_admin/src/views/storage/list.vue +++ b/fir_admin/src/views/storage/list.vue @@ -100,10 +100,10 @@ import Pagination from '@/components/Pagination' // secondary package based on e import waves from '@/directive/waves' // waves directive const sortOptions = [ - { label: '创建时间 Ascending', key: 'reviewed_time' }, - { label: '创建时间 Descending', key: '-reviewed_time' }, - { label: '更新时间 Ascending', key: 'created_time' }, - { label: '更新时间 Descending', key: '-created_time' } + { label: '创建时间 Ascending', key: 'created_time' }, + { label: '创建时间 Descending', key: '-created_time' }, + { label: '更新时间 Ascending', key: 'updated_time' }, + { label: '更新时间 Descending', key: '-updated_time' } ] export default { @@ -176,7 +176,7 @@ export default { }, created() { this.fetchData() - },mounted() { + }, mounted() { if (this.$route.query.user_id) { this.listQuery.user_id = this.$route.query.user_id } diff --git a/fir_admin/src/views/supersign/Detail.vue b/fir_admin/src/views/supersign/developer/Detail.vue similarity index 52% rename from fir_admin/src/views/supersign/Detail.vue rename to fir_admin/src/views/supersign/developer/Detail.vue index e6d9a54..f0138cc 100644 --- a/fir_admin/src/views/supersign/Detail.vue +++ b/fir_admin/src/views/supersign/developer/Detail.vue @@ -10,18 +10,32 @@ - + - + - + - - + + + + + + + + + + + + + + + + @@ -40,7 +54,7 @@ - + @@ -49,61 +63,49 @@ - - + + + + + + + + + + + + + + + + + - + - + - + - + - + -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -118,29 +120,36 @@ diff --git a/fir_admin/src/views/supersign/list.vue b/fir_admin/src/views/supersign/devices/list.vue similarity index 62% rename from fir_admin/src/views/supersign/list.vue rename to fir_admin/src/views/supersign/devices/list.vue index 9fa1b92..1e524aa 100644 --- a/fir_admin/src/views/supersign/list.vue +++ b/fir_admin/src/views/supersign/devices/list.vue @@ -2,13 +2,12 @@
- - - - - - - + + + + + + @@ -37,54 +36,52 @@ - + - + - + - + - + - + - + + +