From 81d7880ebc5b751839c2d02b791566ea6a3feca2 Mon Sep 17 00:00:00 2001 From: horizons <1490493387@qq.com> Date: Tue, 13 Sep 2022 07:44:55 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=A1=B9=E7=9B=AE=E7=AE=80?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 73a4a6c9c41e013928e6205dd7c078d0e955f487 --- package.json | 2 + src/api/{system => }/dept.ts | 18 +- src/api/{system => }/dict.ts | 48 +- src/api/{system => }/file.ts | 10 +- src/api/{login/index.ts => login.ts} | 14 +- src/api/{system => }/menu.ts | 36 +- src/api/oms/order.ts | 30 - src/api/pms/attribute.ts | 27 - src/api/pms/brand.ts | 89 --- src/api/pms/category.ts | 93 --- src/api/pms/goods.ts | 73 -- src/api/{system => }/role.ts | 36 +- src/api/sms/advert.ts | 73 -- src/api/sms/coupon.ts | 73 -- src/api/system/client.ts | 55 -- src/api/system/perm.ts | 89 --- src/api/ums/member.ts | 57 -- src/api/{system => }/user.ts | 24 +- src/components/Upload/SingleUpload.vue | 2 +- src/components/WangEditor/index.vue | 2 +- src/main.ts | 4 +- src/permission.ts | 5 +- src/store/modules/permission.ts | 16 +- src/store/modules/user.ts | 23 +- src/types/api/{system => }/dept.d.ts | 0 src/types/api/{system => }/dict.d.ts | 2 +- src/types/api/{system => }/login.d.ts | 0 src/types/api/{system => }/menu.d.ts | 0 src/types/api/oms/order.d.ts | 56 -- src/types/api/{system => }/perm.d.ts | 2 +- src/types/api/pms/brand.d.ts | 33 - src/types/api/pms/goods.d.ts | 70 -- src/types/api/{system => }/role.d.ts | 3 +- src/types/api/sms/advert.d.ts | 38 -- src/types/api/sms/coupon.ts | 113 --- src/types/api/system/client.d.ts | 46 -- src/types/api/ums/member.d.ts | 64 -- src/types/api/{system => }/user.d.ts | 2 +- src/utils/auth.ts | 13 + src/utils/request.ts | 2 +- src/views/login/index.vue | 7 +- src/views/oms/order/index.vue | 233 ------- src/views/pms/brand/index.vue | 279 -------- .../pms/category/components/Attribute.vue | 183 ----- .../pms/category/components/Category.vue | 289 -------- src/views/pms/category/index.vue | 79 --- .../pms/goods/components/GoodsAttribute.vue | 178 ----- .../pms/goods/components/GoodsCategory.vue | 113 --- src/views/pms/goods/components/GoodsInfo.vue | 220 ------ src/views/pms/goods/components/GoodsStock.vue | 643 ------------------ src/views/pms/goods/detail.vue | 110 --- src/views/pms/goods/index.vue | 277 -------- src/views/sms/advert/index.vue | 306 --------- src/views/sms/coupon/index.vue | 532 --------------- src/views/system/client/index.vue | 374 ---------- src/views/system/dept/index.vue | 8 +- src/views/system/dict/components/DictItem.vue | 32 +- src/views/system/dict/components/DictType.vue | 26 +- src/views/system/menu/components/Menu.vue | 8 +- src/views/system/menu/components/Perm.vue | 46 +- src/views/system/menu/index.vue | 4 +- src/views/system/role/index.vue | 12 +- src/views/system/user/index.vue | 8 +- src/views/ums/member/index.vue | 173 ----- 64 files changed, 204 insertions(+), 5279 deletions(-) rename src/api/{system => }/dept.ts (75%) rename src/api/{system => }/dict.ts (72%) rename src/api/{system => }/file.ts (72%) rename src/api/{login/index.ts => login.ts} (69%) rename src/api/{system => }/menu.ts (70%) delete mode 100644 src/api/oms/order.ts delete mode 100644 src/api/pms/attribute.ts delete mode 100644 src/api/pms/brand.ts delete mode 100644 src/api/pms/category.ts delete mode 100644 src/api/pms/goods.ts rename src/api/{system => }/role.ts (72%) delete mode 100644 src/api/sms/advert.ts delete mode 100644 src/api/sms/coupon.ts delete mode 100644 src/api/system/client.ts delete mode 100644 src/api/system/perm.ts delete mode 100644 src/api/ums/member.ts rename src/api/{system => }/user.ts (81%) rename src/types/api/{system => }/dept.d.ts (100%) rename src/types/api/{system => }/dict.d.ts (96%) rename src/types/api/{system => }/login.d.ts (100%) rename src/types/api/{system => }/menu.d.ts (100%) delete mode 100644 src/types/api/oms/order.d.ts rename src/types/api/{system => }/perm.d.ts (91%) delete mode 100644 src/types/api/pms/brand.d.ts delete mode 100644 src/types/api/pms/goods.d.ts rename src/types/api/{system => }/role.d.ts (87%) delete mode 100644 src/types/api/sms/advert.d.ts delete mode 100644 src/types/api/sms/coupon.ts delete mode 100644 src/types/api/system/client.d.ts delete mode 100644 src/types/api/ums/member.d.ts rename src/types/api/{system => }/user.d.ts (95%) create mode 100644 src/utils/auth.ts delete mode 100644 src/views/oms/order/index.vue delete mode 100644 src/views/pms/brand/index.vue delete mode 100644 src/views/pms/category/components/Attribute.vue delete mode 100644 src/views/pms/category/components/Category.vue delete mode 100644 src/views/pms/category/index.vue delete mode 100644 src/views/pms/goods/components/GoodsAttribute.vue delete mode 100644 src/views/pms/goods/components/GoodsCategory.vue delete mode 100644 src/views/pms/goods/components/GoodsInfo.vue delete mode 100644 src/views/pms/goods/components/GoodsStock.vue delete mode 100644 src/views/pms/goods/detail.vue delete mode 100644 src/views/pms/goods/index.vue delete mode 100644 src/views/sms/advert/index.vue delete mode 100644 src/views/sms/coupon/index.vue delete mode 100644 src/views/system/client/index.vue delete mode 100644 src/views/ums/member/index.vue diff --git a/package.json b/package.json index a0bf8991..b0f22856 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@element-plus/icons-vue": "^1.0.0", + "@types/js-cookie": "^3.0.2", "@vueuse/core": "^9.1.1", "@wangeditor/editor": "^5.0.0", "@wangeditor/editor-for-vue": "^5.1.10", @@ -19,6 +20,7 @@ "default-passive-events": "^2.0.0", "echarts": "^5.2.2", "element-plus": "^2.2.5", + "js-cookie": "^3.0.1", "nprogress": "^0.2.0", "path-browserify": "^1.0.1", "path-to-regexp": "^6.2.0", diff --git a/src/api/system/dept.ts b/src/api/dept.ts similarity index 75% rename from src/api/system/dept.ts rename to src/api/dept.ts index cb801fb2..61f1dee1 100644 --- a/src/api/system/dept.ts +++ b/src/api/dept.ts @@ -1,8 +1,4 @@ -import { - DeptFormData, - DeptItem, - DeptQueryParam -} from '@/types/api/system/dept'; +import { DeptFormData, DeptItem, DeptQueryParam } from '@/types/api/dept'; import { Option } from '@/types/common'; import request from '@/utils/request'; import { AxiosPromise } from 'axios'; @@ -16,7 +12,7 @@ export function listDepartments( queryParams?: DeptQueryParam ): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/depts', + url: '/youlai-system/api/v1/depts', method: 'get', params: queryParams }); @@ -27,7 +23,7 @@ export function listDepartments( */ export function listDeptOptions(): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/depts/options', + url: '/youlai-system/api/v1/depts/options', method: 'get' }); } @@ -39,7 +35,7 @@ export function listDeptOptions(): AxiosPromise { */ export function getDeptDetail(id: string): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/depts/' + id, + url: '/youlai-system/api/v1/depts/' + id, method: 'get' }); } @@ -51,7 +47,7 @@ export function getDeptDetail(id: string): AxiosPromise { */ export function addDept(data: DeptFormData) { return request({ - url: '/youlai-admin/api/v1/depts', + url: '/youlai-system/api/v1/depts', method: 'post', data: data }); @@ -65,7 +61,7 @@ export function addDept(data: DeptFormData) { */ export function updateDept(id: string, data: DeptFormData) { return request({ - url: '/youlai-admin/api/v1/depts/' + id, + url: '/youlai-system/api/v1/depts/' + id, method: 'put', data: data }); @@ -78,7 +74,7 @@ export function updateDept(id: string, data: DeptFormData) { */ export function deleteDept(ids: string) { return request({ - url: '/youlai-admin/api/v1/depts/' + ids, + url: '/youlai-system/api/v1/depts/' + ids, method: 'delete' }); } diff --git a/src/api/system/dict.ts b/src/api/dict.ts similarity index 72% rename from src/api/system/dict.ts rename to src/api/dict.ts index 2ecf000e..dbcf5bec 100644 --- a/src/api/system/dict.ts +++ b/src/api/dict.ts @@ -5,8 +5,8 @@ import { DictItemPageResult, DictItemQueryParam, DictPageResult, - DictQueryParam, -} from '@/types/api/system/dict'; + DictQueryParam +} from '@/types/api/dict'; import request from '@/utils/request'; import { AxiosPromise } from 'axios'; @@ -19,9 +19,9 @@ export function listPageDictTypes( queryParams: DictQueryParam ): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/dict-types', + url: '/youlai-system/api/v1/dict-types', method: 'get', - params: queryParams, + params: queryParams }); } @@ -32,8 +32,8 @@ export function listPageDictTypes( */ export function getDictFormData(id: number): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/dict-types/' + id + '/form_data', - method: 'get', + url: '/youlai-system/api/v1/dict-types/' + id + '/form_data', + method: 'get' }); } @@ -44,9 +44,9 @@ export function getDictFormData(id: number): AxiosPromise { */ export function addDictType(data: DictFormTypeData) { return request({ - url: '/youlai-admin/api/v1/dict-types', + url: '/youlai-system/api/v1/dict-types', method: 'post', - data: data, + data: data }); } @@ -58,9 +58,9 @@ export function addDictType(data: DictFormTypeData) { */ export function updateDictType(id: number, data: DictFormTypeData) { return request({ - url: '/youlai-admin/api/v1/dict-types/' + id, + url: '/youlai-system/api/v1/dict-types/' + id, method: 'put', - data: data, + data: data }); } @@ -71,8 +71,8 @@ export function updateDictType(id: number, data: DictFormTypeData) { */ export function deleteDictTypes(ids: string) { return request({ - url: '/youlai-admin/api/v1/dict-types/' + ids, - method: 'delete', + url: '/youlai-system/api/v1/dict-types/' + ids, + method: 'delete' }); } @@ -85,9 +85,9 @@ export function listPageDictItems( queryParams: DictItemQueryParam ): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/dict-items', + url: '/youlai-system/api/v1/dict-items', method: 'get', - params: queryParams, + params: queryParams }); } @@ -100,9 +100,9 @@ export function getDictItemsByTypeCode( typeCode: string ): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/dict-items/select_list', + url: '/youlai-system/api/v1/dict-items/select_list', method: 'get', - params: { typeCode: typeCode }, + params: { typeCode: typeCode } }); } @@ -113,8 +113,8 @@ export function getDictItemsByTypeCode( */ export function getDictItemData(id: number): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/dict-items/' + id + '/form_data', - method: 'get', + url: '/youlai-system/api/v1/dict-items/' + id + '/form_data', + method: 'get' }); } @@ -125,9 +125,9 @@ export function getDictItemData(id: number): AxiosPromise { */ export function addDictItem(data: DictItemFormData) { return request({ - url: '/youlai-admin/api/v1/dict-items', + url: '/youlai-system/api/v1/dict-items', method: 'post', - data: data, + data: data }); } @@ -139,9 +139,9 @@ export function addDictItem(data: DictItemFormData) { */ export function updateDictItem(id: number, data: DictItemFormData) { return request({ - url: '/youlai-admin/api/v1/dict-items/' + id, + url: '/youlai-system/api/v1/dict-items/' + id, method: 'put', - data: data, + data: data }); } @@ -152,7 +152,7 @@ export function updateDictItem(id: number, data: DictItemFormData) { */ export function deleteDictItems(ids: string) { return request({ - url: '/youlai-admin/api/v1/dict-items/' + ids, - method: 'delete', + url: '/youlai-system/api/v1/dict-items/' + ids, + method: 'delete' }); } diff --git a/src/api/system/file.ts b/src/api/file.ts similarity index 72% rename from src/api/system/file.ts rename to src/api/file.ts index 8e570541..4b9f9c81 100644 --- a/src/api/system/file.ts +++ b/src/api/file.ts @@ -9,12 +9,12 @@ export function uploadFile(file: File) { const formData = new FormData(); formData.append('file', file); return request({ - url: '/youlai-admin/api/v1/files', + url: '/youlai-system/api/v1/files', method: 'post', data: formData, headers: { - 'Content-Type': 'multipart/form-data', - }, + 'Content-Type': 'multipart/form-data' + } }); } @@ -25,8 +25,8 @@ export function uploadFile(file: File) { */ export function deleteFile(path?: string) { return request({ - url: '/youlai-admin/api/v1/files', + url: '/youlai-system/api/v1/files', method: 'delete', - params: { path: path }, + params: { path: path } }); } diff --git a/src/api/login/index.ts b/src/api/login.ts similarity index 69% rename from src/api/login/index.ts rename to src/api/login.ts index b5fbaf8f..de2bfbd8 100644 --- a/src/api/login/index.ts +++ b/src/api/login.ts @@ -1,8 +1,4 @@ -import { - Captcha, - LoginFormData, - LoginResponseData, -} from '@/types/api/system/login'; +import { Captcha, LoginFormData, LoginResponseData } from '@/types/api/login'; import request from '@/utils/request'; import { AxiosPromise } from 'axios'; @@ -16,8 +12,8 @@ export function login(data: LoginFormData): AxiosPromise { method: 'post', params: data, headers: { - Authorization: 'Basic bWFsbC1hZG1pbi13ZWI6MTIzNDU2', // 客户端信息Base64明文：mall-admin-web:123456 - }, + Authorization: 'Basic bWFsbC1hZG1pbi13ZWI6MTIzNDU2' // 客户端信息Base64明文：mall-admin-web:123456 + } }); } @@ -27,7 +23,7 @@ export function login(data: LoginFormData): AxiosPromise { export function logout() { return request({ url: '/youlai-auth/oauth/logout', - method: 'delete', + method: 'delete' }); } @@ -37,6 +33,6 @@ export function logout() { export function getCaptcha(): AxiosPromise { return request({ url: '/captcha?t=' + new Date().getTime().toString(), - method: 'get', + method: 'get' }); } diff --git a/src/api/system/menu.ts b/src/api/menu.ts similarity index 70% rename from src/api/system/menu.ts rename to src/api/menu.ts index ae388999..bce180df 100644 --- a/src/api/system/menu.ts +++ b/src/api/menu.ts @@ -2,8 +2,8 @@ import { MenuFormData, MenuItem, MenuQueryParam, - Resource, -} from '@/types/api/system/menu'; + Resource +} from '@/types/api/menu'; import { Option } from '@/types/common'; import request from '@/utils/request'; import { AxiosPromise } from 'axios'; @@ -13,8 +13,8 @@ import { AxiosPromise } from 'axios'; */ export function listRoutes() { return request({ - url: '/youlai-admin/api/v1/menus/routes', - method: 'get', + url: '/youlai-system/api/v1/menus/routes', + method: 'get' }); } @@ -27,9 +27,9 @@ export function listMenus( queryParams: MenuQueryParam ): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/menus', + url: '/youlai-system/api/v1/menus', method: 'get', - params: queryParams, + params: queryParams }); } @@ -38,8 +38,8 @@ export function listMenus( */ export function listMenuOptions(): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/menus/options', - method: 'get', + url: '/youlai-system/api/v1/menus/options', + method: 'get' }); } @@ -48,8 +48,8 @@ export function listMenuOptions(): AxiosPromise { */ export function listResources(): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/menus/resources', - method: 'get', + url: '/youlai-system/api/v1/menus/resources', + method: 'get' }); } @@ -59,8 +59,8 @@ export function listResources(): AxiosPromise { */ export function getMenuDetail(id: string): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/menus/' + id, - method: 'get', + url: '/youlai-system/api/v1/menus/' + id, + method: 'get' }); } @@ -71,9 +71,9 @@ export function getMenuDetail(id: string): AxiosPromise { */ export function addMenu(data: MenuFormData) { return request({ - url: '/youlai-admin/api/v1/menus', + url: '/youlai-system/api/v1/menus', method: 'post', - data: data, + data: data }); } @@ -85,9 +85,9 @@ export function addMenu(data: MenuFormData) { */ export function updateMenu(id: string, data: MenuFormData) { return request({ - url: '/youlai-admin/api/v1/menus/' + id, + url: '/youlai-system/api/v1/menus/' + id, method: 'put', - data: data, + data: data }); } @@ -98,7 +98,7 @@ export function updateMenu(id: string, data: MenuFormData) { */ export function deleteMenus(ids: string) { return request({ - url: '/youlai-admin/api/v1/menus/' + ids, - method: 'delete', + url: '/youlai-system/api/v1/menus/' + ids, + method: 'delete' }); } diff --git a/src/api/oms/order.ts b/src/api/oms/order.ts deleted file mode 100644 index be49432b..00000000 --- a/src/api/oms/order.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { OrderPageResult, OrderQueryParam } from '@/types/api/oms/order'; -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; - -/** - * 获取订单分页列表 - * - * @param queryParams - */ -export function listOrderPages( - queryParams: OrderQueryParam -): AxiosPromise { - return request({ - url: '/mall-oms/api/v1/orders', - method: 'get', - params: queryParams, - }); -} - -/** - * 获取订单详情 - * - * @param orderId - */ -export function getOrderDetail(orderId: number) { - return request({ - url: '/mall-oms/api/v1/orders/' + orderId, - method: 'get', - }); -} diff --git a/src/api/pms/attribute.ts b/src/api/pms/attribute.ts deleted file mode 100644 index af4c4403..00000000 --- a/src/api/pms/attribute.ts +++ /dev/null @@ -1,27 +0,0 @@ -import request from '@/utils/request'; - -/** - * 获取商品属性列表 - * - * @param params - */ -export function listAttributes(params: object) { - return request({ - url: '/mall-pms/api/v1/attributes', - method: 'get', - params: params, - }); -} - -/** - * 批量修改商品属性 - * - * @param data - */ -export function saveAttributeBatch(data: object) { - return request({ - url: '/mall-pms/api/v1/attributes/batch', - method: 'post', - data: data, - }); -} diff --git a/src/api/pms/brand.ts b/src/api/pms/brand.ts deleted file mode 100644 index 6c29c38f..00000000 --- a/src/api/pms/brand.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { - BrandFormData, - BrandItem, - BrandPageResult, - BrandQueryParam, -} from '@/types/api/pms/brand'; -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; - -/** - * 获取品牌分页列表 - * - * @param queryParams - */ -export function listBrandPages( - queryParams: BrandQueryParam -): AxiosPromise { - return request({ - url: '/mall-pms/api/v1/brands/pages', - method: 'get', - params: queryParams, - }); -} - -/** - * 获取品牌列表 - * - * @param queryParams - */ -export function listBrands( - queryParams?: BrandQueryParam -): AxiosPromise { - return request({ - url: '/mall-pms/api/v1/brands', - method: 'get', - params: queryParams, - }); -} - -/** - * 获取品牌详情 - * - * @param id - */ -export function getBrandFormDetail(id: number): AxiosPromise { - return request({ - url: '/mall-pms/api/v1/brands/' + id, - method: 'get', - }); -} - -/** - * 添加品牌 - * - * @param data - */ -export function addBrand(data: BrandFormData) { - return request({ - url: '/mall-pms/api/v1/brands', - method: 'post', - data: data, - }); -} - -/** - * 修改品牌 - * - * @param id - * @param data - */ -export function updateBrand(id: number, data: BrandFormData) { - return request({ - url: '/mall-pms/api/v1/brands/' + id, - method: 'put', - data: data, - }); -} - -/** - * 删除品牌 - * - * @param ids - */ -export function deleteBrands(ids: string) { - return request({ - url: '/mall-pms/api/v1/brands/' + ids, - method: 'delete', - }); -} diff --git a/src/api/pms/category.ts b/src/api/pms/category.ts deleted file mode 100644 index 806a705c..00000000 --- a/src/api/pms/category.ts +++ /dev/null @@ -1,93 +0,0 @@ -import request from '@/utils/request'; -import { Option } from '@/types/common'; -import { AxiosPromise } from 'axios'; - -/** - * 获取商品分类列表 - * - * @param queryParams - */ -export function listCategories(queryParams: object) { - return request({ - url: '/mall-pms/api/v1/categories', - method: 'get', - params: queryParams, - }); -} - -/** - * 获取商品分类级联器树形列表 - * - * @param queryParams - */ -export function listCategoryOptions(): AxiosPromise { - return request({ - url: '/mall-pms/api/v1/categories/options', - method: 'get', - }); -} - -/** - * 获取商品分类详情 - * - * @param id - */ -export function getCategoryDetail(id: number) { - return request({ - url: '/mall-pms/api/v1/categories/' + id, - method: 'get', - }); -} - -/** - * 添加商品分类 - * - * @param data - */ -export function addCategory(data: object) { - return request({ - url: '/mall-pms/api/v1/categories', - method: 'post', - data: data, - }); -} - -/** - * 修改商品分类 - * - * @param id - * @param data - */ -export function updateCategory(id: number, data: object) { - return request({ - url: '/mall-pms/api/v1/categories/' + id, - method: 'put', - data: data, - }); -} - -/** - * 删除商品分类 - * - * @param ids - */ -export function deleteCategories(ids: string) { - return request({ - url: '/mall-pms/api/v1/categories/' + ids, - method: 'delete', - }); -} - -/** - * 选择性修改商品分类 - * - * @param id - * @param data - */ -export function updateCategoryPart(id: number, data: object) { - return request({ - url: '/mall-pms/api/v1/categories/' + id, - method: 'patch', - data: data, - }); -} diff --git a/src/api/pms/goods.ts b/src/api/pms/goods.ts deleted file mode 100644 index 1ececff7..00000000 --- a/src/api/pms/goods.ts +++ /dev/null @@ -1,73 +0,0 @@ -import { - GoodsDetail, - GoodsPageResult, - GoodsQueryParam, -} from '@/types/api/pms/goods'; -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; - -/** - * 获取商品分页列表 - * - * @param queryParams - */ -export function listSpuPages( - queryParams: GoodsQueryParam -): AxiosPromise { - return request({ - url: '/mall-pms/api/v1/spu/pages', - method: 'get', - params: queryParams, - }); -} - -/** - * 获取商品详情 - * - * @param id - */ -export function getSpuDetail(id: string): AxiosPromise { - return request({ - url: '/mall-pms/api/v1/spu/' + id, - method: 'get', - }); -} - -/** - * 添加商品 - * - * @param data - */ -export function addSpu(data: object) { - return request({ - url: '/mall-pms/api/v1/spu', - method: 'post', - data: data, - }); -} - -/** - * 修改商品 - * - * @param id - * @param data - */ -export function updateSpu(id: number, data: object) { - return request({ - url: '/mall-pms/api/v1/spu/' + id, - method: 'put', - data: data, - }); -} - -/** - * 删除商品 - * - * @param ids - */ -export function deleteSpu(ids: string) { - return request({ - url: '/mall-pms/api/v1/spu/' + ids, - method: 'delete', - }); -} diff --git a/src/api/system/role.ts b/src/api/role.ts similarity index 72% rename from src/api/system/role.ts rename to src/api/role.ts index 36ca1ec5..4bc4a3b6 100644 --- a/src/api/system/role.ts +++ b/src/api/role.ts @@ -2,8 +2,8 @@ import { RoleFormData, RolePageResult, RoleQueryParam, - RoleResource, -} from '@/types/api/system/role'; + RoleResource +} from '@/types/api/role'; import { Option } from '@/types/common'; import request from '@/utils/request'; @@ -18,9 +18,9 @@ export function listRolePages( queryParams?: RoleQueryParam ): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/roles/pages', + url: '/youlai-system/api/v1/roles/pages', method: 'get', - params: queryParams, + params: queryParams }); } @@ -33,9 +33,9 @@ export function listRoleOptions( queryParams?: RoleQueryParam ): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/roles/options', + url: '/youlai-system/api/v1/roles/options', method: 'get', - params: queryParams, + params: queryParams }); } @@ -46,8 +46,8 @@ export function listRoleOptions( */ export function getRoleResources(roleId: string): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/roles/' + roleId + '/resources', - method: 'get', + url: '/youlai-system/api/v1/roles/' + roleId + '/resources', + method: 'get' }); } @@ -61,9 +61,9 @@ export function updateRoleResource( data: RoleResource ): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/roles/' + roleId + '/resources', + url: '/youlai-system/api/v1/roles/' + roleId + '/resources', method: 'put', - data: data, + data: data }); } @@ -74,8 +74,8 @@ export function updateRoleResource( */ export function getRoleFormDetail(id: number): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/roles/' + id, - method: 'get', + url: '/youlai-system/api/v1/roles/' + id, + method: 'get' }); } @@ -86,9 +86,9 @@ export function getRoleFormDetail(id: number): AxiosPromise { */ export function addRole(data: RoleFormData) { return request({ - url: '/youlai-admin/api/v1/roles', + url: '/youlai-system/api/v1/roles', method: 'post', - data: data, + data: data }); } @@ -100,9 +100,9 @@ export function addRole(data: RoleFormData) { */ export function updateRole(id: number, data: RoleFormData) { return request({ - url: '/youlai-admin/api/v1/roles/' + id, + url: '/youlai-system/api/v1/roles/' + id, method: 'put', - data: data, + data: data }); } @@ -113,7 +113,7 @@ export function updateRole(id: number, data: RoleFormData) { */ export function deleteRoles(ids: string) { return request({ - url: '/youlai-admin/api/v1/roles/' + ids, - method: 'delete', + url: '/youlai-system/api/v1/roles/' + ids, + method: 'delete' }); } diff --git a/src/api/sms/advert.ts b/src/api/sms/advert.ts deleted file mode 100644 index 25318dcf..00000000 --- a/src/api/sms/advert.ts +++ /dev/null @@ -1,73 +0,0 @@ -import { - AdvertFormData, - AdvertPageResult, - AdvertQueryParam, -} from '@/types/api/sms/advert'; -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; - -/** - * 获取广告分页列表 - * - * @param queryParams - */ -export function listAdvertPages( - queryParams: AdvertQueryParam -): AxiosPromise { - return request({ - url: '/mall-sms/api/v1/adverts/pages', - method: 'get', - params: queryParams, - }); -} - -/** - * 获取广告详情 - * - * @param id - */ -export function getAdvertFormDetail(id: number): AxiosPromise { - return request({ - url: '/mall-sms/api/v1/adverts/' + id, - method: 'get', - }); -} - -/** - * 添加广告 - * - * @param data - */ -export function addAdvert(data: AdvertFormData) { - return request({ - url: '/mall-sms/api/v1/adverts', - method: 'post', - data: data, - }); -} - -/** - * 修改广告 - * - * @param id - * @param data - */ -export function updateAdvert(id: number, data: AdvertFormData) { - return request({ - url: '/mall-sms/api/v1/adverts/' + id, - method: 'put', - data: data, - }); -} - -/** - * 删除广告 - * - * @param ids - */ -export function deleteAdverts(ids: string) { - return request({ - url: '/mall-sms/api/v1/adverts/' + ids, - method: 'delete', - }); -} diff --git a/src/api/sms/coupon.ts b/src/api/sms/coupon.ts deleted file mode 100644 index 79c3b639..00000000 --- a/src/api/sms/coupon.ts +++ /dev/null @@ -1,73 +0,0 @@ -import { - CouponQueryParam, - CouponPageResult, - CouponFormData, -} from '@/types/api/sms/coupon'; -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; - -/** - * 获取优惠券分页列表 - * - * @param queryParams - */ -export function lisCouponPages( - queryParams: CouponQueryParam -): AxiosPromise { - return request({ - url: '/mall-sms/api/v1/coupons/pages', - method: 'get', - params: queryParams, - }); -} - -/** - * 获取优惠券表单数据 - * - * @param id - */ -export function getCouponFormData(id: number): AxiosPromise { - return request({ - url: '/mall-sms/api/v1/coupons/' + id + '/form_data', - method: 'get', - }); -} - -/** - * 添加优惠券 - * - * @param data - */ -export function addCoupon(data: CouponFormData) { - return request({ - url: '/mall-sms/api/v1/coupons', - method: 'post', - data: data, - }); -} - -/** - * 修改优惠券 - * - * @param id - * @param data - */ -export function updateCoupon(id: number, data: CouponFormData) { - return request({ - url: '/mall-sms/api/v1/coupons/' + id, - method: 'put', - data: data, - }); -} - -/** - * 删除优惠券 - * - * @param ids - */ -export function deleteCoupons(ids: string) { - return request({ - url: '/mall-sms/api/v1/coupons/' + ids, - method: 'delete', - }); -} diff --git a/src/api/system/client.ts b/src/api/system/client.ts deleted file mode 100644 index ab22d735..00000000 --- a/src/api/system/client.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { - ClientFormData, - ClientPageResult, - ClientQueryParam, -} from '@/types/api/system/client'; -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; - -export function listClientPages( - queryParams: ClientQueryParam -): AxiosPromise { - return request({ - url: '/youlai-admin/api/v1/oauth-clients', - method: 'get', - params: queryParams, - }); -} - -export function getClientFormDetial(id: number): AxiosPromise { - return request({ - url: '/youlai-admin/api/v1/oauth-clients/' + id, - method: 'get', - }); -} - -export function addClient(data: ClientFormData) { - return request({ - url: '/youlai-admin/api/v1/oauth-clients', - method: 'post', - data: data, - }); -} - -export function updateClient(id: string, data: ClientFormData) { - return request({ - url: '/youlai-admin/api/v1/oauth-clients/' + id, - method: 'put', - data: data, - }); -} - -export function deleteClients(ids: string) { - return request({ - url: '/youlai-admin/api/v1/oauth-clients/' + ids, - method: 'delete', - }); -} - -export function updateClientPart(id: number, data: object) { - return request({ - url: '/youlai-admin/api/v1/oauth-clients/' + id, - method: 'patch', - data: data, - }); -} diff --git a/src/api/system/perm.ts b/src/api/system/perm.ts deleted file mode 100644 index 48491680..00000000 --- a/src/api/system/perm.ts +++ /dev/null @@ -1,89 +0,0 @@ -import { - PermFormData, - PermItem, - PermPageResult, - PermQueryParam, -} from '@/types/api/system/perm'; -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; - -/** - * 获取权限分页列表 - * - * @param queryParams - */ -export function listPermPages( - queryParams: PermQueryParam -): AxiosPromise { - return request({ - url: '/youlai-admin/api/v1/permissions/page', - method: 'get', - params: queryParams, - }); -} - -/** - * 获取权限列表 - * - * @param queryParams - */ -export function listPerms( - queryParams: PermQueryParam -): AxiosPromise { - return request({ - url: '/youlai-admin/api/v1/permissions', - method: 'get', - params: queryParams, - }); -} - -/** - * 获取权限详情 - * - * @param id - */ -export function getPermFormDetail(id: number): AxiosPromise { - return request({ - url: '/youlai-admin/api/v1/permissions/' + id, - method: 'get', - }); -} - -/** - * 添加权限 - * - * @param data - */ -export function addPerm(data: PermFormData) { - return request({ - url: '/youlai-admin/api/v1/permissions', - method: 'post', - data: data, - }); -} - -/** - * 更新权限 - * - * @param id - * @param data - */ -export function updatePerm(id: number, data: PermFormData) { - return request({ - url: '/youlai-admin/api/v1/permissions/' + id, - method: 'put', - data: data, - }); -} - -/** - * 批量删除权限，多个以英文逗号(,)分割 - * - * @param ids - */ -export function deletePerms(ids: string) { - return request({ - url: '/youlai-admin/api/v1/permissions/' + ids, - method: 'delete', - }); -} diff --git a/src/api/ums/member.ts b/src/api/ums/member.ts deleted file mode 100644 index 8d1da0e4..00000000 --- a/src/api/ums/member.ts +++ /dev/null @@ -1,57 +0,0 @@ -import { MemberPageResult, MemberQueryParam } from '@/types/api/ums/member'; -import request from '@/utils/request'; -import { AxiosPromise } from 'axios'; - -/** - * 获取会员分页列表 - * - * @param queryParams - */ -export function listMemebersPage( - queryParams: MemberQueryParam -): AxiosPromise { - return request({ - url: '/mall-ums/api/v1/members', - method: 'get', - params: queryParams, - }); -} - -/** - * 获取会员详情 - * - * @param id - */ -export function getMemberDetail(id: number) { - return request({ - url: '/mall-ums/api/v1/members/' + id, - method: 'get', - }); -} - -/** - * 添加会员 - * - * @param data - */ -export function addMember(data: object) { - return request({ - url: '/mall-ums/api/v1/members', - method: 'post', - data: data, - }); -} - -/** - * 添加会员 - * - * @param id - * @param data - */ -export function updateMember(id: number, data: object) { - return request({ - url: '/mall-ums/api/v1/members/' + id, - method: 'put', - data: data, - }); -} diff --git a/src/api/system/user.ts b/src/api/user.ts similarity index 81% rename from src/api/system/user.ts rename to src/api/user.ts index d481873f..a283a0dd 100644 --- a/src/api/system/user.ts +++ b/src/api/user.ts @@ -5,14 +5,14 @@ import { UserInfo, UserPageResult, UserQueryParam -} from '@/types/api/system/user'; +} from '@/types/api/user'; /** * 登录成功后获取用户信息（昵称、头像、权限集合和角色集合） */ export function getUserInfo(): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/users/me', + url: '/youlai-system/api/v1/users/me', method: 'get' }); } @@ -26,7 +26,7 @@ export function listUserPages( queryParams: UserQueryParam ): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/users/pages', + url: '/youlai-system/api/v1/users/pages', method: 'get', params: queryParams }); @@ -39,7 +39,7 @@ export function listUserPages( */ export function getUserDetail(userId: number): AxiosPromise { return request({ - url: '/youlai-admin/api/v1/users/' + userId, + url: '/youlai-system/api/v1/users/' + userId, method: 'get' }); } @@ -51,7 +51,7 @@ export function getUserDetail(userId: number): AxiosPromise { */ export function addUser(data: any) { return request({ - url: '/youlai-admin/api/v1/users', + url: '/youlai-system/api/v1/users', method: 'post', data: data }); @@ -65,7 +65,7 @@ export function addUser(data: any) { */ export function updateUser(id: number, data: UserFormData) { return request({ - url: '/youlai-admin/api/v1/users/' + id, + url: '/youlai-system/api/v1/users/' + id, method: 'put', data: data }); @@ -79,7 +79,7 @@ export function updateUser(id: number, data: UserFormData) { */ export function updateUserStatus(id: number, status: number) { return request({ - url: '/youlai-admin/api/v1/users/' + id + '/status', + url: '/youlai-system/api/v1/users/' + id + '/status', method: 'patch', params: { status: status } }); @@ -93,7 +93,7 @@ export function updateUserStatus(id: number, status: number) { */ export function updateUserPassword(id: number, password: string) { return request({ - url: '/youlai-admin/api/v1/users/' + id + '/password', + url: '/youlai-system/api/v1/users/' + id + '/password', method: 'patch', params: { password: password } }); @@ -106,7 +106,7 @@ export function updateUserPassword(id: number, password: string) { */ export function deleteUsers(ids: string) { return request({ - url: '/youlai-admin/api/v1/users/' + ids, + url: '/youlai-system/api/v1/users/' + ids, method: 'delete' }); } @@ -118,7 +118,7 @@ export function deleteUsers(ids: string) { */ export function downloadTemplate() { return request({ - url: '/youlai-admin/api/v1/users/template', + url: '/youlai-system/api/v1/users/template', method: 'get', responseType: 'arraybuffer' }); @@ -132,7 +132,7 @@ export function downloadTemplate() { */ export function exportUser(queryParams: UserQueryParam) { return request({ - url: '/youlai-admin/api/v1/users/_export', + url: '/youlai-system/api/v1/users/_export', method: 'get', params: queryParams, responseType: 'arraybuffer' @@ -150,7 +150,7 @@ export function importUser(deptId: number, roleIds: string, file: File) { formData.append('deptId', deptId.toString()); formData.append('roleIds', roleIds); return request({ - url: '/youlai-admin/api/v1/users/_import', + url: '/youlai-system/api/v1/users/_import', method: 'post', data: formData, headers: { diff --git a/src/components/Upload/SingleUpload.vue b/src/components/Upload/SingleUpload.vue index 4143a3e2..a07aea12 100644 --- a/src/components/Upload/SingleUpload.vue +++ b/src/components/Upload/SingleUpload.vue @@ -36,7 +36,7 @@ import { UploadRawFile, UploadRequestOptions } from 'element-plus'; -import { uploadFile, deleteFile } from '@/api/system/file'; +import { uploadFile, deleteFile } from '@/api/file'; const emit = defineEmits(['update:modelValue']); diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue index a6a1f229..e758cbfb 100644 --- a/src/components/WangEditor/index.vue +++ b/src/components/WangEditor/index.vue @@ -24,7 +24,7 @@ import { onBeforeUnmount, shallowRef, reactive, toRefs } from 'vue'; import { Editor, Toolbar } from '@wangeditor/editor-for-vue'; // API 引用 -import { uploadFile } from '@/api/system/file'; +import { uploadFile } from '@/api/file'; const props = defineProps({ modelValue: { diff --git a/src/main.ts b/src/main.ts index 02e9190e..56afc412 100644 --- a/src/main.ts +++ b/src/main.ts @@ -21,14 +21,14 @@ import i18n from '@/lang/index'; import '@/styles/index.scss'; // 根据字典编码获取字典列表全局方法 -import { getDictItemsByTypeCode } from '@/api/system/dict'; +import { getDictItemsByTypeCode } from '@/api/dict'; const app = createApp(App); // 自定义指令 import * as directive from '@/directive'; -Object.keys(directive).forEach((key) => { +Object.keys(directive).forEach(key => { app.directive(key, (directive as { [key: string]: Directive })[key]); }); diff --git a/src/permission.ts b/src/permission.ts index c0d078af..190523e7 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -1,6 +1,7 @@ import router from '@/router'; import { ElMessage } from 'element-plus'; import useStore from '@/store'; +import { hasLogin } from '@/utils/auth'; import NProgress from 'nprogress'; import 'nprogress/nprogress.css'; NProgress.configure({ showSpinner: false }); // 进度环显示/隐藏 @@ -11,8 +12,8 @@ const whiteList = ['/login']; router.beforeEach(async (to, from, next) => { NProgress.start(); const { user, permission } = useStore(); - const hasToken = user.token; - if (hasToken) { + + if (hasLogin()) { // 登录成功，跳转到首页 if (to.path === '/login') { next({ path: '/' }); diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts index e1743e1c..e8ec2df1 100644 --- a/src/store/modules/permission.ts +++ b/src/store/modules/permission.ts @@ -2,7 +2,7 @@ import { PermissionState } from '@/types/store/permission'; import { RouteRecordRaw } from 'vue-router'; import { defineStore } from 'pinia'; import { constantRoutes } from '@/router'; -import { listRoutes } from '@/api/system/menu'; +import { listRoutes } from '@/api/menu'; const modules = import.meta.glob('../../views/**/**.vue'); export const Layout = () => import('@/layout/index.vue'); @@ -12,7 +12,7 @@ const hasPermission = (roles: string[], route: RouteRecordRaw) => { if (roles.includes('ROOT')) { return true; } - return roles.some((role) => { + return roles.some(role => { if (route.meta?.roles !== undefined) { return (route.meta.roles as string[]).includes(role); } @@ -26,7 +26,7 @@ export const filterAsyncRoutes = ( roles: string[] ) => { const res: RouteRecordRaw[] = []; - routes.forEach((route) => { + routes.forEach(route => { const tmp = { ...route } as any; if (hasPermission(roles, tmp)) { if (tmp.component == 'Layout') { @@ -53,7 +53,7 @@ const usePermissionStore = defineStore({ id: 'permission', state: (): PermissionState => ({ routes: [], - addRoutes: [], + addRoutes: [] }), actions: { setRoutes(routes: RouteRecordRaw[]) { @@ -63,18 +63,18 @@ const usePermissionStore = defineStore({ generateRoutes(roles: string[]) { return new Promise((resolve, reject) => { listRoutes() - .then((response) => { + .then(response => { const asyncRoutes = response.data; const accessedRoutes = filterAsyncRoutes(asyncRoutes, roles); this.setRoutes(accessedRoutes); resolve(accessedRoutes); }) - .catch((error) => { + .catch(error => { reject(error); }); }); - }, - }, + } + } }); export default usePermissionStore; diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index d4c3dbdc..10e014cd 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -1,10 +1,10 @@ import { defineStore } from 'pinia'; -import { LoginFormData } from '@/types/api/system/login'; +import { LoginFormData } from '@/types/api/login'; import { UserState } from '@/types/store/user'; import { localStorage } from '@/utils/storage'; import { login, logout } from '@/api/login'; -import { getUserInfo } from '@/api/system/user'; +import { getUserInfo } from '@/api/user'; import { resetRouter } from '@/router'; const useUserStore = defineStore({ @@ -14,7 +14,7 @@ const useUserStore = defineStore({ nickname: '', avatar: '', roles: [], - perms: [], + perms: [] }), actions: { async RESET_STATE() { @@ -31,16 +31,16 @@ const useUserStore = defineStore({ password: password, grant_type: 'captcha', code: code, - uuid: uuid, + uuid: uuid }) - .then((response) => { + .then(response => { const { access_token, token_type } = response.data; const accessToken = token_type + ' ' + access_token; localStorage.set('token', accessToken); this.token = accessToken; resolve(access_token); }) - .catch((error) => { + .catch(error => { reject(error); }); }); @@ -65,7 +65,8 @@ const useUserStore = defineStore({ this.perms = perms; resolve(data); }) - .catch((error) => { + .catch(error => { + console.log('error', error); reject(error); }); }); @@ -83,7 +84,7 @@ const useUserStore = defineStore({ resetRouter(); resolve(null); }) - .catch((error) => { + .catch(error => { reject(error); }); }); @@ -93,13 +94,13 @@ const useUserStore = defineStore({ * 清除 Token */ resetToken() { - return new Promise((resolve) => { + return new Promise(resolve => { localStorage.remove('token'); this.RESET_STATE(); resolve(null); }); - }, - }, + } + } }); export default useUserStore; diff --git a/src/types/api/system/dept.d.ts b/src/types/api/dept.d.ts similarity index 100% rename from src/types/api/system/dept.d.ts rename to src/types/api/dept.d.ts diff --git a/src/types/api/system/dict.d.ts b/src/types/api/dict.d.ts similarity index 96% rename from src/types/api/system/dict.d.ts rename to src/types/api/dict.d.ts index f268a399..6362bd37 100644 --- a/src/types/api/system/dict.d.ts +++ b/src/types/api/dict.d.ts @@ -1,4 +1,4 @@ -import { PageQueryParam, PageResult } from '../base'; +import { PageQueryParam, PageResult } from './base'; /** * 字典查询参数类型声明 diff --git a/src/types/api/system/login.d.ts b/src/types/api/login.d.ts similarity index 100% rename from src/types/api/system/login.d.ts rename to src/types/api/login.d.ts diff --git a/src/types/api/system/menu.d.ts b/src/types/api/menu.d.ts similarity index 100% rename from src/types/api/system/menu.d.ts rename to src/types/api/menu.d.ts diff --git a/src/types/api/oms/order.d.ts b/src/types/api/oms/order.d.ts deleted file mode 100644 index 09147f32..00000000 --- a/src/types/api/oms/order.d.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { PageQueryParam, PageResult } from '../base'; - -/** - * 订单查询参数类型声明 - */ -export interface OrderQueryParam extends PageQueryParam { - orderSn: string | undefined; - status: number | undefined; -} - -/** - * 订单分页列表项声明 - */ -export interface Order { - id: string; - orderSn: string; - totalAmount: string; - payAmount: string; - payType: number; - status: number; - totalQuantity: number; - createTime: string; - memberId: string; - sourceType: number; - orderItems: OrderItem[]; -} -export interface OrderItem { - id: string; - orderId: string; - skuId: string; - skuName: string; - picUrl: string; - price: string; - count: number; - totalAmount: number; -} - -/** - * 订单分页项类型声明 - */ -export type OrderPageResult = PageResult; - -/** - * 订单表单类型声明 - */ -export interface OrderDetail { - id: number | undefined; - title: string; - picUrl: string; - beginTime: string; - endTime: string; - status: number; - sort: number; - url: string; - remark: string; -} diff --git a/src/types/api/system/perm.d.ts b/src/types/api/perm.d.ts similarity index 91% rename from src/types/api/system/perm.d.ts rename to src/types/api/perm.d.ts index cf5a81a5..d6ede348 100644 --- a/src/types/api/system/perm.d.ts +++ b/src/types/api/perm.d.ts @@ -1,4 +1,4 @@ -import { PageQueryParam, PageResult } from '../base'; +import { PageQueryParam, PageResult } from './base'; /** * 权限查询参数类型声明 diff --git a/src/types/api/pms/brand.d.ts b/src/types/api/pms/brand.d.ts deleted file mode 100644 index 6ddddec2..00000000 --- a/src/types/api/pms/brand.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { PageQueryParam, PageResult } from '../base'; - -/** - * 品牌查询参数类型声明 - */ -export interface BrandQueryParam extends PageQueryParam { - name?: string; -} - -/** - * 品牌分页列表项声明 - */ -export interface BrandItem { - id: string; - name: string; - logoUrl: string; - sort: number; -} - -/** - * 品牌分页项类型声明 - */ -export type BrandPageResult = PageResult; - -/** - * 品牌表单类型声明 - */ -export interface BrandFormData { - id: number | undefined; - name: string; - logoUrl: string; - sort: number; -} diff --git a/src/types/api/pms/goods.d.ts b/src/types/api/pms/goods.d.ts deleted file mode 100644 index f118f23e..00000000 --- a/src/types/api/pms/goods.d.ts +++ /dev/null @@ -1,70 +0,0 @@ -import { PageQueryParam, PageResult } from '../base'; - -/** - * 商品查询参数类型声明 - */ -export interface GoodsQueryParam extends PageQueryParam { - name?: stirng; - categoryId?: number; -} - -/** - * 商品列表项类型声明 - */ -export interface GoodsItem { - id: string; - name: string; - categoryId?: any; - brandId?: any; - originPrice: string; - price: string; - sales: number; - picUrl?: any; - album?: any; - unit?: any; - description: string; - detail: string; - status?: any; - categoryName: string; - brandName: string; - skuList: SkuItem[]; -} - -/** - * 商品规格项类型声明 - */ -export interface SkuItem { - id: string; - skuSn?: any; - name: string; - spuId?: any; - specIds: string; - price: string; - stockNum: number; - lockedStockNum?: any; - picUrl?: any; -} - -/** - * 商品分页项类型声明 - */ -export type GoodsPageResult = PageResult; - -/** - * 商品表单数据类型声明 - */ -export interface GoodsDetail { - id?: string; - name?: string; - categoryId?: string; - brandId?: string; - originPrice?: number; - price?: number; - picUrl?: string; - album: string[]; - description?: string; - detail?: string; - attrList: any[]; - specList: any[]; - skuList: any[]; -} diff --git a/src/types/api/system/role.d.ts b/src/types/api/role.d.ts similarity index 87% rename from src/types/api/system/role.d.ts rename to src/types/api/role.d.ts index eb800856..4c8e8712 100644 --- a/src/types/api/system/role.d.ts +++ b/src/types/api/role.d.ts @@ -1,5 +1,4 @@ -import { StringMap } from 'i18next'; -import { PageQueryParam, PageResult } from '../base'; +import { PageQueryParam, PageResult } from './base'; /** * 角色查询参数类型 diff --git a/src/types/api/sms/advert.d.ts b/src/types/api/sms/advert.d.ts deleted file mode 100644 index e1cce771..00000000 --- a/src/types/api/sms/advert.d.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { PageQueryParam, PageResult } from '../base'; - -/** - * 广告查询参数类型 - */ -export interface AdvertQueryParam extends PageQueryParam { - keywords: string; -} - -/** - * 广告分页列表项 - */ -export interface AdvertItem { - id: string; - name: string; - logoUrl: string; - sort: number; -} - -/** - * 广告分页项类型 - */ -export type AdvertPageResult = PageResult; - -/** - * 广告表单类型 - */ -export interface AdvertFormData { - id?: number; - title: string; - picUrl: string; - beginTime: string; - endTime: string; - status: number; - sort: number; - url: string; - remark: string; -} diff --git a/src/types/api/sms/coupon.ts b/src/types/api/sms/coupon.ts deleted file mode 100644 index 8db46c5d..00000000 --- a/src/types/api/sms/coupon.ts +++ /dev/null @@ -1,113 +0,0 @@ -import { PageQueryParam, PageResult } from '../base'; - -/** - * 优惠券查询参数类型 - */ -export interface CouponQueryParam extends PageQueryParam { - status?: number; - keywords?: string; -} - -/** - * 优惠券分页列表项 - */ -export interface CouponItem { - id: string; - name: string; - code: string; - platformLabel: string; - typeLabel: string; - faceValueLabel: string; - validityPeriodLabel: string; -} - -/** - *优惠券分页 - */ -export type CouponPageResult = PageResult; - -/** - * 优惠券表单类型 - */ -export interface CouponFormData { - /** - * ID - */ - id?: number; - /** - * 优惠券名称 - */ - name: string; - /** - * 优惠券码 - */ - code: string; - /** - * 使用平台(0:全平台;1:移动端;2:PC;) - */ - platform: number; - /** - * 优惠券类型(1:满减券;2:直减券;3:折扣券) - */ - type: number; - - /** - * 优惠券面值类型 - */ - faceValueType: number; - /** - * 优惠券面值 - */ - faceValue: number; - /** - * 优惠券折扣 - */ - discount: number; - /** - * 发行量 - */ - circulation: number; - /** - * 使用门槛(0:无门槛) - */ - minPoint: number; - /** - * 每人限领张数(-1:无限制) - */ - perLimit: number; - /** - * 有效期类型(1:日期范围;2:固定天数) - */ - validityPeriodType: number; - /** - * 自领取之日起有效天数 - */ - validityDays: number; - /** - * 有效期起始时间 - */ - validityBeginTime: string; - /** - * 有效期截止时间 - */ - validityEndTime: string; - /** - * 应用范围(0:全场通用;1:指定商品分类;2:指定商品) - */ - applicationScope: number; - - /** - * 使用类型：指定商品分类 - */ - spuCategoryIds: number[]; - - /** - * 使用类型：指定商品 - */ - spuIds: number[]; - - /** - * 使用说明 - */ - remark: string; -} diff --git a/src/types/api/system/client.d.ts b/src/types/api/system/client.d.ts deleted file mode 100644 index 4703a42d..00000000 --- a/src/types/api/system/client.d.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { PageQueryParam, PageResult } from '../base'; - -/** - * 客户端查询参数类型 - */ -export interface ClientQueryParam extends PageQueryParam { - keywords?: string; -} - -/** - * 客户端分页列表项 - */ -export interface ClientItem { - clientId: string; - clientSecret: string; - resourceIds: string; - scope: string; - authorizedGrantTypes: string; - webServerRedirectUri?: any; - authorities?: any; - accessTokenValidity: number; - refreshTokenValidity: number; - additionalInformation?: any; - autoapprove: string; -} - -/** - * 客户端分页项类型 - */ -export type ClientPageResult = PageResult; - -/** - * 客户端表单类型 - */ -export interface ClientFormData { - authorizedGrantTypes: string; - clientId: string; - clientSecret: string; - accessTokenValidity: string; - refreshTokenValidity: string; - webServerRedirectUri: string; - authorities: string; - additionalInformation: string; - autoapprove: string; - scope: string; -} diff --git a/src/types/api/ums/member.d.ts b/src/types/api/ums/member.d.ts deleted file mode 100644 index fc51d80a..00000000 --- a/src/types/api/ums/member.d.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { PageQueryParam, PageResult } from '../base'; - -/** - * 会员查询参数类型声明 - */ -export interface MemberQueryParam extends PageQueryParam { - nickName?: string; -} - -/** - * 会员分页列表项声明 - */ -export interface MemberItem { - id: string; - gender: number; - nickName: string; - mobile: string; - birthday?: any; - avatarUrl: string; - openid: string; - sessionKey?: any; - city: string; - country: string; - language: string; - province: string; - status: number; - balance: string; - deleted: number; - point: number; - addressList: AddressItem[]; -} - -export interface AddressItem { - id: string; - memberId: string; - consigneeName: string; - consigneeMobile: string; - province: string; - city: string; - area: string; - detailAddress: string; - zipCode?: any; - defaulted: number; -} - -/** - * 会员分页项类型声明 - */ -export type MemberPageResult = PageResult; - -/** - * 会员表单类型声明 - */ -export interface MemberFormData { - id: number | undefined; - title: string; - picUrl: string; - beginTime: string; - endTime: string; - status: number; - sort: number; - url: string; - remark: string; -} diff --git a/src/types/api/system/user.d.ts b/src/types/api/user.d.ts similarity index 95% rename from src/types/api/system/user.d.ts rename to src/types/api/user.d.ts index 7e459b8a..fe8b9add 100644 --- a/src/types/api/system/user.d.ts +++ b/src/types/api/user.d.ts @@ -1,4 +1,4 @@ -import { PageQueryParam, PageResult } from '../base'; +import { PageQueryParam, PageResult } from './base'; /** * 登录用户类型声明 diff --git a/src/utils/auth.ts b/src/utils/auth.ts new file mode 100644 index 00000000..dd0ac832 --- /dev/null +++ b/src/utils/auth.ts @@ -0,0 +1,13 @@ +import Cookies from 'js-cookie'; + +const SESSION_ID_KEY = 'SCG_SESSION_ID'; + +export const hasLogin = () => { + const sessionId = Cookies.get(SESSION_ID_KEY); + console.log('sessionId', sessionId); + if (sessionId) { + return true; + } else { + return false; + } +}; diff --git a/src/utils/request.ts b/src/utils/request.ts index 5af8335c..e3d5259f 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -53,7 +53,7 @@ service.interceptors.response.use( if (code === 'A0230') { // token 过期 localStorage.clear(); // 清除浏览器全部缓存 - window.location.href = '/'; // 跳转登录页 + //window.location.href = '/'; // 跳转登录页 ElMessageBox.alert('当前页面已失效，请重新登录', '提示', {}); } else { ElMessage({ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 6fe79492..aa5773c1 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -140,7 +140,7 @@ import useStore from '@/store'; // API依赖 import { getCaptcha } from '@/api/login'; import { useRoute } from 'vue-router'; -import { LoginFormData } from '@/types/api/system/login'; +import { LoginFormData } from '@/types/api/login'; const { user } = useStore(); const route = useRoute(); @@ -207,6 +207,9 @@ function showPwd() { }); } +/** + * login + */ function handleLogin() { loginFormRef.value.validate((valid: boolean) => { if (valid) { @@ -219,6 +222,8 @@ function handleLogin() { }) .catch(() => { state.loading = false; + + // 生成验证码 handleCaptchaGenerate(); }); } else { diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue deleted file mode 100644 index ed1493b4..00000000 --- a/src/views/oms/order/index.vue +++ /dev/null @@ -1,233 +0,0 @@ - - - - - - - diff --git a/src/views/pms/brand/index.vue b/src/views/pms/brand/index.vue deleted file mode 100644 index d351385c..00000000 --- a/src/views/pms/brand/index.vue +++ /dev/null @@ -1,279 +0,0 @@ - - - - - - - diff --git a/src/views/pms/category/components/Attribute.vue b/src/views/pms/category/components/Attribute.vue deleted file mode 100644 index d103db67..00000000 --- a/src/views/pms/category/components/Attribute.vue +++ /dev/null @@ -1,183 +0,0 @@ - - - - - diff --git a/src/views/pms/category/components/Category.vue b/src/views/pms/category/components/Category.vue deleted file mode 100644 index 971182e6..00000000 --- a/src/views/pms/category/components/Category.vue +++ /dev/null @@ -1,289 +0,0 @@ - - - - - - diff --git a/src/views/pms/category/index.vue b/src/views/pms/category/index.vue deleted file mode 100644 index c54c67dd..00000000 --- a/src/views/pms/category/index.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - diff --git a/src/views/pms/goods/components/GoodsAttribute.vue b/src/views/pms/goods/components/GoodsAttribute.vue deleted file mode 100644 index de8aa067..00000000 --- a/src/views/pms/goods/components/GoodsAttribute.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - - diff --git a/src/views/pms/goods/components/GoodsCategory.vue b/src/views/pms/goods/components/GoodsCategory.vue deleted file mode 100644 index e946146a..00000000 --- a/src/views/pms/goods/components/GoodsCategory.vue +++ /dev/null @@ -1,113 +0,0 @@ - - - - - diff --git a/src/views/pms/goods/components/GoodsInfo.vue b/src/views/pms/goods/components/GoodsInfo.vue deleted file mode 100644 index 5b765530..00000000 --- a/src/views/pms/goods/components/GoodsInfo.vue +++ /dev/null @@ -1,220 +0,0 @@ - - - - - diff --git a/src/views/pms/goods/components/GoodsStock.vue b/src/views/pms/goods/components/GoodsStock.vue deleted file mode 100644 index ae27006e..00000000 --- a/src/views/pms/goods/components/GoodsStock.vue +++ /dev/null @@ -1,643 +0,0 @@ - - - - - diff --git a/src/views/pms/goods/detail.vue b/src/views/pms/goods/detail.vue deleted file mode 100644 index a98e7b09..00000000 --- a/src/views/pms/goods/detail.vue +++ /dev/null @@ -1,110 +0,0 @@ - - - - - diff --git a/src/views/pms/goods/index.vue b/src/views/pms/goods/index.vue deleted file mode 100644 index 8dd29236..00000000 --- a/src/views/pms/goods/index.vue +++ /dev/null @@ -1,277 +0,0 @@ - - - - - - - - diff --git a/src/views/sms/advert/index.vue b/src/views/sms/advert/index.vue deleted file mode 100644 index b8d47eb6..00000000 --- a/src/views/sms/advert/index.vue +++ /dev/null @@ -1,306 +0,0 @@ - - - - - diff --git a/src/views/sms/coupon/index.vue b/src/views/sms/coupon/index.vue deleted file mode 100644 index bfc35044..00000000 --- a/src/views/sms/coupon/index.vue +++ /dev/null @@ -1,532 +0,0 @@ - - - - - - - - diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue deleted file mode 100644 index 7211de82..00000000 --- a/src/views/system/client/index.vue +++ /dev/null @@ -1,374 +0,0 @@ - - - - - - diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index bcd0fb2d..2e408c43 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -16,16 +16,12 @@ import { addDept, listDeptOptions, listDepartments -} from '@/api/system/dept'; +} from '@/api/dept'; // 组件依赖 import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue'; import { ElForm, ElMessage, ElMessageBox } from 'element-plus'; -import { - DeptFormData, - DeptItem, - DeptQueryParam -} from '@/types/api/system/dept'; +import { DeptFormData, DeptItem, DeptQueryParam } from '@/types/api/dept'; import { Dialog, Option } from '@/types/common'; // DOM元素的引用声明定义 diff --git a/src/views/system/dict/components/DictItem.vue b/src/views/system/dict/components/DictItem.vue index 33f83c79..1264da1c 100644 --- a/src/views/system/dict/components/DictItem.vue +++ b/src/views/system/dict/components/DictItem.vue @@ -1,6 +1,6 @@ @@ -10,8 +10,8 @@ import { ElForm, ElMessage, ElMessageBox } from 'element-plus'; import { DictItem, DictItemFormData, - DictItemQueryParam, -} from '@/types/api/system/dict'; + DictItemQueryParam +} from '@/types/api/dict'; import { Dialog } from '@/types/common'; import { @@ -19,8 +19,8 @@ import { getDictItemData, addDictItem, updateDictItem, - deleteDictItems, -} from '@/api/system/dict'; + deleteDictItems +} from '@/api/dict'; import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue'; const props = defineProps({ @@ -28,19 +28,19 @@ const props = defineProps({ type: String, default: () => { return ''; - }, + } }, typeName: { type: String, default: () => { return ''; - }, - }, + } + } }); watch( () => props.typeCode, - (value) => { + value => { state.queryParams.typeCode = value; state.formData.typeCode = value; handleQuery(); @@ -66,14 +66,14 @@ const state = reactive({ typeCode: props.typeCode, typeName: props.typeName, status: 1, - sort: 1, + sort: 1 } as DictItemFormData, rules: { name: [{ required: true, message: '请输入字典项名称', trigger: 'blur' }], - value: [{ required: true, message: '请输入字典项值', trigger: 'blur' }], + value: [{ required: true, message: '请输入字典项值', trigger: 'blur' }] }, localDictCode: props.typeCode, - localDictName: props.typeName, + localDictName: props.typeName }); const { @@ -84,7 +84,7 @@ const { dialog, formData, rules, - total, + total } = toRefs(state); function handleQuery() { @@ -121,14 +121,14 @@ function handleAdd() { } state.dialog = { title: '添加字典数据项', - visible: true, + visible: true }; } function handleUpdate(row: any) { state.dialog = { title: '修改字典数据项', - visible: true, + visible: true }; const id = row.id || state.ids; getDictItemData(id).then(({ data }) => { @@ -167,7 +167,7 @@ function handleDelete(row: any) { ElMessageBox.confirm('确认删除已选中的数据项?', '警告', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning', + type: 'warning' }) .then(() => { deleteDictItems(ids).then(() => { diff --git a/src/views/system/dict/components/DictType.vue b/src/views/system/dict/components/DictType.vue index e2398934..e309b9ba 100644 --- a/src/views/system/dict/components/DictType.vue +++ b/src/views/system/dict/components/DictType.vue @@ -1,6 +1,6 @@ @@ -135,17 +135,13 @@ import { getDictFormData, addDictType, updateDictType, - deleteDictTypes, -} from '@/api/system/dict'; + deleteDictTypes +} from '@/api/dict'; import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue'; import { ElForm, ElMessage, ElMessageBox } from 'element-plus'; import { Dialog } from '@/types/common'; -import { - Dict, - DictFormTypeData, - DictQueryParam, -} from '@/types/api/system/dict'; +import { Dict, DictFormTypeData, DictQueryParam } from '@/types/api/dict'; const queryFormRef = ref(ElForm); const dataFormRef = ref(ElForm); @@ -162,18 +158,18 @@ const state = reactive({ multiple: true, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 10 } as DictQueryParam, dictList: [] as Dict[], total: 0, dialog: { visible: false } as Dialog, formData: { - status: 1, + status: 1 } as DictFormTypeData, rules: { name: [{ required: true, message: '请输入字典名称', trigger: 'blur' }], - code: [{ required: true, message: '请输入字典编码', trigger: 'blur' }], - }, + code: [{ required: true, message: '请输入字典编码', trigger: 'blur' }] + } }); const { total, dialog, loading, dictList, formData, rules, queryParams } = @@ -203,14 +199,14 @@ function handleSelectionChange(selection: any) { function handleAdd() { state.dialog = { title: '添加字典', - visible: true, + visible: true }; } function handleUpdate(row: any) { state.dialog = { title: '修改字典', - visible: true, + visible: true }; const id = row.id || state.ids; getDictFormData(id).then(({ data }) => { @@ -249,7 +245,7 @@ function handleDelete(row: any) { ElMessageBox.confirm('确认删除已选中的数据项?', '警告', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning', + type: 'warning' }) .then(() => { deleteDictTypes(ids).then(() => { diff --git a/src/views/system/menu/components/Menu.vue b/src/views/system/menu/components/Menu.vue index 0394d09e..5eb8e1dc 100644 --- a/src/views/system/menu/components/Menu.vue +++ b/src/views/system/menu/components/Menu.vue @@ -233,11 +233,7 @@ import { ElForm, ElMessage, ElMessageBox, ElPopover } from 'element-plus'; import { Dialog, Option } from '@/types/common'; -import { - MenuFormData, - MenuItem, - MenuQueryParam -} from '@/types/api/system/menu'; +import { MenuFormData, MenuItem, MenuQueryParam } from '@/types/api/menu'; // API 依赖 import { listMenus, @@ -246,7 +242,7 @@ import { addMenu, deleteMenus, updateMenu -} from '@/api/system/menu'; +} from '@/api/menu'; import SvgIcon from '@/components/SvgIcon/index.vue'; import IconSelect from '@/components/IconSelect/index.vue'; diff --git a/src/views/system/menu/components/Perm.vue b/src/views/system/menu/components/Perm.vue index 361b5e9c..edd034d8 100644 --- a/src/views/system/menu/components/Perm.vue +++ b/src/views/system/menu/components/Perm.vue @@ -5,7 +5,7 @@ import { reactive, ref, getCurrentInstance, - toRefs, + toRefs } from 'vue'; import { @@ -13,19 +13,15 @@ import { getPermFormDetail, addPerm, updatePerm, - deletePerms, -} from '@/api/system/perm'; + deletePerms +} from '@/api/perm'; import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue'; import { ElForm, ElMessage, ElMessageBox } from 'element-plus'; import { Dialog, Option } from '@/types/common'; -import { - PermFormData, - PermItem, - PermQueryParam, -} from '@/types/api/system/perm'; -import { MenuItem } from '@/types/api/system/menu'; +import { PermFormData, PermItem, PermQueryParam } from '@/types/api/perm'; +import { MenuItem } from '@/types/api/menu'; const { proxy }: any = getCurrentInstance(); @@ -37,19 +33,19 @@ const props = defineProps({ type: Object, default: () => { return {} as MenuItem; - }, - }, + } + } }); watch( () => props.menu, - (value) => { + value => { queryParams.value.menuId = value.id; console.log('menu', value); handleQuery(); }, { - deep: true, + deep: true } ); @@ -63,26 +59,26 @@ const state = reactive({ multiple: true, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 10 } as PermQueryParam, permList: [] as PermItem[], total: 0, dialog: { - visible: false, + visible: false } as Dialog, formData: {} as PermFormData, rules: { name: [{ required: true, message: '请输入权限名称', trigger: 'blur' }], perm: [{ required: true, message: '请输入权限标识', trigger: 'blur' }], - method: [{ required: true, message: '请选择请求方式', trigger: 'blur' }], + method: [{ required: true, message: '请选择请求方式', trigger: 'blur' }] }, microServiceOptions: [] as Option[], requestMethodOptions: [] as Option[], urlPerm: { requestMethod: '', serviceName: '', - requestPath: '', - }, + requestPath: '' + } }); const { @@ -96,7 +92,7 @@ const { microServiceOptions, requestMethodOptions, urlPerm, - queryParams, + queryParams } = toRefs(state); function handleQuery() { @@ -143,7 +139,7 @@ function handleAdd() { loadDictOptions(); state.dialog = { title: '添加权限', - visible: true, + visible: true }; } @@ -151,14 +147,14 @@ function handleUpdate(row: any) { loadDictOptions(); state.dialog = { title: '修改权限', - visible: true, + visible: true }; const id = row.id || state.ids; - getPermFormDetail(id).then((response) => { + getPermFormDetail(id).then(response => { const { data } = response; state.formData = data; if (data && data.urlPerm) { - // GET:/youlai-admin/api/v1/users + // GET:/youlai-system/api/v1/users const urlPermArr = data.urlPerm.split(':'); state.urlPerm.requestMethod = urlPermArr[0]; state.urlPerm.serviceName = urlPermArr[1].substring( @@ -225,7 +221,7 @@ function resetForm() { state.urlPerm = { requestMethod: '', serviceName: '', - requestPath: '', + requestPath: '' }; } @@ -239,7 +235,7 @@ function handleDelete(row: any) { ElMessageBox.confirm('确认删除已选中的数据项?', '警告', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning', + type: 'warning' }) .then(() => { deletePerms(ids).then(() => { diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 9e064908..ca059b24 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -36,9 +36,9 @@ import PermTable from './components/Perm.vue'; import { reactive, toRefs } from 'vue'; import { WarningFilled } from '@element-plus/icons-vue'; -import { MenuItem } from '@/types/api/system/menu'; +import { MenuItem } from '@/types/api/menu'; const state = reactive({ - menu: {} as MenuItem, + menu: {} as MenuItem }); const { menu } = toRefs(state); diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 4d038fc4..15510247 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -14,17 +14,13 @@ import { deleteRoles, getRoleResources, updateRoleResource -} from '@/api/system/role'; -import { listResources } from '@/api/system/menu'; +} from '@/api/role'; +import { listResources } from '@/api/menu'; import { ElForm, ElMessage, ElMessageBox, ElTree } from 'element-plus'; import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue'; -import { - RoleFormData, - RoleItem, - RoleQueryParam -} from '@/types/api/system/role'; -import { Resource } from '@/types/api/system/menu'; +import { RoleFormData, RoleItem, RoleQueryParam } from '@/types/api/role'; +import { Resource } from '@/types/api/menu'; import SvgIcon from '@/components/SvgIcon/index.vue'; const emit = defineEmits(['roleClick']); diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 9b3f6f34..0bb512b1 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -27,9 +27,9 @@ import { downloadTemplate, exportUser, importUser -} from '@/api/system/user'; -import { listDeptOptions } from '@/api/system/dept'; -import { listRoleOptions } from '@/api/system/role'; +} from '@/api/user'; +import { listDeptOptions } from '@/api/dept'; +import { listRoleOptions } from '@/api/role'; // 组件依赖 import { @@ -55,7 +55,7 @@ import { UserQueryParam, UserFormData, UserImportFormData -} from '@/types/api/system/user'; +} from '@/types/api/user'; import { Option, Dialog } from '@/types/common'; diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue deleted file mode 100644 index 7b779acb..00000000 --- a/src/views/ums/member/index.vue +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - -