diff --git a/components.d.ts b/components.d.ts index 4690207..575c671 100644 --- a/components.d.ts +++ b/components.d.ts @@ -10,7 +10,6 @@ export {} declare module '@vue/runtime-core' { export interface GlobalComponents { _index: typeof import('./src/core/components/_sample/_index.vue')['default'] - AAffix: typeof import('ant-design-vue/es')['Affix'] AAvatar: typeof import('ant-design-vue/es')['Avatar'] ABadge: typeof import('ant-design-vue/es')['Badge'] AButton: typeof import('ant-design-vue/es')['Button'] @@ -34,7 +33,6 @@ declare module '@vue/runtime-core' { AModal: typeof import('ant-design-vue/es')['Modal'] APagination: typeof import('ant-design-vue/es')['Pagination'] APopconfirm: typeof import('ant-design-vue/es')['Popconfirm'] - APopover: typeof import('ant-design-vue/es')['Popover'] ARadio: typeof import('ant-design-vue/es')['Radio'] ARadioButton: typeof import('ant-design-vue/es')['RadioButton'] ARadioGroup: typeof import('ant-design-vue/es')['RadioGroup'] @@ -51,6 +49,7 @@ declare module '@vue/runtime-core' { AUpload: typeof import('ant-design-vue/es')['Upload'] BaseButton: typeof import('./src/core/components/BaseButton/index.ts')['default'] BaseCard: typeof import('./src/core/components/BaseCard/index.ts')['default'] + BaseCollapse: typeof import('./src/components/BaseCollapse.vue')['default'] BaseDatePicker: typeof import('./src/core/components/BaseDatePicker/index.ts')['default'] BaseIcon: typeof import('./src/core/components/BaseIcon/index.ts')['default'] BaseInputNumber: typeof import('./src/core/components/BaseInputNumber/index.ts')['default'] @@ -58,12 +57,16 @@ declare module '@vue/runtime-core' { BaseSwitch: typeof import('./src/core/components/BaseSwitch/index.ts')['default'] BaseTable: typeof import('./src/core/components/BaseTable/index.ts')['default'] BaseTableOld: typeof import('./src/core/components/BaseTableOld/index.ts')['default'] + BasicActionSheet: typeof import('./src/components/BasicActionSheet.vue')['default'] BasicCard: typeof import('./src/components/BasicCard.vue')['default'] BasicInfoItem: typeof import('./src/components/BasicInfoItem.vue')['default'] BasicInput: typeof import('./src/components/BasicInput.vue')['default'] BasicMainCard: typeof import('./src/components/BasicMainCard.vue')['default'] BasicMainCardFull: typeof import('./src/components/BasicMainCardFull.vue')['default'] + BasicMobileBottomNav: typeof import('./src/components/BasicMobileBottomNav.vue')['default'] BasicMobileHeader: typeof import('./src/components/BasicMobileHeader.vue')['default'] + BasicMobileHeaderLogo: typeof import('./src/components/BasicMobileHeaderLogo.vue')['default'] + BasicMobileOverflowMenu: typeof import('./src/components/BasicMobileOverflowMenu.vue')['default'] BasicModal: typeof import('./src/components/BasicModal.vue')['default'] BasicSelect: typeof import('./src/components/BasicSelect.vue')['default'] BasicShowContext: typeof import('./src/components/BasicShowContext.vue')['default'] diff --git a/src/api/accounting.ts b/src/api/accounting.ts index cc123ab..f2d81ef 100644 --- a/src/api/accounting.ts +++ b/src/api/accounting.ts @@ -1,9 +1,10 @@ -import useAxios from "@core/utils/useAxios"; -import type {Accounting, TotalAccounting} from "@/model/accounting"; +import useAxios from '@core/utils/useAxios' +import type { TableInput } from '@core/type/baseTable' +import type { Accounting, TotalAccounting } from '@/model/accounting' export const getAccountingTable = async (start: string,end: string) => await useAxios.post('/admin/dashboard/finance', {startDate: start, endDate: end}); //Accounting Tab -export const getTotalAccountingTable = async () => - await useAxios.post('/admin/finance'); \ No newline at end of file +export const getTotalAccountingTable = async (params: TableInput) => + await useAxios.post('/admin/finance', params) \ No newline at end of file diff --git a/src/api/product.ts b/src/api/product.ts index b093f09..3441000 100644 --- a/src/api/product.ts +++ b/src/api/product.ts @@ -28,7 +28,7 @@ export const changeCustomerArchive = async (id: number) => export const confirmUser = async (id: number) => await useAxios.get(`/admin/product/is_valid/${id}`) -export const getCustomerArchiveTable = async (params: TableInput) => +export const getProductArchiveTable = async (params: TableInput) => await useAxios.post>('/admin/product/archive/table', params) export const getSingleTable = async (params: TableInput) => diff --git a/src/api/sms.ts b/src/api/sms.ts index bf4a08f..2388d58 100644 --- a/src/api/sms.ts +++ b/src/api/sms.ts @@ -5,10 +5,10 @@ import type { TableInput } from '@core/type/baseTable' import type { Order } from '@/model/order' import type { FunctionItem } from '@/model/Item' import sms from '@/router/routes/sms' -import type { Sms } from '@/model/sms' +import type { Sms, SmsRecord } from '@/model/sms' export const getSMSTable = async (params: TableInput) => - await useAxios.post>('/admin/messages/table', params) + await useAxios.post>('/admin/messages/table', params) export const getNumbersTable = async (params: TableInput) => await useAxios.post>('/admin/messages/get_customer_list/table', params) diff --git a/src/pages/menuPages/products/base/components/BaseCollapse.vue b/src/components/BaseCollapse.vue similarity index 89% rename from src/pages/menuPages/products/base/components/BaseCollapse.vue rename to src/components/BaseCollapse.vue index 736df1c..88004b4 100644 --- a/src/pages/menuPages/products/base/components/BaseCollapse.vue +++ b/src/components/BaseCollapse.vue @@ -14,26 +14,22 @@ \ No newline at end of file + diff --git a/src/components/BasicActionSheet.vue b/src/components/BasicActionSheet.vue new file mode 100644 index 0000000..a73e2a9 --- /dev/null +++ b/src/components/BasicActionSheet.vue @@ -0,0 +1,186 @@ + + + + + diff --git a/src/components/BasicMainCard.vue b/src/components/BasicMainCard.vue index 0031e6d..d7effdc 100644 --- a/src/components/BasicMainCard.vue +++ b/src/components/BasicMainCard.vue @@ -1,11 +1,20 @@ diff --git a/src/components/BasicMenu/index.vue b/src/components/BasicMenu/index.vue index 8dbe1c8..a70accd 100644 --- a/src/components/BasicMenu/index.vue +++ b/src/components/BasicMenu/index.vue @@ -1,14 +1,11 @@