refactor: 系统管理页面重构和ts类型声明优化

Former-commit-id: 40263bbb072596ada41ef33d9170841e7e66cd01
2022-06-15 00:48:17 +08:00
parent 928ba2dbd8
commit 321b584f9f
116 changed files with 1692 additions and 1485 deletions
--- a/src/api/lab/seata.ts
+++ b/src/api/lab/seata.ts
@@ -1,4 +1,4 @@
-import { SeataFormData } from '@/types';
+import { SeataFormData } from '@/types/api/lab/seata';
 import request from '@/utils/request';

 /**
@@ -9,7 +9,7 @@ export function payOrder(data: SeataFormData) {
  return request({
    url: '/youlai-lab/api/v1/seata/order/_pay',
    method: 'post',
-    data: data
+    data: data,
  });
 }

@@ -20,7 +20,7 @@ export function payOrder(data: SeataFormData) {
 export function getSeataData() {
  return request({
    url: '/youlai-lab/api/v1/seata/data',
-    method: 'get'
+    method: 'get',
  });
 }

@@ -31,6 +31,6 @@ export function getSeataData() {
 export function resetSeataData() {
  return request({
    url: '/youlai-lab/api/v1/seata/data/_reset',
-    method: 'put'
+    method: 'put',
  });
 }
--- a/src/api/login/index.ts
+++ b/src/api/login/index.ts
@@ -1,4 +1,8 @@
-import { Captcha, LoginFormData, LoginResponseData } from '@/types';
+import {
+  Captcha,
+  LoginFormData,
+  LoginResponseData,
+} from '@/types/api/system/login';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';

@@ -12,8 +16,8 @@ export function login(data: LoginFormData): AxiosPromise<LoginResponseData> {
    method: 'post',
    params: data,
    headers: {
-      Authorization: 'Basic bWFsbC1hZG1pbi13ZWI6MTIzNDU2' // 客户端信息Base64明文：mall-admin-web:123456
-    }
+      Authorization: 'Basic bWFsbC1hZG1pbi13ZWI6MTIzNDU2', // 客户端信息Base64明文：mall-admin-web:123456
+    },
  });
 }

@@ -23,7 +27,7 @@ export function login(data: LoginFormData): AxiosPromise<LoginResponseData> {
 export function logout() {
  return request({
    url: '/youlai-auth/oauth/logout',
-    method: 'delete'
+    method: 'delete',
  });
 }

@@ -33,6 +37,6 @@ export function logout() {
 export function getCaptcha(): AxiosPromise<Captcha> {
  return request({
    url: '/captcha?t=' + new Date().getTime().toString(),
-    method: 'get'
+    method: 'get',
  });
 }
--- a/src/api/oms/order.ts
+++ b/src/api/oms/order.ts
@@ -1,4 +1,4 @@
-import { OrderPageResult, OrderQueryParam } from '@/types';
+import { OrderPageResult, OrderQueryParam } from '@/types/api/oms/order';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';

@@ -13,7 +13,7 @@ export function listOrderPages(
  return request({
    url: '/mall-oms/api/v1/orders',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

@@ -25,6 +25,6 @@ export function listOrderPages(
 export function getOrderDetail(orderId: number) {
  return request({
    url: '/mall-oms/api/v1/orders/' + orderId,
-    method: 'get'
+    method: 'get',
  });
 }
--- a/src/api/pms/attribute.ts
+++ b/src/api/pms/attribute.ts
@@ -9,7 +9,7 @@ export function listAttributes(params: object) {
  return request({
    url: '/mall-pms/api/v1/attributes',
    method: 'get',
-    params: params
+    params: params,
  });
 }

@@ -22,6 +22,6 @@ export function saveAttributeBatch(data: object) {
  return request({
    url: '/mall-pms/api/v1/attributes/batch',
    method: 'post',
-    data: data
+    data: data,
  });
 }
--- a/src/api/pms/brand.ts
+++ b/src/api/pms/brand.ts
@@ -2,8 +2,8 @@ import {
  BrandFormData,
  BrandItem,
  BrandPageResult,
-  BrandQueryParam
-} from '@/types';
+  BrandQueryParam,
+} from '@/types/api/pms/brand';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';

@@ -18,7 +18,7 @@ export function listBrandPages(
  return request({
    url: '/mall-pms/api/v1/brands/page',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

@@ -33,7 +33,7 @@ export function listBrands(
  return request({
    url: '/mall-pms/api/v1/brands',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

@@ -45,7 +45,7 @@ export function listBrands(
 export function getBrandFormDetail(id: number): AxiosPromise<BrandFormData> {
  return request({
    url: '/mall-pms/api/v1/brands/' + id,
-    method: 'get'
+    method: 'get',
  });
 }

@@ -58,7 +58,7 @@ export function addBrand(data: BrandFormData) {
  return request({
    url: '/mall-pms/api/v1/brands',
    method: 'post',
-    data: data
+    data: data,
  });
 }

@@ -72,7 +72,7 @@ export function updateBrand(id: number, data: BrandFormData) {
  return request({
    url: '/mall-pms/api/v1/brands/' + id,
    method: 'put',
-    data: data
+    data: data,
  });
 }

@@ -84,6 +84,6 @@ export function updateBrand(id: number, data: BrandFormData) {
 export function deleteBrands(ids: string) {
  return request({
    url: '/mall-pms/api/v1/brands/' + ids,
-    method: 'delete'
+    method: 'delete',
  });
 }
--- a/src/api/pms/category.ts
+++ b/src/api/pms/category.ts
@@ -9,7 +9,7 @@ export function listCategories(queryParams: object) {
  return request({
    url: '/mall-pms/api/v1/categories',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

@@ -22,7 +22,7 @@ export function listCascadeCategories(queryParams?: object) {
  return request({
    url: '/mall-pms/api/v1/categories/cascade',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

@@ -34,7 +34,7 @@ export function listCascadeCategories(queryParams?: object) {
 export function getCategoryDetail(id: number) {
  return request({
    url: '/mall-pms/api/v1/categories/' + id,
-    method: 'get'
+    method: 'get',
  });
 }

@@ -47,7 +47,7 @@ export function addCategory(data: object) {
  return request({
    url: '/mall-pms/api/v1/categories',
    method: 'post',
-    data: data
+    data: data,
  });
 }

@@ -61,7 +61,7 @@ export function updateCategory(id: number, data: object) {
  return request({
    url: '/mall-pms/api/v1/categories/' + id,
    method: 'put',
-    data: data
+    data: data,
  });
 }

@@ -73,7 +73,7 @@ export function updateCategory(id: number, data: object) {
 export function deleteCategories(ids: string) {
  return request({
    url: '/mall-pms/api/v1/categories/' + ids,
-    method: 'delete'
+    method: 'delete',
  });
 }

@@ -87,6 +87,6 @@ export function updateCategoryPart(id: number, data: object) {
  return request({
    url: '/mall-pms/api/v1/categories/' + id,
    method: 'patch',
-    data: data
+    data: data,
  });
 }
--- a/src/api/pms/goods.ts
+++ b/src/api/pms/goods.ts
@@ -1,4 +1,8 @@
-import { GoodsDetail, GoodsPageResult, GoodsQueryParam } from '@/types';
+import {
+  GoodsDetail,
+  GoodsPageResult,
+  GoodsQueryParam,
+} from '@/types/api/pms/goods';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';

@@ -7,13 +11,13 @@ import { AxiosPromise } from 'axios';
 *
 * @param queryParams
 */
-export function listGoodsPages(
+export function listPageGoods(
  queryParams: GoodsQueryParam
 ): AxiosPromise<GoodsPageResult> {
  return request({
    url: '/mall-pms/api/v1/goods/page',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

@@ -25,7 +29,7 @@ export function listGoodsPages(
 export function getGoodsDetail(id: string): AxiosPromise<GoodsDetail> {
  return request({
    url: '/mall-pms/api/v1/goods/' + id,
-    method: 'get'
+    method: 'get',
  });
 }

@@ -38,7 +42,7 @@ export function addGoods(data: object) {
  return request({
    url: '/mall-pms/api/v1/goods',
    method: 'post',
-    data: data
+    data: data,
  });
 }

@@ -52,7 +56,7 @@ export function updateGoods(id: number, data: object) {
  return request({
    url: '/mall-pms/api/v1/goods/' + id,
    method: 'put',
-    data: data
+    data: data,
  });
 }

@@ -64,6 +68,6 @@ export function updateGoods(id: number, data: object) {
 export function deleteGoods(ids: string) {
  return request({
    url: '/mall-pms/api/v1/goods/' + ids,
-    method: 'delete'
+    method: 'delete',
  });
 }
--- a/src/api/sms/advert.ts
+++ b/src/api/sms/advert.ts
@@ -1,4 +1,8 @@
-import { AdvertFormData, AdvertPageResult, AdvertQueryParam } from '@/types';
+import {
+  AdvertFormData,
+  AdvertPageResult,
+  AdvertQueryParam,
+} from '@/types/api/sms/advert';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';

@@ -7,13 +11,13 @@ import { AxiosPromise } from 'axios';
 *
 * @param queryParams
 */
-export function listAdvertPages(
+export function listAdvertsPage(
  queryParams: AdvertQueryParam
 ): AxiosPromise<AdvertPageResult> {
  return request({
    url: '/mall-sms/api/v1/adverts',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

@@ -25,7 +29,7 @@ export function listAdvertPages(
 export function getAdvertFormDetail(id: number): AxiosPromise<AdvertFormData> {
  return request({
    url: '/mall-sms/api/v1/adverts/' + id,
-    method: 'get'
+    method: 'get',
  });
 }

@@ -38,7 +42,7 @@ export function addAdvert(data: AdvertFormData) {
  return request({
    url: '/mall-sms/api/v1/adverts',
    method: 'post',
-    data: data
+    data: data,
  });
 }

@@ -52,7 +56,7 @@ export function updateAdvert(id: number, data: AdvertFormData) {
  return request({
    url: '/mall-sms/api/v1/adverts/' + id,
    method: 'put',
-    data: data
+    data: data,
  });
 }

@@ -64,6 +68,6 @@ export function updateAdvert(id: number, data: AdvertFormData) {
 export function deleteAdverts(ids: string) {
  return request({
    url: '/mall-sms/api/v1/adverts/' + ids,
-    method: 'delete'
+    method: 'delete',
  });
 }
--- a/src/api/sms/coupon.ts
+++ b/src/api/sms/coupon.ts
@@ -0,0 +1,73 @@
+import {
+  CouponQueryParam,
+  CouponPageResult,
+  CouponFormData,
+} from '@/types/api/sms/coupon';
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+
+/**
+ * 获取优惠券分页列表
+ *
+ * @param queryParams
+ */
+export function listCouponsPage(
+  queryParams: CouponQueryParam
+): AxiosPromise<CouponPageResult> {
+  return request({
+    url: '/mall-sms/api/v1/coupons/pagelist',
+    method: 'get',
+    params: queryParams,
+  });
+}
+
+/**
+ * 获取优惠券详情
+ *
+ * @param id
+ */
+export function getCouponFormDetail(id: number): AxiosPromise<CouponFormData> {
+  return request({
+    url: '/mall-sms/api/v1/coupons/' + id,
+    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',
+  });
+}
--- a/src/api/system/client.ts
+++ b/src/api/system/client.ts
@@ -1,7 +1,7 @@
 import {
  ClientFormData,
  ClientPageResult,
-  ClientQueryParam
+  ClientQueryParam,
 } from '@/types/api/system/client';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
@@ -12,14 +12,14 @@ export function listClientPages(
  return request({
    url: '/youlai-admin/api/v1/oauth-clients',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

 export function getClientFormDetial(id: number): AxiosPromise<ClientFormData> {
  return request({
    url: '/youlai-admin/api/v1/oauth-clients/' + id,
-    method: 'get'
+    method: 'get',
  });
 }

@@ -27,7 +27,7 @@ export function addClient(data: ClientFormData) {
  return request({
    url: '/youlai-admin/api/v1/oauth-clients',
    method: 'post',
-    data: data
+    data: data,
  });
 }

@@ -35,14 +35,14 @@ export function updateClient(id: string, data: ClientFormData) {
  return request({
    url: '/youlai-admin/api/v1/oauth-clients/' + id,
    method: 'put',
-    data: data
+    data: data,
  });
 }

 export function deleteClients(ids: string) {
  return request({
    url: '/youlai-admin/api/v1/oauth-clients/' + ids,
-    method: 'delete'
+    method: 'delete',
  });
 }

@@ -50,6 +50,6 @@ export function updateClientPart(id: number, data: object) {
  return request({
    url: '/youlai-admin/api/v1/oauth-clients/' + id,
    method: 'patch',
-    data: data
+    data: data,
  });
 }
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -1,4 +1,9 @@
-import { DeptFormData, DeptItem, DeptQueryParam, Option } from '@/types';
+import {
+  DeptFormData,
+  DeptItem,
+  DeptQueryParam,
+} from '@/types/api/system/dept';
+import { Option } from '@/types/common';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';

@@ -7,13 +12,13 @@ import { AxiosPromise } from 'axios';
 *
 * @param queryParams
 */
-export function listTableDepartments(
+export function listDepartments(
  queryParams?: DeptQueryParam
 ): AxiosPromise<DeptItem[]> {
  return request({
-    url: '/youlai-admin/api/v1/depts/table',
+    url: '/youlai-admin/api/v1/depts',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

@@ -22,8 +27,8 @@ export function listTableDepartments(
 */
 export function listSelectDepartments(): AxiosPromise<Option[]> {
  return request({
-    url: '/youlai-admin/api/v1/depts/select',
-    method: 'get'
+    url: '/youlai-admin/api/v1/depts/select_list',
+    method: 'get',
  });
 }

@@ -32,10 +37,10 @@ export function listSelectDepartments(): AxiosPromise<Option[]> {
 *
 * @param id
 */
-export function getDeptDetail(id: string): AxiosPromise<DeptFormData> {
+export function getDeptForrmData(id: string): AxiosPromise<DeptFormData> {
  return request({
-    url: '/youlai-admin/api/v1/depts/' + id,
-    method: 'get'
+    url: '/youlai-admin/api/v1/depts/' + id + '/form_data',
+    method: 'get',
  });
 }

@@ -48,7 +53,7 @@ export function addDept(data: DeptFormData) {
  return request({
    url: '/youlai-admin/api/v1/depts',
    method: 'post',
-    data: data
+    data: data,
  });
 }

@@ -62,7 +67,7 @@ export function updateDept(id: string, data: DeptFormData) {
  return request({
    url: '/youlai-admin/api/v1/depts/' + id,
    method: 'put',
-    data: data
+    data: data,
  });
 }

@@ -74,6 +79,6 @@ export function updateDept(id: string, data: DeptFormData) {
 export function deleteDept(ids: string) {
  return request({
    url: '/youlai-admin/api/v1/depts/' + ids,
-    method: 'delete'
+    method: 'delete',
  });
 }
--- a/src/api/system/dict.ts
+++ b/src/api/system/dict.ts
@@ -1,12 +1,12 @@
+import { Option } from '@/types/common';
 import {
-  DictFormData,
+  DictFormTypeData,
  DictItemFormData,
  DictItemPageResult,
  DictItemQueryParam,
  DictPageResult,
  DictQueryParam,
-  Option
-} from '@/types';
+} from '@/types/api/system/dict';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';

@@ -15,13 +15,13 @@ import { AxiosPromise } from 'axios';
 *
 * @param queryParams
 */
-export function listDictPages(
+export function listPageDictTypes(
  queryParams: DictQueryParam
 ): AxiosPromise<DictPageResult> {
  return request({
-    url: '/youlai-admin/api/v2/dict/page',
+    url: '/youlai-admin/api/v1/dict-types',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

@@ -30,48 +30,49 @@ export function listDictPages(
 *
 * @param id
 */
-export function getDictFormDetail(id: number): AxiosPromise<DictFormData> {
+export function getDictFormData(id: number): AxiosPromise<DictFormTypeData> {
  return request({
-    url: '/youlai-admin/api/v2/dict/' + id,
-    method: 'get'
+    url: '/youlai-admin/api/v1/dict-types/' + id + '/form_data',
+    method: 'get',
  });
 }

 /**
- * 新增字典
+ * 新增字典类型
 *
 * @param data
 */
-export function addDict(data: DictFormData) {
+export function addDictType(data: DictFormTypeData) {
  return request({
-    url: '/youlai-admin/api/v2/dict',
+    url: '/youlai-admin/api/v1/dict-types',
    method: 'post',
-    data: data
+    data: data,
  });
 }

 /**
- * 修改字典
+ * 修改字典类型
 *
 * @param id
 * @param data
 */
-export function updateDict(id: number, data: DictFormData) {
+export function updateDictType(id: number, data: DictFormTypeData) {
  return request({
-    url: '/youlai-admin/api/v2/dict/' + id,
+    url: '/youlai-admin/api/v1/dict-types/' + id,
    method: 'put',
-    data: data
+    data: data,
  });
 }

 /**
- * 批量删除字典
- * @param ids 字典ID，多个以英文逗号(,)分割
+ * 批量删除字典类型
+ *
+ * @param ids 字典类型ID，多个以英文逗号(,)分割
 */
-export function deleteDict(ids: string) {
+export function deleteDictTypes(ids: string) {
  return request({
-    url: '/youlai-admin/api/v2/dict/' + ids,
-    method: 'delete'
+    url: '/youlai-admin/api/v1/dict-types/' + ids,
+    method: 'delete',
  });
 }

@@ -80,38 +81,40 @@ export function deleteDict(ids: string) {
 *
 * @param queryParams
 */
-export function listDictItemPages(
+export function listPageDictItems(
  queryParams: DictItemQueryParam
 ): AxiosPromise<DictItemPageResult> {
  return request({
-    url: '/youlai-admin/api/v2/dict/items/page',
+    url: '/youlai-admin/api/v1/dict-items',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

 /**
- * 根据字典编码获取字典项列表
+ * 根据字典类型编码获取字典数据项
 *
- * @param dictCode
+ * @param typeCode 字典类型编码
 */
-export function listDictsByCode(dictCode: string): AxiosPromise<Option[]> {
+export function getDictItemsByTypeCode(
+  typeCode: string
+): AxiosPromise<Option[]> {
  return request({
-    url: '/youlai-admin/api/v2/dict/items',
+    url: '/youlai-admin/api/v1/dict-items/select_list',
    method: 'get',
-    params: { dictCode: dictCode }
+    params: { typeCode: typeCode },
  });
 }

 /**
- * 获取字典项详情
+ * 获取字典数据项表单
 *
 * @param id
 */
-export function getDictItemDetail(id: number): AxiosPromise<DictItemFormData> {
+export function getDictItemData(id: number): AxiosPromise<DictItemFormData> {
  return request({
-    url: '/youlai-admin/api/v2/dict/items/' + id,
-    method: 'get'
+    url: '/youlai-admin/api/v1/dict-items/' + id + '/form_data',
+    method: 'get',
  });
 }

@@ -120,11 +123,11 @@ export function getDictItemDetail(id: number): AxiosPromise<DictItemFormData> {
 *
 * @param data
 */
-export function addDictItem(data: any) {
+export function addDictItem(data: DictItemFormData) {
  return request({
-    url: '/youlai-admin/api/v2/dict/items',
+    url: '/youlai-admin/api/v1/dict-items',
    method: 'post',
-    data: data
+    data: data,
  });
 }

@@ -134,21 +137,22 @@ export function addDictItem(data: any) {
 * @param id
 * @param data
 */
-export function updateDictItem(id: number, data: any) {
+export function updateDictItem(id: number, data: DictItemFormData) {
  return request({
-    url: '/youlai-admin/api/v2/dict/items/' + id,
+    url: '/youlai-admin/api/v1/dict-items/' + id,
    method: 'put',
-    data: data
+    data: data,
  });
 }

 /**
- * 批量删除字典项
+ * 批量删除字典数据项
+ *
 * @param ids 字典项ID，多个以英文逗号(,)分割
 */
-export function deleteDictItem(ids: string) {
+export function deleteDictItems(ids: string) {
  return request({
-    url: '/youlai-admin/api/v2/dict/items/' + ids,
-    method: 'delete'
+    url: '/youlai-admin/api/v1/dict-items/' + ids,
+    method: 'delete',
  });
 }
--- a/src/api/system/file.ts
+++ b/src/api/system/file.ts
@@ -13,8 +13,8 @@ export function uploadFile(file: File) {
    method: 'post',
    data: formData,
    headers: {
-      'Content-Type': 'multipart/form-data'
-    }
+      'Content-Type': 'multipart/form-data',
+    },
  });
 }

@@ -27,6 +27,6 @@ export function deleteFile(path?: string) {
  return request({
    url: '/youlai-admin/api/v1/files',
    method: 'delete',
-    params: { path: path }
+    params: { path: path },
  });
 }
--- a/src/api/system/menu.ts
+++ b/src/api/system/menu.ts
@@ -1,4 +1,9 @@
-import { MenuFormData, MenuItem, MenuQueryParam, Option } from '@/types';
+import {
+  MenuFormData,
+  MenuItem,
+  MenuQueryParam,
+} from '@/types/api/system/menu';
+import { Option } from '@/types/common';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';

@@ -7,8 +12,8 @@ import { AxiosPromise } from 'axios';
 */
 export function listRoutes() {
  return request({
-    url: '/youlai-admin/api/v1/menus/route',
-    method: 'get'
+    url: '/youlai-admin/api/v1/menus/route_list',
+    method: 'get',
  });
 }

@@ -17,23 +22,33 @@ export function listRoutes() {
 *
 * @param queryParams
 */
-export function listTableMenus(
+export function listMenus(
  queryParams: MenuQueryParam
 ): AxiosPromise<MenuItem[]> {
  return request({
-    url: '/youlai-admin/api/v1/menus/table',
+    url: '/youlai-admin/api/v1/menus',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

 /**
- * 获取菜单下拉列表
+ * 获取菜单下拉树形列表
 */
 export function listSelectMenus(): AxiosPromise<Option[]> {
  return request({
-    url: '/youlai-admin/api/v1/menus/select',
-    method: 'get'
+    url: '/youlai-admin/api/v1/menus/select_list',
+    method: 'get',
+  });
+}
+
+/**
+ * 获取菜单权限树形列表
+ */
+export function getResource(): AxiosPromise<any> {
+  return request({
+    url: '/youlai-admin/api/v1/menus/resources',
+    method: 'get',
  });
 }

@@ -44,7 +59,7 @@ export function listSelectMenus(): AxiosPromise<Option[]> {
 export function getMenuDetail(id: number): AxiosPromise<MenuFormData> {
  return request({
    url: '/youlai-admin/api/v1/menus/' + id,
-    method: 'get'
+    method: 'get',
  });
 }

@@ -57,7 +72,7 @@ export function addMenu(data: MenuFormData) {
  return request({
    url: '/youlai-admin/api/v1/menus',
    method: 'post',
-    data: data
+    data: data,
  });
 }

@@ -71,7 +86,7 @@ export function updateMenu(id: string, data: MenuFormData) {
  return request({
    url: '/youlai-admin/api/v1/menus/' + id,
    method: 'put',
-    data: data
+    data: data,
  });
 }

@@ -83,6 +98,6 @@ export function updateMenu(id: string, data: MenuFormData) {
 export function deleteMenus(ids: string) {
  return request({
    url: '/youlai-admin/api/v1/menus/' + ids,
-    method: 'delete'
+    method: 'delete',
  });
 }
--- a/src/api/system/perm.ts
+++ b/src/api/system/perm.ts
@@ -2,8 +2,8 @@ import {
  PermFormData,
  PermItem,
  PermPageResult,
-  PermQueryParam
-} from '@/types';
+  PermQueryParam,
+} from '@/types/api/system/perm';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';

@@ -18,7 +18,7 @@ export function listPermPages(
  return request({
    url: '/youlai-admin/api/v1/permissions/page',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

@@ -33,7 +33,7 @@ export function listPerms(
  return request({
    url: '/youlai-admin/api/v1/permissions',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

@@ -45,7 +45,7 @@ export function listPerms(
 export function getPermFormDetail(id: number): AxiosPromise<PermFormData> {
  return request({
    url: '/youlai-admin/api/v1/permissions/' + id,
-    method: 'get'
+    method: 'get',
  });
 }

@@ -58,7 +58,7 @@ export function addPerm(data: PermFormData) {
  return request({
    url: '/youlai-admin/api/v1/permissions',
    method: 'post',
-    data: data
+    data: data,
  });
 }

@@ -72,7 +72,7 @@ export function updatePerm(id: number, data: PermFormData) {
  return request({
    url: '/youlai-admin/api/v1/permissions/' + id,
    method: 'put',
-    data: data
+    data: data,
  });
 }

@@ -84,6 +84,6 @@ export function updatePerm(id: number, data: PermFormData) {
 export function deletePerms(ids: string) {
  return request({
    url: '/youlai-admin/api/v1/permissions/' + ids,
-    method: 'delete'
+    method: 'delete',
  });
 }
--- a/src/api/system/role.ts
+++ b/src/api/system/role.ts
@@ -1,39 +1,69 @@
 import {
  RoleFormData,
-  RoleItem,
  RolePageResult,
-  RoleQueryParam
-} from '@/types';
+  RoleQueryParam,
+  RoleResourceData,
+} from '@/types/api/system/role';
+
+import { Option } from '@/types/common';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';

 /**
- * 获取角色分页列表
+ * 获取角色分页数据
 *
 * @param queryParams
 */
-export function listRolePages(
+export function listPageRoles(
  queryParams?: RoleQueryParam
 ): AxiosPromise<RolePageResult> {
  return request({
-    url: '/youlai-admin/api/v1/roles/page',
+    url: '/youlai-admin/api/v1/roles',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

 /**
- * 获取角色列表
+ * 获取角色下拉数据
 *
 * @param queryParams
 */
-export function listRoles(
+export function listSelectRoles(
  queryParams?: RoleQueryParam
-): AxiosPromise<RoleItem[]> {
+): AxiosPromise<Option[]> {
  return request({
-    url: '/youlai-admin/api/v1/roles',
+    url: '/youlai-admin/api/v1/roles/select_list',
    method: 'get',
-    params: queryParams
+    params: queryParams,
+  });
+}
+
+/**
+ * 获取角色拥有的资源ID集合
+ *
+ * @param queryParams
+ */
+export function getRoleResourceIds(roleId: string): AxiosPromise<any> {
+  return request({
+    url: '/youlai-admin/api/v1/roles/' + roleId + '/resource_ids',
+    method: 'get',
+  });
+}
+
+/**
+ * 修改角色资源权限
+ *
+ * @param queryParams
+ */
+export function updateRoleResource(
+  roleId: string,
+  data: RoleResourceData
+): AxiosPromise<any> {
+  return request({
+    url: '/youlai-admin/api/v1/roles/' + roleId + '/resources',
+    method: 'put',
+    data: data,
  });
 }

@@ -45,7 +75,7 @@ export function listRoles(
 export function getRoleFormDetail(id: number): AxiosPromise<RoleFormData> {
  return request({
    url: '/youlai-admin/api/v1/roles/' + id,
-    method: 'get'
+    method: 'get',
  });
 }

@@ -58,7 +88,7 @@ export function addRole(data: RoleFormData) {
  return request({
    url: '/youlai-admin/api/v1/roles',
    method: 'post',
-    data: data
+    data: data,
  });
 }

@@ -72,7 +102,7 @@ export function updateRole(id: number, data: RoleFormData) {
  return request({
    url: '/youlai-admin/api/v1/roles/' + id,
    method: 'put',
-    data: data
+    data: data,
  });
 }

@@ -84,64 +114,6 @@ export function updateRole(id: number, data: RoleFormData) {
 export function deleteRoles(ids: string) {
  return request({
    url: '/youlai-admin/api/v1/roles/' + ids,
-    method: 'delete'
-  });
-}
-
-/**
- * 获取角色的菜单列表
- *
- * @param roleId
- */
-export function listRoleMenuIds(roleId: number): AxiosPromise<number[]> {
-  return request({
-    url: '/youlai-admin/api/v1/roles/' + roleId + '/menu_ids',
-    method: 'get'
-  });
-}
-
-/**
- * 修改角色的菜单
- *
- * @param roleId
- * @param menuIds
- */
-export function updateRoleMenu(roleId: number, menuIds: Array<number>) {
-  return request({
-    url: '/youlai-admin/api/v1/roles/' + roleId + '/menus',
-    method: 'put',
-    data: { menuIds: menuIds }
-  });
-}
-
-/**
- * 获取角色的权限列表
- *
- * @param roleId
- */
-export function listRolePerms(roleId: number, menuId: number) {
-  return request({
-    url: '/youlai-admin/api/v1/roles/' + roleId + '/permissions',
-    method: 'get',
-    params: { menuId: menuId }
-  });
-}
-
-/**
- * 保存角色权限
- *
- * @param menuId 菜单ID，归类权限
- * @param roleId
- * @param permIds
- */
-export function saveRolePerms(
-  roleId: number,
-  menuId: number,
-  permIds: Array<number>
-) {
-  return request({
-    url: '/youlai-admin/api/v1/roles/' + roleId + '/permissions',
-    method: 'put',
-    data: { menuId: menuId, permIds: permIds }
+    method: 'delete',
  });
 }
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -4,8 +4,8 @@ import {
  UserFormData,
  UserInfo,
  UserPageResult,
-  UserQueryParam
-} from '@/types';
+  UserQueryParam,
+} from '@/types/api/system/user';

 /**
 * 登录成功后获取用户信息（昵称、头像、权限集合和角色集合）
@@ -13,7 +13,7 @@ import {
 export function getUserInfo(): AxiosPromise<UserInfo> {
  return request({
    url: '/youlai-admin/api/v1/users/me',
-    method: 'get'
+    method: 'get',
  });
 }

@@ -26,9 +26,9 @@ export function listUsersPage(
  queryParams: UserQueryParam
 ): AxiosPromise<UserPageResult> {
  return request({
-    url: '/youlai-admin/api/v1/users/page',
+    url: '/youlai-admin/api/v1/users',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

@@ -37,10 +37,10 @@ export function listUsersPage(
 *
 * @param userId
 */
-export function getUserDetail(userId: number): AxiosPromise<UserFormData> {
+export function getUserFormData(userId: number): AxiosPromise<UserFormData> {
  return request({
-    url: '/youlai-admin/api/v1/users/' + userId,
-    method: 'get'
+    url: '/youlai-admin/api/v1/users/' + userId + '/form_data',
+    method: 'get',
  });
 }

@@ -53,7 +53,7 @@ export function addUser(data: any) {
  return request({
    url: '/youlai-admin/api/v1/users',
    method: 'post',
-    data: data
+    data: data,
  });
 }

@@ -67,7 +67,7 @@ export function updateUser(id: number, data: UserFormData) {
  return request({
    url: '/youlai-admin/api/v1/users/' + id,
    method: 'put',
-    data: data
+    data: data,
  });
 }

@@ -81,7 +81,7 @@ export function updateUserPart(id: number, data: any) {
  return request({
    url: '/youlai-admin/api/v1/users/' + id,
    method: 'patch',
-    data: data
+    data: data,
  });
 }

@@ -93,7 +93,7 @@ export function updateUserPart(id: number, data: any) {
 export function deleteUsers(ids: string) {
  return request({
    url: '/youlai-admin/api/v1/users/' + ids,
-    method: 'delete'
+    method: 'delete',
  });
 }

@@ -106,7 +106,7 @@ export function downloadTemplate() {
  return request({
    url: '/youlai-admin/api/v1/users/template',
    method: 'get',
-    responseType: 'arraybuffer'
+    responseType: 'arraybuffer',
  });
 }

@@ -121,7 +121,7 @@ export function exportUser(queryParams: UserQueryParam) {
    url: '/youlai-admin/api/v1/users/_export',
    method: 'get',
    params: queryParams,
-    responseType: 'arraybuffer'
+    responseType: 'arraybuffer',
  });
 }

@@ -140,7 +140,7 @@ export function importUser(deptId: number, roleIds: string, file: File) {
    method: 'post',
    data: formData,
    headers: {
-      'Content-Type': 'multipart/form-data'
-    }
+      'Content-Type': 'multipart/form-data',
+    },
  });
 }
--- a/src/api/ums/member.ts
+++ b/src/api/ums/member.ts
@@ -1,4 +1,4 @@
-import { MemberPageResult, MemberQueryParam } from '@/types';
+import { MemberPageResult, MemberQueryParam } from '@/types/api/ums/member';
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';

@@ -13,7 +13,7 @@ export function listMemebersPage(
  return request({
    url: '/mall-ums/api/v1/members',
    method: 'get',
-    params: queryParams
+    params: queryParams,
  });
 }

@@ -25,7 +25,7 @@ export function listMemebersPage(
 export function getMemberDetail(id: number) {
  return request({
    url: '/mall-ums/api/v1/members/' + id,
-    method: 'get'
+    method: 'get',
  });
 }

@@ -38,7 +38,7 @@ export function addMember(data: object) {
  return request({
    url: '/mall-ums/api/v1/members',
    method: 'post',
-    data: data
+    data: data,
  });
 }

@@ -52,6 +52,6 @@ export function updateMember(id: number, data: object) {
  return request({
    url: '/mall-ums/api/v1/members/' + id,
    method: 'put',
-    data: data
+    data: data,
  });
 }