diff --git a/src/api/lab/seata.ts b/src/api/lab/seata.ts
index 01e819f2..ab1156c8 100644
--- 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',
   });
 }
diff --git a/src/api/login/index.ts b/src/api/login/index.ts
index 865b428f..b5fbaf8f 100644
--- 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',
   });
 }
diff --git a/src/api/oms/order.ts b/src/api/oms/order.ts
index 8a8228d7..be49432b 100644
--- 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',
   });
 }
diff --git a/src/api/pms/attribute.ts b/src/api/pms/attribute.ts
index 5afb4d69..af4c4403 100644
--- 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,
   });
 }
diff --git a/src/api/pms/brand.ts b/src/api/pms/brand.ts
index 0cc8b68e..ca35a384 100644
--- 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',
   });
 }
diff --git a/src/api/pms/category.ts b/src/api/pms/category.ts
index 04018ba8..43208e47 100644
--- 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,
   });
 }
diff --git a/src/api/pms/goods.ts b/src/api/pms/goods.ts
index 9b9b5121..a8b768a6 100644
--- 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',
   });
 }
diff --git a/src/api/sms/advert.ts b/src/api/sms/advert.ts
index 3587d8d1..21f18e82 100644
--- 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',
   });
 }
diff --git a/src/api/sms/coupon.ts b/src/api/sms/coupon.ts
new file mode 100644
index 00000000..898e5b37
--- /dev/null
+++ 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',
+  });
+}
diff --git a/src/api/system/client.ts b/src/api/system/client.ts
index 6dc26b23..ab22d735 100644
--- 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,
   });
 }
diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index 9b5adc62..b1b859f8 100644
--- 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',
   });
 }
diff --git a/src/api/system/dict.ts b/src/api/system/dict.ts
index e0b639f5..2ecf000e 100644
--- 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',
   });
 }
diff --git a/src/api/system/file.ts b/src/api/system/file.ts
index 1b7d14af..8e570541 100644
--- 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 },
   });
 }
diff --git a/src/api/system/menu.ts b/src/api/system/menu.ts
index a068cb75..91861c91 100644
--- 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',
   });
 }
diff --git a/src/api/system/perm.ts b/src/api/system/perm.ts
index 35b9393d..48491680 100644
--- 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',
   });
 }
diff --git a/src/api/system/role.ts b/src/api/system/role.ts
index c78a0e85..4bb3809d 100644
--- 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',
   });
 }
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index b019de5f..1b832d5c 100644
--- 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',
+    },
   });
 }
diff --git a/src/api/ums/member.ts b/src/api/ums/member.ts
index d54e6bf0..8d1da0e4 100644
--- 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,
   });
 }
diff --git a/src/assets/icons/build.svg b/src/assets/icons/build.svg
deleted file mode 100644
index 97c46886..00000000
--- a/src/assets/icons/build.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1568899741379" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2054" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M960 591.424V368.96c0-0.288 0.16-0.512 0.16-0.768S960 367.68 960 367.424V192a32 32 0 0 0-32-32H96a32 32 0 0 0-32 32v175.424c0 0.288-0.16 0.512-0.16 0.768s0.16 0.48 0.16 0.768v222.464c0 0.288-0.16 0.512-0.16 0.768s0.16 0.48 0.16 0.768V864a32 32 0 0 0 32 32h832a32 32 0 0 0 32-32v-271.04c0-0.288 0.16-0.512 0.16-0.768S960 591.68 960 591.424z m-560-31.232v-160H608v160h-208z m208 64V832h-208v-207.808H608z m-480-224h208v160H128v-160z m544 0h224v160h-224v-160zM896 224v112.192H128V224h768zM128 624.192h208V832H128v-207.808zM672 832v-207.808h224V832h-224z" p-id="2055"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/checkbox.svg b/src/assets/icons/checkbox.svg
deleted file mode 100644
index 013fd3a2..00000000
--- a/src/assets/icons/checkbox.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575982282951" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="902" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M828.40625 90.125H195.59375C137.375 90.125 90.125 137.375 90.125 195.59375v632.8125c0 58.21875 47.25 105.46875 105.46875 105.46875h632.8125c58.21875 0 105.46875-47.25 105.46875-105.46875V195.59375c0-58.21875-47.25-105.46875-105.46875-105.46875z m52.734375 738.28125c0 29.16-23.57015625 52.734375-52.734375 52.734375H195.59375c-29.109375 0-52.734375-23.574375-52.734375-52.734375V195.59375c0-29.109375 23.625-52.734375 52.734375-52.734375h632.8125c29.16 0 52.734375 23.625 52.734375 52.734375v632.8125z" p-id="903"></path><path d="M421.52890625 709.55984375a36.28125 36.28125 0 0 1-27.55265625-12.66890625L205.17453125 476.613125a36.28546875 36.28546875 0 0 1 55.10109375-47.22890625l164.986875 192.4846875 342.16171875-298.48078125a36.2896875 36.2896875 0 0 1 47.70984375 54.68765625L445.3859375 700.6203125a36.3234375 36.3234375 0 0 1-23.85703125 8.93953125z" p-id="904"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/clipboard.svg b/src/assets/icons/clipboard.svg
deleted file mode 100644
index 90923ff6..00000000
--- a/src/assets/icons/clipboard.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M54.857 118.857h64V73.143H89.143c-1.902 0-3.52-.668-4.855-2.002-1.335-1.335-2.002-2.954-2.002-4.855V36.57H54.857v82.286zM73.143 16v-4.571a2.2 2.2 0 0 0-.677-1.61 2.198 2.198 0 0 0-1.609-.676H20.571c-.621 0-1.158.225-1.609.676a2.198 2.198 0 0 0-.676 1.61V16a2.2 2.2 0 0 0 .676 1.61c.451.45.988.676 1.61.676h50.285c.622 0 1.158-.226 1.61-.677.45-.45.676-.987.676-1.609zm18.286 48h21.357L91.43 42.642V64zM128 73.143v48c0 1.902-.667 3.52-2.002 4.855-1.335 1.335-2.953 2.002-4.855 2.002H52.57c-1.901 0-3.52-.667-4.854-2.002-1.335-1.335-2.003-2.953-2.003-4.855v-11.429H6.857c-1.902 0-3.52-.667-4.855-2.002C.667 106.377 0 104.759 0 102.857v-96c0-1.902.667-3.52 2.002-4.855C3.337.667 4.955 0 6.857 0h77.714c1.902 0 3.52.667 4.855 2.002 1.335 1.335 2.003 2.953 2.003 4.855V30.29c1 .622 1.856 1.29 2.569 2.003l29.147 29.147c1.335 1.335 2.478 3.145 3.429 5.43.95 2.287 1.426 4.383 1.426 6.291v-.018z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/code.svg b/src/assets/icons/code.svg
deleted file mode 100644
index ed4d23cf..00000000
--- a/src/assets/icons/code.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1546567861908" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2422" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M318.577778 819.2L17.066667 512l301.511111-307.2 45.511111 45.511111L96.711111 512l267.377778 261.688889zM705.422222 819.2l-45.511111-45.511111L927.288889 512l-267.377778-261.688889 45.511111-45.511111L1006.933333 512zM540.785778 221.866667l55.751111 11.150222L483.157333 802.133333l-55.751111-11.093333z" fill="#bfbfbf" p-id="2423"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/color.svg b/src/assets/icons/color.svg
deleted file mode 100644
index 44a81aab..00000000
--- a/src/assets/icons/color.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577252187056" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2508" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M747.59340925 691.12859384c11.51396329 0.25305413 22.43746719-0.21087818 40.74171707-1.51832482 29.35428085-2.10878421 35.84933734-2.36183835 46.47761114-0.8856895 24.71495444 3.37405491 41.12129828 21.76265671 32.47528161 47.95376084-85.57447632 258.19957947-442.00123984 249.76444099-628.67084683 50.73735554-153.47733892-159.33976008-153.09775772-414.41833795 0.92786545-573.42069196 159.71934128-162.67163983 424.03439521-166.59397897 565.78689185 0.63263534 80.38686649 94.81095318 108.34934958 169.16669549 89.11723508 230.57450162-15.01454608 47.99593598-50.61082928 77.68762207-119.77896259 114.63352789-4.89237973 2.65706845-29.35428085 15.52065436-35.84933652 19.02123633-46.94154346 25.30541465-63.51659033 41.20565021-62.20914449 58.45550757 2.95229856 39.13904114 24.16667102 52.7196135 70.98168823 53.81618115z m44.41100207 50.10472101c-19.82257471 1.43397372-32.05352527 1.940082-45.63409763 1.6448519-70.34905207-1.60267593-115.98314969-30.91478165-121.38163769-101.64341492-3.45840683-46.05585397 24.7571304-73.13264758 89.24376132-107.96976837 6.7902866-3.66928501 31.37871396-16.57504688 36.06021551-19.06341229 57.69634516-30.83042972 85.15271997-53.73183005 94.76877722-84.47790866 12.77923398-40.78389304-9.10994898-98.94417051-79.24812286-181.6507002-121.17075953-142.97559219-350.14258521-139.60153647-489.2380134 2.06660824-134.49827774 138.84237405-134.79350784 362.12048163-0.42175717 501.637667 158.53842169 168.99799328 451.9968783 181.18676788 534.57688175-11.80919339-4.68150156 0.2952301-10.71262573 0.67481131-18.72600705 1.26527069z" p-id="2509"></path><path d="M346.03865637 637.18588562a78.82636652 78.82636652 0 0 0 78.32025825-79.29029883c0-43.69401562-35.005823-79.29029883-78.32025825-79.29029882a78.82636652 78.82636652 0 0 0-78.36243338 79.29029882c0 43.69401562 35.005823 79.29029883 78.36243338 79.29029883z m0-51.7495729a27.07679361 27.07679361 0 0 1-26.5706845-27.54072593c0-15.30977536 11.97789643-27.54072593 26.5706845-27.54072592 14.55061295 0 26.57068533 12.23095057 26.57068533 27.54072592a27.07679361 27.07679361 0 0 1-26.57068533 27.54072593zM475.7289063 807.11174353a78.82636652 78.82636652 0 0 0 78.3624334-79.29029882c0-43.69401562-34.96364785-79.29029883-78.32025825-79.29029883a78.82636652 78.82636652 0 0 0-78.32025742 79.29029883c0 43.69401562 34.96364785 79.29029883 78.32025742 79.29029882z m0-51.74957208a27.07679361 27.07679361 0 0 1-26.57068532-27.54072674c0-15.30977536 12.06224753-27.54072593 26.57068532-27.54072593 14.59278892 0 26.57068533 12.23095057 26.57068453 27.54072593a27.07679361 27.07679361 0 0 1-26.57068453 27.54072674zM601.24376214 377.21492718a78.82636652 78.82636652 0 0 0 78.32025742-79.29029883c0-43.69401562-34.96364785-79.29029883-78.32025742-79.29029882a78.82636652 78.82636652 0 0 0-78.32025823 79.29029883c0 43.69401562 34.96364785 79.29029883 78.32025824 79.29029883z m1e-8-51.74957208a27.07679361 27.07679361 0 0 1-26.57068534-27.54072675c0-15.30977536 11.97789643-27.54072593 26.57068534-27.54072591 14.55061295 0 26.57068533 12.23095057 26.57068451 27.54072592a27.07679361 27.07679361 0 0 1-26.57068451 27.54072674zM378.80916809 433.85687983a78.82636652 78.82636652 0 0 0 78.32025824-79.29029883c0-43.69401562-34.96364785-79.29029883-78.32025824-79.29029802a78.82636652 78.82636652 0 0 0-78.32025742 79.29029802c0 43.69401562 34.96364785 79.29029883 78.32025742 79.29029883z m0-51.74957209a27.07679361 27.07679361 0 0 1-26.57068451-27.54072674c0-15.30977536 11.97789643-27.54072593 26.57068451-27.54072593 14.55061295 0 26.57068533 12.23095057 26.57068533 27.54072593a27.07679361 27.07679361 0 0 1-26.57068533 27.54072674z" p-id="2510"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/component.svg b/src/assets/icons/component.svg
deleted file mode 100644
index 29c34580..00000000
--- a/src/assets/icons/component.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575804206892" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3145" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M826.56 470.016c-32.896 0-64.384 12.288-89.984 35.52l0-104.96c0-62.208-50.496-112.832-112.64-113.088L623.936 287.04 519.552 287.104C541.824 262.72 554.56 230.72 554.56 197.12c0-73.536-59.904-133.44-133.504-133.44-73.472 0-133.376 59.904-133.376 133.44 0 32.896 12.224 64.256 35.52 89.984L175.232 287.104l0 0.576C113.728 288.704 64 338.88 64 400.576l0.32 0 0.32 116.48C60.864 544.896 70.592 577.728 100.8 588.48c12.736 4.608 37.632 7.488 60.864-25.28 12.992-18.368 34.24-29.248 56.64-29.248 38.336 0 69.504 31.104 69.504 69.312 0 38.4-31.168 69.504-69.504 69.504-22.656 0-44.032-11.264-57.344-30.4C138.688 610.112 112.576 615.36 102.464 619.136c-29.824 10.752-39.104 43.776-38.144 67.392l0 160.384L64 846.912C64 909.248 114.752 960 177.216 960l446.272 0c62.4 0 113.152-50.752 113.152-113.152l0-145.024c24.384 22.272 56.384 35.008 89.984 35.008 73.536 0 133.44-59.904 133.44-133.504C960 529.92 900.096 470.016 826.56 470.016zM826.56 672.896c-22.72 0-44.032-11.264-57.344-30.4-22.272-32.384-48.448-27.136-58.56-23.36-29.824 10.752-39.04 43.776-38.08 67.392l0 160.384c0 27.136-22.016 49.152-49.152 49.152L177.216 896.064C150.08 896 128 873.984 128 846.848l0.32 0 0-145.024c24.384 22.272 56.384 35.008 89.984 35.008 73.6 0 133.504-59.904 133.504-133.504 0-73.472-59.904-133.376-133.504-133.376-32.896 0-64.32 12.288-89.984 35.52l0-104.96L128 400.512c0-27.072 22.08-49.152 49.216-49.152L177.216 351.04 334.656 350.72c3.776 0.512 7.616 0.832 11.52 0.832 24.896 0 50.752-10.816 60.032-37.056 4.544-12.736 7.424-37.568-25.344-60.736C362.624 240.768 351.68 219.52 351.68 197.12c0-38.272 31.104-69.44 69.376-69.44 38.336 0 69.504 31.168 69.504 69.44 0 22.72-11.264 44.032-30.528 57.472C427.968 276.736 433.088 302.784 436.8 313.024c10.752 29.888 43.072 39.232 67.392 38.08l119.232 0 0 0.384c27.136 0 49.152 22.08 49.152 49.152l0.256 116.48c-3.776 27.84 6.016 60.736 36.224 71.488 12.736 4.608 37.632 7.488 60.8-25.28 13.056-18.368 34.24-29.248 56.704-29.248C864.832 534.016 896 565.12 896 603.392 896 641.728 864.832 672.896 826.56 672.896z" p-id="3146"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/date-range.svg b/src/assets/icons/date-range.svg
deleted file mode 100644
index fda571e7..00000000
--- a/src/assets/icons/date-range.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1579774833889" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1376" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M887.466667 192.853333h-100.693334V119.466667c0-10.24-6.826667-17.066667-17.066666-17.066667s-17.066667 6.826667-17.066667 17.066667v73.386666H303.786667V119.466667c0-10.24-6.826667-17.066667-17.066667-17.066667s-17.066667 6.826667-17.066667 17.066667v73.386666H168.96c-46.08 0-85.333333 37.546667-85.333333 85.333334V836.266667c0 46.08 37.546667 85.333333 85.333333 85.333333H887.466667c46.08 0 85.333333-37.546667 85.333333-85.333333V278.186667c0-47.786667-37.546667-85.333333-85.333333-85.333334z m-718.506667 34.133334h100.693333v66.56c0 10.24 6.826667 17.066667 17.066667 17.066666s17.066667-6.826667 17.066667-17.066666v-66.56h450.56v66.56c0 10.24 6.826667 17.066667 17.066666 17.066666s17.066667-6.826667 17.066667-17.066666v-66.56H887.466667c27.306667 0 51.2 22.186667 51.2 51.2v88.746666H117.76v-88.746666c0-29.013333 22.186667-51.2 51.2-51.2zM887.466667 887.466667H168.96c-27.306667 0-51.2-22.186667-51.2-51.2V401.066667H938.666667V836.266667c0 27.306667-22.186667 51.2-51.2 51.2z" p-id="1377"></path><path d="M858.453333 493.226667H327.68c-10.24 0-17.066667 6.826667-17.066667 17.066666v114.346667h-116.053333c-10.24 0-17.066667 6.826667-17.066667 17.066667v133.12c0 10.24 6.826667 17.066667 17.066667 17.066666H460.8c10.24 0 17.066667-6.826667 17.066667-17.066666v-114.346667h380.586666c10.24 0 17.066667-6.826667 17.066667-17.066667v-133.12c0-10.24-6.826667-17.066667-17.066667-17.066666z m-413.013333 34.133333v97.28h-98.986667v-97.28h98.986667z m-230.4 131.413333h98.986667v98.986667h-98.986667v-98.986667z m131.413333 97.28v-97.28h98.986667v97.28h-98.986667z m133.12-228.693333h97.28v98.986667h-97.28v-98.986667z m131.413334 0h98.986666v98.986667h-98.986666v-98.986667z m230.4 97.28h-98.986667v-98.986667h98.986667v98.986667z" p-id="1378"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/date.svg b/src/assets/icons/date.svg
deleted file mode 100644
index 52dc73ee..00000000
--- a/src/assets/icons/date.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577186573535" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1068" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M479.85714249 608.42857168h64.28571502c19.28571417 0 32.14285751-12.85714249 32.14285664-32.14285751s-12.85714249-32.14285751-32.14285664-32.14285664h-64.28571504c-19.28571417 0-32.14285751 12.85714249-32.14285664 32.14285662s12.85714249 32.14285751 32.14285664 32.14285753z m-2e-8 122.14285665h64.28571504c19.28571417 0 32.14285751-12.85714249 32.14285664-32.14285665s-12.85714249-32.14285751-32.14285664-32.14285751h-64.28571504c-19.28571417 0-32.14285751 12.85714249-32.14285664 32.14285751s12.85714249 32.14285751 32.14285664 32.14285664z m353.57142921-559.28571416h-128.57142921v-32.14285664c0-19.28571417-12.85714249-32.14285751-32.14285664-32.14285753s-32.14285751 12.85714249-32.14285751 32.14285753v32.14285664h-257.14285665v-32.14285664c0-19.28571417-12.85714249-32.14285751-32.14285752-32.14285753s-32.14285751 12.85714249-32.14285664 32.14285753v32.14285664h-128.57142919c-70.71428585 0-128.57142832 57.85714249-128.57142832 122.14285751v501.42857081c0 70.71428585 57.85714249 128.57142832 128.57142832 122.14285751h642.85714335c70.71428585 0 128.57142832-57.85714249 128.57142833-122.14285751v-501.42857081c0-70.71428585-57.85714249-122.14285753-128.57142833-122.14285751z m64.28571415 623.57142832c0 32.14285751-32.14285751 64.28571415-64.28571416 64.28571504h-642.85714335c-32.14285751 0-64.28571415-25.71428583-64.28571417-64.28571504v-372.85714249h771.42857168v372.85714249z m0-437.14285664h-771.42857168v-64.28571417c0-32.14285751 32.14285751-64.28571415 64.28571417-64.28571415h128.57142919v32.14285664c0 19.28571417 12.85714249 32.14285751 32.14285664 32.14285751s32.14285751-12.85714249 32.14285753-32.14285751v-32.14285664h257.14285665v32.14285664c0 19.28571417 12.85714249 32.14285751 32.1428575 32.14285751s32.14285751-12.85714249 32.14285664-32.14285751v-32.14285664h128.57142921c32.14285751 0 64.28571415 25.71428583 64.28571415 64.28571415v64.28571417z m-610.71428583 372.85714247h64.28571415c19.28571417 0 32.14285751-12.85714249 32.14285753-32.14285664s-12.85714249-32.14285751-32.14285753-32.14285751h-64.28571415c-19.28571417 0-32.14285751 12.85714249-32.14285751 32.14285751s12.85714249 32.14285751 32.14285751 32.14285665z m385.71428583-122.14285664h64.28571417c19.28571417 0 32.14285751-12.85714249 32.14285751-32.14285751s-12.85714249-32.14285751-32.14285751-32.14285664h-64.28571415c-19.28571417 0-32.14285751 12.85714249-32.14285753 32.14285664s12.85714249 32.14285751 32.14285753 32.14285751z m-385.71428583 0h64.28571415c19.28571417 0 32.14285751-12.85714249 32.14285753-32.14285751s-12.85714249-32.14285751-32.14285753-32.14285664h-64.28571415c-19.28571417 0-32.14285751 12.85714249-32.14285751 32.14285664s12.85714249 32.14285751 32.14285751 32.14285751z m385.71428583 122.14285665h64.28571417c19.28571417 0 32.14285751-12.85714249 32.14285751-32.14285665s-12.85714249-32.14285751-32.14285751-32.14285751h-64.28571415c-19.28571417 0-32.14285751 12.85714249-32.14285753 32.14285751s12.85714249 32.14285751 32.14285753 32.14285665z" p-id="1069"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/dict.svg b/src/assets/icons/dict.svg
index 48493773..22a82781 100644
--- a/src/assets/icons/dict.svg
+++ b/src/assets/icons/dict.svg
@@ -1 +1,18 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566035680909" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3601" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1002.0848 744.672l-33.568 10.368c0.96 7.264 2.144 14.304 2.144 21.76 0 7.328-1.184 14.432-2.368 21.568l33.792 10.56c7.936 2.24 14.496 7.616 18.336 14.752 3.84 7.328 4.672 15.808 1.952 23.552-5.376 16-23.168 24.672-39.936 19.68l-34.176-10.624c-7.136 12.8-15.776 24.672-26.208 35.2l20.8 27.488a28.96 28.96 0 0 1 5.824 22.816 29.696 29.696 0 0 1-12.704 19.616 32.544 32.544 0 0 1-44.416-6.752l-20.8-27.552c-13.696 6.56-28.192 11.2-43.008 13.888v33.632c0 16.736-14.112 30.432-31.648 30.432-17.6 0-31.872-13.696-31.872-30.432v-33.632a167.616 167.616 0 0 1-42.88-13.888l-20.928 27.552c-10.72 13.76-30.08 16.64-44.288 6.752a29.632 29.632 0 0 1-12.704-19.616 29.28 29.28 0 0 1 5.696-22.816l20.896-27.808a166.72 166.72 0 0 1-27.008-34.688l-33.376 10.432c-16.8 5.184-34.56-3.552-39.936-19.616a29.824 29.824 0 0 1 20.224-38.24l33.472-10.432c-0.8-7.264-2.016-14.304-2.016-21.824 0-7.36 1.184-14.496 2.304-21.632l-33.792-10.368c-16.672-5.376-25.632-22.496-20.224-38.432 5.376-16 23.136-24.672 39.936-19.68l34.016 10.752c7.328-12.672 15.84-24.8 26.336-35.328l-20.8-27.552a29.44 29.44 0 0 1 6.944-42.432 32.704 32.704 0 0 1 44.384 6.752l20.832 27.616c13.696-6.432 28.224-11.2 43.104-13.952v-33.568c0-16.736 14.048-30.432 31.648-30.432 17.536 0 31.808 13.568 31.808 30.432v33.504c15.072 2.688 29.344 7.808 42.848 14.016l20.992-27.616a32.48 32.48 0 0 1 44.224-6.752 29.568 29.568 0 0 1 7.136 42.432l-21.024 27.808c10.432 10.432 19.872 21.888 27.04 34.752l33.376-10.432c16.768-5.12 34.56 3.68 39.936 19.68 5.536 15.936-3.712 33.056-20.32 38.304z m-206.016-74.432c-61.344 0-111.136 47.808-111.136 106.56 0 58.88 49.792 106.496 111.136 106.496 61.312 0 111.104-47.616 111.104-106.496 0-58.752-49.792-106.56-111.104-106.56z" p-id="3602"></path><path d="M802.7888 57.152h-76.448c0-22.08-21.024-38.24-42.848-38.24H39.3968a39.68 39.68 0 0 0-39.36 40.032v795.616s41.888 120.192 110.752 120.192H673.2848a227.488 227.488 0 0 1-107.04-97.44H117.6368s-40.608-13.696-40.608-41.248l470.304-0.256 1.664 3.36a227.68 227.68 0 0 1-12.64-73.632c0-60.576 24-118.624 66.88-161.44a228.352 228.352 0 0 1 123.552-63.392l-3.2 0.288 2.144-424.672h38.208l0.576 421.024c27.04 0 52.672 4.8 76.64 13.344V101.536c0.032 0-6.304-44.384-38.368-44.384zM149.7648 514.336H72.3888v-77.408H149.7648v77.408z m0-144.32H72.3888v-77.44H149.7648v77.44z m0-137.248H72.3888v-77.44H149.7648v77.44z m501.856 281.568H206.0848v-77.408h445.536v77.408z m0-144.32H206.0848v-77.44h445.536v77.44z m0-137.248H206.0848v-77.44h445.536v77.44z" p-id="3603"></path></svg>
\ No newline at end of file
+<svg t="1655030231175" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3473"
+  width="200" height="200">
+  <path
+    d="M449.6 116.2H303.8c-14.2 0-25.7-11.5-25.7-25.7s11.5-25.7 25.7-25.7h145.8c14.2 0 25.7 11.5 25.7 25.7s-11.5 25.7-25.7 25.7z m0 0"
+    p-id="3474"></path>
+  <path
+    d="M160.1 859.3c-14.2 0-25.7-11.5-25.7-25.7V167.4c0-56.6 46-102.6 102.6-102.6h66.8c14.2 0 25.7 11.5 25.7 25.7s-11.5 25.7-25.7 25.7H237c-28.2 0-51.1 22.9-51.1 51.1v666.2c-0.1 14.3-11.6 25.8-25.8 25.8z m0 0M533.6 346.7c-6.3 0-12.4-1.3-17.6-3.5-13.5-5.8-21.9-17.9-21.9-31.6v-221c0-14.2 11.5-25.7 25.7-25.7s25.7 11.5 25.7 25.7v189l27.7-26.6c14.1-13.5 36.1-13.5 50.1 0l22.1 21.3V90.5c0-14.2 11.5-25.7 25.7-25.7s25.7 11.5 25.7 25.7v219.6c0 14.5-8.6 27.5-22 33.2-13.3 5.7-28.7 2.9-39.2-7.2l-37.5-36-37.5 36c-7.6 7.6-17.5 10.6-27 10.6z m0 0"
+    p-id="3475"></path>
+  <path
+    d="M846.1 958.9H236.9c-56.6 0-102.6-46-102.6-102.6v-22.8c0-14.2 11.5-25.7 25.7-25.7s25.7 11.5 25.7 25.7v22.8c0 28.2 22.9 51.1 51.1 51.1H846c14.2 0 25.7 11.5 25.7 25.7 0.1 14.3-11.4 25.8-25.6 25.8z m0 0"
+    p-id="3476"></path>
+  <path
+    d="M160.1 876h-0.9c-14.2-0.5-25.3-12.4-24.8-26.6 1-28.2 6.3-48.5 16.7-63.6 13.8-20.1 35.4-30.3 64.3-30.3h615c3.2-2.7 6.4-6.1 8.6-8.6V133.1c-1.8-5.1-11.7-15-16.8-16.8H449.6c-14.2 0-25.7-11.5-25.7-25.7s11.5-25.7 25.7-25.7h373.6c19.8 0 36.7 13.9 45 22.2 8.3 8.3 22.2 25.2 22.2 45v621.6c0 10.8-6.2 19.6-12.3 26.7-4.6 5.4-10.3 11-15.6 15.4-1 0.9-2.1 1.7-3.2 2.5-5.4 4.1-12.9 8.8-22.3 8.8H215.3c-15 0-28 0-29.5 44.2-0.5 13.8-11.9 24.7-25.7 24.7z m0 0"
+    p-id="3477"></path>
+  <path
+    d="M284.4 806.4c-14.2 0-25.7-11.5-25.7-25.7V90.5c0-14.2 11.5-25.7 25.7-25.7s25.7 11.5 25.7 25.7v690.1c0 14.3-11.5 25.8-25.7 25.8z m0 0M844.9 959h-1.6c-6.6-0.3-30-2.3-52.2-16.9-19.5-12.7-42.6-38-42.6-86.3 0-62.3 35.7-101 93.1-101 14.2 0 25.7 11.5 25.7 25.7s-11.5 25.7-25.7 25.7c-12.5 0-41.7 0-41.7 49.6 0 21 6.6 35.3 20.1 43.8 10.6 6.6 22.1 7.8 25 8 1.4-0.1 2.9 0 4.4 0.2 13.7 1.7 23.6 14 22.5 27.7-0.9 9.5-8.8 23.5-27 23.5z m-1.8-51.3c-1.1 0.1-2.3 0.3-3.4 0.6 1.1-0.3 2.2-0.5 3.4-0.6z m0 0"
+    p-id="3478"></path>
+</svg>
diff --git a/src/assets/icons/dict_item.svg b/src/assets/icons/dict_item.svg
new file mode 100644
index 00000000..903109a7
--- /dev/null
+++ b/src/assets/icons/dict_item.svg
@@ -0,0 +1,12 @@
+<svg t="1655022848495" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2190"
+  width="200" height="200">
+  <path d="M239.9 492.6m-42 0a42 42 0 1 0 84 0 42 42 0 1 0-84 0Z" p-id="2191"></path>
+  <path d="M826 513.5H378.5c-11.6 0-21-9.4-21-21s9.4-21 21-21H826c11.6 0 21 9.4 21 21s-9.4 21-21 21z" p-id="2192">
+  </path>
+  <path d="M239.9 632.4m-42 0a42 42 0 1 0 84 0 42 42 0 1 0-84 0Z" p-id="2193"></path>
+  <path d="M826 653.4H378.5c-11.6 0-21-9.4-21-21s9.4-21 21-21H826c11.6 0 21 9.4 21 21s-9.4 21-21 21z" p-id="2194">
+  </path>
+  <path
+    d="M882.6 234.9H531.2l-29-46.3c-6.9-11.7-35-54.7-77.8-54.7h-304c-30.9 0-55.9 25-55.9 55.9v623.3c0 42.4 34.5 76.9 76.9 76.9h741.2c42.4 0 76.9-34.5 76.9-76.9V311.8c0-42.4-34.5-76.9-76.9-76.9z m34.9 578.2c0 19.3-15.7 35-35 35H141.4c-19.3 0-35-15.7-35-35V311.8c0-19.3 15.7-35 35-35h741.2c19.3 0 35 15.7 35 35v501.3z"
+    p-id="2195"></path>
+</svg>
diff --git a/src/assets/icons/education.svg b/src/assets/icons/education.svg
deleted file mode 100644
index 7bfb01d1..00000000
--- a/src/assets/icons/education.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M88.883 119.565c-7.284 0-19.434 2.495-21.333 8.25v.127c-4.232.13-5.222 0-7.108 0-1.895-5.76-14.045-8.256-21.333-8.256H0V0h42.523c9.179 0 17.109 5.47 21.47 13.551C68.352 5.475 76.295 0 85.478 0H128v119.57l-39.113-.005h-.004zM60.442 24.763c0-9.651-8.978-16.507-17.777-16.507H7.108V111.43H39.11c7.054-.14 18.177.082 21.333 6.12v-4.628c-.134-5.722-.004-13.522 0-13.832V27.413l.004-2.655-.004.005zm60.442-16.517h-35.55c-8.802 0-17.78 6.856-17.78 16.493v74.259c.004.32.138 8.115 0 13.813v4.627c3.155-6.022 14.279-6.26 21.333-6.114h32V8.25l-.003-.005z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/email.svg b/src/assets/icons/email.svg
deleted file mode 100644
index 74d25e21..00000000
--- a/src/assets/icons/email.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="96" xmlns="http://www.w3.org/2000/svg"><path d="M64.125 56.975L120.188.912A12.476 12.476 0 0 0 115.5 0h-103c-1.588 0-3.113.3-4.513.838l56.138 56.137z"/><path d="M64.125 68.287l-62.3-62.3A12.42 12.42 0 0 0 0 12.5v71C0 90.4 5.6 96 12.5 96h103c6.9 0 12.5-5.6 12.5-12.5v-71a12.47 12.47 0 0 0-1.737-6.35L64.125 68.287z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/example.svg b/src/assets/icons/example.svg
deleted file mode 100644
index 46f42b53..00000000
--- a/src/assets/icons/example.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M96.258 57.462h31.421C124.794 27.323 100.426 2.956 70.287.07v31.422a32.856 32.856 0 0 1 25.971 25.97zm-38.796-25.97V.07C27.323 2.956 2.956 27.323.07 57.462h31.422a32.856 32.856 0 0 1 25.97-25.97zm12.825 64.766v31.421c30.46-2.885 54.507-27.253 57.713-57.712H96.579c-2.886 13.466-13.146 23.726-26.292 26.291zM31.492 70.287H.07c2.886 30.46 27.253 54.507 57.713 57.713V96.579c-13.466-2.886-23.726-13.146-26.291-26.292z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/excel.svg b/src/assets/icons/excel.svg
deleted file mode 100644
index 74d97b80..00000000
--- a/src/assets/icons/excel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.208 16.576v8.384h38.72v5.376h-38.72v8.704h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.512h38.72v5.376h-38.72v11.136H128v-94.72H78.208zM0 114.368L72.128 128V0L0 13.632v100.736z"/><path d="M28.672 82.56h-11.2l14.784-23.488-14.08-22.592h11.52l8.192 14.976 8.448-14.976h11.136l-14.08 22.208L58.368 82.56H46.656l-8.768-15.68z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/form.svg b/src/assets/icons/form.svg
deleted file mode 100644
index 9ab55a03..00000000
--- a/src/assets/icons/form.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg t="1612248825727" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2133" width="128" height="128"><path d="M219.274 937.929c-55.89 0-101.359-45.502-101.359-101.427V251.879c0-57.479 46.708-106.035 101.996-106.035h396.04v56.951H219.91c-23.74 0-45.359 23.392-45.359 49.084v584.623c0 24.686 20.064 44.77 44.722 44.77h584.26c25.918 0 49.515-21.604 49.515-45.332V439.9h56.958v396.04c0 54.329-49.755 101.989-106.473 101.989h-584.26z m17.556-90.656c-9.038 0-17.174-4.225-22.316-11.593-6.02-8.628-7.114-19.995-3-31.177l105.543-213.708c1.945-10.565 6.485-19.543 13.23-26.288l378.709-378.955c9.95-9.95 23.172-15.428 37.237-15.428 14.052 0 27.281 5.478 37.245 15.421l86.067 86.144c9.943 9.943 15.42 23.18 15.42 37.258s-5.477 27.308-15.427 37.244L490.823 725.166c-6.888 6.902-15.804 11.34-27.26 13.572L251.396 843.835c-4.91 2.274-9.82 3.438-14.566 3.438z m28.453-68.798c-1.41 2.87-1.267 6.06 0.328 8.642 1.541 2.493 4.24 3.985 7.21 3.985 1.487 0 3.02-0.363 4.555-1.081l126.928-76.892-61.958-62.047-77.063 127.393z m107.864-176.703l80.432 80.507 269.79-269.961-81.015-79.932-269.207 269.386z m373.079-364.883c-5.43 0-10.546 2.123-14.394 5.985l-47.646 47.631 79.323 81.679 48.769-48.823c7.937-7.937 7.937-20.872-0.007-28.836l-51.617-51.651c-3.869-3.862-8.991-5.985-14.428-5.985zM534.497 790.903v-56.952h252.986v56.952H534.497z m122.518-98.017v-56.952h130.468v56.952H657.015zM240.44 447.844v-56.959h130.467v56.959H240.44z m0-98.024v-56.952h252.985v56.952H240.44z" p-id="2134" fill="#666666"></path></svg>
diff --git a/src/assets/icons/icon.svg b/src/assets/icons/icon.svg
deleted file mode 100644
index 82be8eee..00000000
--- a/src/assets/icons/icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M115.147.062a13 13 0 0 1 4.94.945c1.55.63 2.907 1.526 4.069 2.688a13.148 13.148 0 0 1 2.761 4.069c.678 1.55 1.017 3.245 1.017 5.086v102.3c0 3.681-1.187 6.733-3.56 9.155-2.373 2.422-5.352 3.633-8.937 3.633H12.992c-3.875 0-7-1.26-9.373-3.779-2.373-2.518-3.56-5.667-3.56-9.445V12.704c0-3.39 1.163-6.345 3.488-8.863C5.872 1.32 8.972.062 12.847.062h102.3zM81.434 109.047c1.744 0 3.003-.412 3.778-1.235.775-.824 1.163-1.914 1.163-3.27 0-1.26-.388-2.325-1.163-3.197-.775-.872-2.034-1.307-3.778-1.307H72.57c.097-.194.145-.485.145-.872V27.09h9.01c1.743 0 2.954-.436 3.633-1.308.678-.872 1.017-1.938 1.017-3.197 0-1.26-.34-2.325-1.017-3.197-.679-.872-1.89-1.308-3.633-1.308H46.268c-1.743 0-2.954.436-3.632 1.308-.678.872-1.018 1.938-1.018 3.197 0 1.26.34 2.325 1.018 3.197.678.872 1.889 1.308 3.632 1.308h8.138v72.075c0 .193.024.339.073.436.048.096.072.242.072.436H46.56c-1.744 0-3.003.435-3.778 1.307-.775.872-1.163 1.938-1.163 3.197 0 1.356.388 2.446 1.163 3.27.775.823 2.034 1.235 3.778 1.235h34.875z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/input.svg b/src/assets/icons/input.svg
deleted file mode 100644
index ab91381e..00000000
--- a/src/assets/icons/input.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575802859706" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3102" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M896 224H128c-35.2 0-64 28.8-64 64v448c0 35.2 28.8 64 64 64h768c35.2 0 64-28.8 64-64V288c0-35.2-28.8-64-64-64z m0 480c0 19.2-12.8 32-32 32H160c-19.2 0-32-12.8-32-32V320c0-19.2 12.8-32 32-32h704c19.2 0 32 12.8 32 32v384z" p-id="3103"></path><path d="M224 352c-19.2 0-32 12.8-32 32v256c0 16 12.8 32 32 32s32-12.8 32-32V384c0-16-12.8-32-32-32z" p-id="3104"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/international.svg b/src/assets/icons/international.svg
deleted file mode 100644
index e9b56eee..00000000
--- a/src/assets/icons/international.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M83.287 103.01c-1.57-3.84-6.778-10.414-15.447-19.548-2.327-2.444-2.182-4.306-1.338-9.862v-.64c.553-3.81 1.513-6.05 14.313-8.087 6.516-1.018 8.203 1.57 10.589 5.178l.785 1.193a12.625 12.625 0 0 0 6.43 5.207c1.134.524 2.53 1.164 4.421 2.24 4.596 2.53 4.596 5.41 4.596 11.753v.727a26.91 26.91 0 0 1-5.178 17.454 59.055 59.055 0 0 1-19.025 11.026c3.49-6.546.814-14.313 0-16.553l-.146-.087zM64 5.12a58.502 58.502 0 0 1 25.484 5.818 54.313 54.313 0 0 0-12.859 10.327c-.93 1.28-1.716 2.473-2.472 3.579-2.444 3.694-3.637 5.352-5.818 5.614a25.105 25.105 0 0 1-4.219 0c-4.276-.29-10.094-.64-11.956 4.422-1.193 3.23-1.396 11.956 2.444 16.495.66 1.077.778 2.4.32 3.578a7.01 7.01 0 0 1-2.066 3.229 18.938 18.938 0 0 1-2.909-2.91 18.91 18.91 0 0 0-8.32-6.603c-1.25-.349-2.647-.64-3.985-.93-3.782-.786-8.03-1.688-9.019-3.812a14.895 14.895 0 0 1-.727-5.818 21.935 21.935 0 0 0-1.396-9.25 8.873 8.873 0 0 0-5.557-4.946A58.705 58.705 0 0 1 64 5.12zM0 64c0 35.346 28.654 64 64 64 35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64C28.654 0 0 28.654 0 64z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/ip.svg b/src/assets/icons/ip.svg
deleted file mode 100644
index e59f29b3..00000000
--- a/src/assets/icons/ip.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg t="1615363536977" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16426" width="256" height="256"><path d="M938.688 341.312v519.808c0 42.816-34.752 77.568-77.568 77.568H162.88c-42.816 0-77.568-34.752-77.568-77.568V341.312h853.376zM402.112 483.584H389.12a32.32 32.32 0 0 0-31.808 26.496l-0.512 5.76v215.424c0 15.808 11.392 29.056 26.496 31.744l5.76 0.576h12.992a32.32 32.32 0 0 0 31.808-26.56l0.512-5.76V515.84a32.32 32.32 0 0 0-32.32-32.32z m232.704 0H563.84a50.88 50.88 0 0 0-10.88 1.152 32.384 32.384 0 0 0-40.32 25.344L512 515.84v215.424a32.32 32.32 0 0 0 64.128 5.76l0.512-5.76v-74.368h58.24c46.336 0 83.968-38.784 83.968-86.656 0-47.872-37.632-86.656-84.032-86.656z m0 66.624l3.904 0.448a19.84 19.84 0 0 1 15.488 19.584 19.84 19.84 0 0 1-14.912 19.456l-4.48 0.512H576.64v-40h58.24z m226.304-464.896c42.816 0 77.568 34.752 77.568 77.568v121.6H85.312v-121.6c0-42.816 34.752-77.568 77.568-77.568h698.24z" p-id="16427"></path></svg>
diff --git a/src/assets/icons/job.svg b/src/assets/icons/job.svg
deleted file mode 100644
index 2a93a251..00000000
--- a/src/assets/icons/job.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566036191400" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5472" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M934.912 1016.832H192c-14.336 0-25.6-11.264-25.6-25.6v-189.44c0-14.336 11.264-25.6 25.6-25.6s25.6 11.264 25.6 25.6v163.84h691.712V64H217.6v148.48c0 14.336-11.264 25.6-25.6 25.6s-25.6-11.264-25.6-25.6v-174.08c0-14.336 11.264-25.6 25.6-25.6h742.912c14.336 0 25.6 11.264 25.6 25.6v952.832c0 14.336-11.264 25.6-25.6 25.6z" p-id="5473"></path><path d="M232.96 371.2h-117.76c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h117.76c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM232.96 540.16h-117.76c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h117.76c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM232.96 698.88h-117.76c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h117.76c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM574.464 762.88c-134.144 0-243.2-109.056-243.2-243.2S440.32 276.48 574.464 276.48s243.2 109.056 243.2 243.2-109.056 243.2-243.2 243.2z m0-435.2c-105.984 0-192 86.016-192 192S468.48 711.68 574.464 711.68s192-86.016 192-192S680.448 327.68 574.464 327.68z" p-id="5474"></path><path d="M663.04 545.28h-87.04c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h87.04c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6z" p-id="5475"></path><path d="M576 545.28c-14.336 0-25.6-11.264-25.6-25.6v-87.04c0-14.336 11.264-25.6 25.6-25.6s25.6 11.264 25.6 25.6v87.04c0 14.336-11.264 25.6-25.6 25.6z" p-id="5476"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/list.svg b/src/assets/icons/list.svg
deleted file mode 100644
index 20259edd..00000000
--- a/src/assets/icons/list.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M1.585 12.087c0 6.616 3.974 11.98 8.877 11.98 4.902 0 8.877-5.364 8.877-11.98 0-6.616-3.975-11.98-8.877-11.98-4.903 0-8.877 5.364-8.877 11.98zM125.86.107H35.613c-1.268 0-2.114 1.426-2.114 2.852v18.255c0 1.712 1.057 2.853 2.114 2.853h90.247c1.268 0 2.114-1.426 2.114-2.853V2.96c0-1.711-1.057-2.852-2.114-2.852zM.106 62.86c0 6.615 3.974 11.979 8.876 11.979 4.903 0 8.877-5.364 8.877-11.98 0-6.616-3.974-11.98-8.877-11.98-4.902 0-8.876 5.364-8.876 11.98zM124.17 50.88H33.921c-1.268 0-2.114 1.425-2.114 2.851v18.256c0 1.711 1.057 2.852 2.114 2.852h90.247c1.268 0 2.114-1.426 2.114-2.852V53.73c0-1.426-.846-2.852-2.114-2.852zM.106 115.913c0 6.616 3.974 11.98 8.876 11.98 4.903 0 8.877-5.364 8.877-11.98 0-6.616-3.974-11.98-8.877-11.98-4.902 0-8.876 5.364-8.876 11.98zm124.064-11.98H33.921c-1.268 0-2.114 1.426-2.114 2.853v18.255c0 1.711 1.057 2.852 2.114 2.852h90.247c1.268 0 2.114-1.426 2.114-2.852v-18.255c0-1.427-.846-2.853-2.114-2.853z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/lock.svg b/src/assets/icons/lock.svg
deleted file mode 100644
index 74fee543..00000000
--- a/src/assets/icons/lock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M119.88 49.674h-7.987V39.52C111.893 17.738 90.45.08 63.996.08 37.543.08 16.1 17.738 16.1 39.52v10.154H8.113c-4.408 0-7.987 2.94-7.987 6.577v65.13c0 3.637 3.57 6.577 7.987 6.577H119.88c4.407 0 7.987-2.94 7.987-6.577v-65.13c-.008-3.636-3.58-6.577-7.987-6.577zm-23.953 0H32.065V39.52c0-14.524 14.301-26.295 31.931-26.295 17.63 0 31.932 11.777 31.932 26.295v10.153z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/log.svg b/src/assets/icons/log.svg
deleted file mode 100644
index d879d33b..00000000
--- a/src/assets/icons/log.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566035943711" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4805" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M208.736 566.336H64.384v59.328h144.352v-59.328z m0-336.096H165.44V74.592c0-7.968 4.896-14.848 10.464-14.848h502.016V0.448H175.936c-38.72 1.248-69.248 34.368-68.192 74.144v155.648H64.384V289.6h144.352V230.24z m0 168.096H64.384v59.328h144.352v-59.328z m714.656 76.576h-57.76v474.496c0 7.936-4.896 14.848-10.464 14.848H175.936c-5.568 0-10.464-6.912-10.464-14.848v-155.68h43.296v-59.296H64.384v59.296h43.328v155.68c-1.024 39.776 29.472 72.896 68.192 74.144h679.232c38.72-1.184 69.248-34.368 68.256-74.144V474.912z m14.944-290.336l-83.072-85.312a71.264 71.264 0 0 0-52.544-21.728 71.52 71.52 0 0 0-51.616 23.872L386.528 507.264a30.496 30.496 0 0 0-6.176 10.72L308.16 740.512a30.016 30.016 0 0 0 6.976 30.24c7.712 7.968 19.2 10.752 29.568 7.2l216.544-74.112a28.736 28.736 0 0 0 12.128-7.936L940.448 287.456a75.552 75.552 0 0 0-2.112-102.88z m-557.12 518.272l39.104-120.64 78.336 80.416-117.44 40.224z m170.048-70.016l-103.552-106.016 200.16-222.4 103.52 106.304-200.128 222.112zM897.952 247.072l-0.256 0.224-107.136 119.168-103.52-106.528 106.432-118.624a14.144 14.144 0 0 1 10.304-4.736 13.44 13.44 0 0 1 10.464 4.288l83.264 85.696c5.472 5.6 5.664 14.72 0.448 20.512z" p-id="4806"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/logininfor.svg b/src/assets/icons/logininfor.svg
deleted file mode 100644
index 267f8447..00000000
--- a/src/assets/icons/logininfor.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566036016814" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5261" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M896 128h-85.333333a42.666667 42.666667 0 0 0 0 85.333333h42.666666v640H170.666667V213.333333h42.666666a42.666667 42.666667 0 0 0 0-85.333333H128a42.666667 42.666667 0 0 0-42.666667 42.666667v725.333333a42.666667 42.666667 0 0 0 42.666667 42.666667h768a42.666667 42.666667 0 0 0 42.666667-42.666667V170.666667a42.666667 42.666667 0 0 0-42.666667-42.666667z" p-id="5262"></path><path d="M341.333333 298.666667a42.666667 42.666667 0 0 0 42.666667-42.666667V128a42.666667 42.666667 0 0 0-85.333333 0v128a42.666667 42.666667 0 0 0 42.666666 42.666667zM512 298.666667a42.666667 42.666667 0 0 0 42.666667-42.666667V128a42.666667 42.666667 0 0 0-85.333334 0v128a42.666667 42.666667 0 0 0 42.666667 42.666667zM682.666667 298.666667a42.666667 42.666667 0 0 0 42.666666-42.666667V128a42.666667 42.666667 0 0 0-85.333333 0v128a42.666667 42.666667 0 0 0 42.666667 42.666667zM341.333333 768a42.666667 42.666667 0 0 0 42.666667-42.666667 128 128 0 0 1 256 0 42.666667 42.666667 0 0 0 85.333333 0 213.333333 213.333333 0 0 0-107.52-184.32A128 128 0 0 0 640 469.333333a128 128 0 0 0-256 0 128 128 0 0 0 22.186667 71.68A213.333333 213.333333 0 0 0 298.666667 725.333333a42.666667 42.666667 0 0 0 42.666666 42.666667z m128-298.666667a42.666667 42.666667 0 1 1 42.666667 42.666667 42.666667 42.666667 0 0 1-42.666667-42.666667z" p-id="5263"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/offline.svg b/src/assets/icons/offline.svg
deleted file mode 100644
index d09cb16c..00000000
--- a/src/assets/icons/offline.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg t="1615365233977" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="31529" width="256" height="256"><path d="M375.466667 614.4V341.333333c0-40.96 27.306667-68.266667 68.266666-68.266666h136.533334c40.96 0 68.266667 27.306667 68.266666 68.266666v273.066667h191.146667c6.826667 0 20.48 6.826667 27.306667 6.826667 13.653333 13.653333 13.653333 34.133333 0 47.786666l-327.68 327.68c-13.653333 13.653333-34.133333 13.653333-47.786667 0L163.84 675.84c-6.826667-6.826667-13.653333-20.48-13.653333-27.306667 0-20.48 13.653333-34.133333 34.133333-34.133333H375.466667z m34.133333-477.866667h204.8c20.48 0 34.133333 13.653333 34.133333 34.133334s-13.653333 34.133333-34.133333 34.133333h-204.8c-20.48 0-34.133333-13.653333-34.133333-34.133333s13.653333-34.133333 34.133333-34.133334z m0-136.533333h204.8c20.48 0 34.133333 13.653333 34.133333 34.133333s-13.653333 34.133333-34.133333 34.133334h-204.8C389.12 68.266667 375.466667 54.613333 375.466667 34.133333s13.653333-34.133333 34.133333-34.133333z" p-id="31530"></path></svg>
diff --git a/src/assets/icons/online.svg b/src/assets/icons/online.svg
deleted file mode 100644
index 330a2029..00000000
--- a/src/assets/icons/online.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1568899557259" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="535" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M356.246145 681.56286c-68.156286-41.949414-107.246583-103.84102-107.246583-169.805384 0-65.966411 39.090297-127.860063 107.246583-169.809477 12.046361-7.414877 15.800871-23.190165 8.385994-35.236526-7.413853-12.046361-23.191188-15.801894-35.236526-8.387018-39.640836 24.399713-72.539106 56.044434-95.137801 91.515297-23.86657 37.461193-36.481889 79.620385-36.481889 121.917724 0 42.297338 12.615319 84.454484 36.481889 121.914654 22.598694 35.469839 55.496965 67.11456 95.137801 91.51325 4.185322 2.576685 8.821923 3.804652 13.400195 3.804652 8.598842 0 16.998139-4.329609 21.836331-12.190647C372.047016 704.752002 368.291482 688.976714 356.246145 681.56286zM263.943926 754.580874c-92.603071-61.111846-145.713686-149.623739-145.713686-242.840794 0-93.195565 53.094242-181.682899 145.667637-242.774279 11.805884-7.79043 15.061021-23.677259 7.269567-35.483142-7.79043-11.805884-23.677259-15.062044-35.483142-7.269567C128.487861 296.954249 67.006602 401.024489 67.006602 511.74008c0 110.73708 61.496609 214.830857 168.721703 285.593504 4.343935 2.867304 9.240455 4.238534 14.08274 4.238534 8.317433 0 16.476253-4.046153 21.400403-11.507078C279.003923 778.258133 275.748786 762.372328 263.943926 754.580874zM788.660552 226.213092c-11.80486-7.791453-27.692712-4.536316-35.483142 7.269567-7.79043 11.805884-4.536316 27.692712 7.269567 35.483142 92.575442 61.092403 145.670707 149.579737 145.670707 242.774279 0 93.216032-53.111638 181.727924-145.715733 242.840794-11.805884 7.79043-15.059997 23.678282-7.269567 35.484166 4.925173 7.461949 13.081946 11.507078 21.400403 11.507078 4.841262 0 9.739828-1.37123 14.083763-4.238534 107.22714-70.761624 168.724773-174.857447 168.724773-285.593504C957.341323 401.025513 895.860063 296.955272 788.660552 226.213092zM790.090111 633.67213c23.865547-37.459147 36.480866-79.617315 36.480866-121.914654 0-42.298362-12.615319-84.45653-36.480866-121.917724-22.598694-35.470863-55.496965-67.115584-95.139847-91.515297-12.047384-7.413853-27.821649-3.659343-35.236526 8.387018-7.414877 12.045337-3.659343 27.821649 8.385994 35.236526 68.156286 41.949414 107.247606 103.842043 107.247606 169.809477 0 65.964364-39.090297 127.85597-107.247606 169.804361-12.045337 7.414877-15.800871 23.190165-8.385994 35.237549 4.838192 7.861038 13.236466 12.190647 21.835308 12.190647 4.579295 0 9.215896-1.227967 13.400195-3.804652C734.591099 700.786691 767.490394 669.142993 790.090111 633.67213zM567.129086 518.274914c24.12342-17.150612 39.887452-45.305859 39.887452-77.07133 0-52.128241-42.452881-94.538143-94.634334-94.538143-52.18043 0-94.633311 42.408879-94.633311 94.538143 0 31.695886 15.696494 59.797921 39.730886 76.958766-49.875944 21.128203-84.917018 70.234621-84.917018 127.301338 0 2.366907 0.061398 4.762467 0.182149 7.119141l1.249457 24.296359 276.373515 0 1.238201-24.308639c0.119727-2.358721 0.181125-4.750187 0.181125-7.106862C651.786185 588.497255 616.865861 539.465538 567.129086 518.274914zM512.381182 397.889079c23.937179 0 43.411719 19.430538 43.411719 43.314505 0 23.882943-19.47454 43.313481-43.411719 43.313481-23.936155 0-43.409672-19.430538-43.409672-43.313481C468.971509 417.320641 488.445026 397.889079 512.381182 397.889079zM426.08884 625.656573c9.119705-38.542828 44.254923-67.337641 86.085634-67.337641s76.966952 28.794813 86.085634 67.337641L426.08884 625.656573z" p-id="536"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/pdf.svg b/src/assets/icons/pdf.svg
deleted file mode 100644
index 957aa0cc..00000000
--- a/src/assets/icons/pdf.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="128" height="128"><path d="M869.073 277.307H657.111V65.344l211.962 211.963zm-238.232 26.27V65.344l-476.498-.054v416.957h714.73v-178.67H630.841zm-335.836 360.57c-5.07-3.064-10.944-5.133-17.61-6.201-6.67-1.064-13.603-1.6-20.81-1.6h-48.821v85.641h48.822c7.206 0 14.14-.532 20.81-1.6 6.665-1.065 12.54-3.133 17.609-6.202 5.064-3.063 9.134-7.406 12.208-13.007 3.065-5.602 4.6-12.937 4.6-22.011 0-9.07-1.535-16.408-4.6-22.01-3.074-5.603-7.144-9.94-12.208-13.01zM35.82 541.805v416.904h952.358V541.805H35.821zm331.421 191.179c-3.6 11.071-9.343 20.879-17.209 29.413-7.874 8.542-18.078 15.408-30.617 20.61-12.544 5.206-27.747 7.807-45.621 7.807h-66.036v102.45h-62.831V607.517h128.867c17.874 0 33.077 2.6 45.62 7.802 12.541 5.207 22.745 12.076 30.618 20.615 7.866 8.538 13.604 18.277 17.21 29.212 3.6 10.943 5.401 22.278 5.401 34.018 0 11.477-1.8 22.752-5.402 33.819zM644.9 806.417c-5.343 17.61-13.408 32.818-24.212 45.627-10.807 12.803-24.283 22.879-40.423 30.213-16.146 7.343-35.155 11.007-57.03 11.007h-123.26V607.518h123.26c18.41 0 35.552 2.941 51.428 8.808 15.873 5.869 29.618 14.671 41.22 26.412 11.608 11.744 20.674 26.411 27.217 44.02 6.535 17.61 9.803 38.288 9.803 62.035 0 20.81-2.67 40.02-8.003 57.624zm245.362-146.07h-138.07v66.03h119.66v48.829h-119.66v118.058h-62.83V607.518h200.9v52.829h-.001zm-318.2 25.611c-6.402-8.266-14.877-14.604-25.412-19.01-10.544-4.402-23.551-6.602-39.019-6.602h-44.825v180.088h56.029c9.07 0 17.872-1.463 26.415-4.401 8.535-2.932 16.14-7.802 22.812-14.609 6.665-6.8 12.007-15.667 16.007-26.61 4.003-10.94 6.003-24.275 6.003-40.021 0-14.408-1.4-27.416-4.202-39.019-2.8-11.607-7.406-21.542-13.808-29.816zm0 0"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/people.svg b/src/assets/icons/people.svg
deleted file mode 100644
index 2bd54aeb..00000000
--- a/src/assets/icons/people.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M104.185 95.254c8.161 7.574 13.145 17.441 13.145 28.28 0 1.508-.098 2.998-.285 4.466h-10.784c.238-1.465.403-2.948.403-4.465 0-8.983-4.36-17.115-11.419-23.216C86 104.66 75.355 107.162 64 107.162c-11.344 0-21.98-2.495-31.22-6.83-7.064 6.099-11.444 14.218-11.444 23.203 0 1.517.165 3 .403 4.465H10.955a35.444 35.444 0 0 1-.285-4.465c0-10.838 4.974-20.713 13.127-28.291C9.294 85.42.003 70.417.003 53.58.003 23.99 28.656.001 64 .001s63.997 23.988 63.997 53.58c0 16.842-9.299 31.85-23.812 41.673zM64 36.867c-29.454 0-53.33-10.077-53.33 15.342 0 25.418 23.876 46.023 53.33 46.023 29.454 0 53.33-20.605 53.33-46.023 0-25.419-23.876-15.342-53.33-15.342zm24.888 25.644c-3.927 0-7.111-2.665-7.111-5.953 0-3.288 3.184-5.954 7.11-5.954 3.928 0 7.111 2.666 7.111 5.954s-3.183 5.953-7.11 5.953zm-3.556 16.372c0 4.11-9.55 7.442-21.332 7.442-11.781 0-21.332-3.332-21.332-7.442 0-1.06.656-2.064 1.8-2.976 3.295 2.626 10.79 4.465 19.532 4.465 8.743 0 16.237-1.84 19.531-4.465 1.145.912 1.801 1.916 1.801 2.976zm-46.22-16.372c-3.927 0-7.11-2.665-7.11-5.953 0-3.288 3.183-5.954 7.11-5.954 3.927 0 7.111 2.666 7.111 5.954s-3.184 5.953-7.11 5.953z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/perm.svg b/src/assets/icons/perm.svg
index 8ed624b9..b38d0657 100644
--- a/src/assets/icons/perm.svg
+++ b/src/assets/icons/perm.svg
@@ -1 +1 @@
-<svg t="1639233044571" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2374" width="200" height="200"><path d="M101.888 985.088l-20.48-130.56 270.336-371.712a278.2208 278.2208 0 0 1 16.896-304.128 279.3472 279.3472 0 0 1 183.808-112.64c74.24-11.776 148.48 6.144 209.408 50.176s100.864 109.568 112.64 183.808c11.776 74.24-6.144 148.48-50.176 209.408a279.3472 279.3472 0 0 1-183.808 112.64c-43.52 6.656-88.064 3.584-130.048-9.728l-15.36 20.992 1.024 94.208-98.816 39.936-151.552 208.896-143.872 8.704z m33.28-117.248l10.24 63.488 73.728-4.608 146.432-201.216 79.872-32.256-1.024-76.288 48.128-66.56 18.432 7.68c38.4 15.36 80.384 19.968 121.856 13.824 60.928-9.728 114.176-42.496 150.528-92.16 36.352-49.664 50.688-110.592 40.96-171.52-9.728-60.928-42.496-114.176-92.16-150.528s-110.592-50.688-171.52-40.96c-60.928 9.216-114.688 41.984-150.528 92.16-36.352 49.664-51.2 110.592-41.472 171.008 5.12 32.256 16.896 62.976 34.816 90.112l9.728 14.848-278.016 382.976z" p-id="2375"></path><path d="M685.568 372.736c-5.12 0-10.752-1.536-14.848-5.12l-136.704-99.328a25.8048 25.8048 0 0 1-9.728-28.16c12.288-42.496 48.64-74.24 92.672-81.408 30.72-4.608 60.928 2.56 85.504 20.48 25.088 17.92 41.472 45.056 46.08 75.264 6.656 43.52-12.288 88.064-48.64 113.152a21.504 21.504 0 0 1-14.336 5.12z m-104.96-133.632l103.424 75.264a64.0512 64.0512 0 0 0-11.264-93.184c-13.824-10.24-30.72-13.824-47.616-11.264-18.432 3.072-34.816 13.824-44.544 29.184z" p-id="2376"></path><path d="M851.968 972.8h-226.816c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h226.816c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6z" p-id="2377"></path><path d="M763.392 870.4h-134.144c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h134.144c14.336 0 25.6 11.264 25.6 25.6s-11.776 25.6-25.6 25.6z" p-id="2378"></path></svg>
\ No newline at end of file
+<svg t="1653975130734" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2343" width="200" height="200"><path d="M768 416.914c43.886-43.885 43.886-109.714 0-153.6C724.114 219.43 650.971 219.43 607.086 256s-43.886 109.714 0 153.6S724.114 460.8 768 416.914z m-109.714-51.2c-14.629-14.628-14.629-36.571 0-51.2 14.628-14.628 36.571-14.628 51.2 0 14.628 14.629 14.628 36.572 0 51.2s-36.572 14.629-51.2 0z m-512 563.2c-14.629 14.629-36.572 14.629-51.2 0s-14.629-36.571 0-51.2l387.657-387.657-14.629-21.943C409.6 365.714 424.23 241.371 504.686 153.6c102.4-102.4 263.314-102.4 358.4 0s102.4 263.314 0 358.4c-80.457 87.771-204.8 102.4-307.2 43.886l-21.943-14.629-160.914 160.914 80.457 80.458c14.628 14.628 36.571 14.628 51.2 0 14.628-14.629 14.628-36.572 0-51.2l-21.943-29.258 65.828-65.828c124.343 58.514 277.943 36.571 373.029-65.829 131.657-131.657 131.657-336.457 0-468.114s-336.457-124.343-468.114 0C358.4 204.8 329.143 351.086 387.657 475.429L36.571 826.514c-43.885 43.886-43.885 109.715 0 153.6 43.886 43.886 109.715 43.886 153.6 0l80.458-80.457-51.2-43.886-73.143 73.143z m307.2-51.2L321.829 746.057l-51.2 58.514L402.286 936.23c14.628 14.628 36.571 14.628 51.2 0 14.628-21.943 14.628-43.886 0-58.515z" p-id="2344"></path></svg>
diff --git a/src/assets/icons/phone.svg b/src/assets/icons/phone.svg
deleted file mode 100644
index ab8e8c4e..00000000
--- a/src/assets/icons/phone.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1567417214476" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2266" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M761.503029 2.90619 242.121921 2.90619c-32.405037 0-58.932204 26.060539-58.932204 58.527998l0 902.302287c0 32.156374 26.217105 58.216913 58.932204 58.216913l519.381108 0c32.344662 0 58.591443-26.060539 58.591443-58.216913L820.094472 61.123103C820.094472 28.966729 793.847691 2.90619 761.503029 2.90619M452.878996 61.123103l98.147344 0c6.780427 0 12.31549 5.536087 12.31549 12.253068 0 6.748704-5.535063 12.253068-12.31549 12.253068l-98.147344 0c-6.779404 0-12.345166-5.504364-12.345166-12.253068C440.532807 66.659189 446.099592 61.123103 452.878996 61.123103M501.641583 980.593398c-29.636994 0-53.987588-23.946388-53.987588-53.677527 0-29.356608 24.039509-53.614082 53.987588-53.614082 29.91738 0 53.987588 23.883967 53.987588 53.614082C555.629171 956.647009 531.559986 980.593398 501.641583 980.593398M766.35657 803.142893c0 16.23373-13.186324 29.107945-29.233811 29.107945l-470.618521 0c-16.35755 0-29.325909-13.186324-29.325909-29.107945L237.178329 163.500794c0-16.232706 13.279445-29.138644 29.325909-29.138644l470.246037 0c16.420995 0 29.357632 13.1853 29.357632 29.138644l0 639.642099L766.35657 803.142893zM766.35657 803.142893" p-id="2267"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/post.svg b/src/assets/icons/post.svg
deleted file mode 100644
index 2922c613..00000000
--- a/src/assets/icons/post.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566035724641" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3998" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M136.4 434.3h77.7c21.5 0 38.9-17.4 38.9-38.9s-17.4-38.9-38.9-38.9h-77.7c-21.5 0-38.9 17.4-38.9 38.9s17.4 38.9 38.9 38.9zM252.9 628.6c0-21.5-17.4-38.9-38.9-38.9h-77.7c-21.5 0-38.9 17.4-38.9 38.9s17.4 38.9 38.9 38.9H214c21.5-0.1 38.9-17.5 38.9-38.9z" p-id="3999"></path><path d="M874.7 97.5H227c-28.6 0-51.8 23.2-51.8 51.8v194.3h38.9c28.6 0 51.8 23.2 51.8 51.8 0 28.6-23.2 51.8-51.8 51.8h-38.9v129.5h38.9c28.6 0 51.8 23.2 51.8 51.8 0 28.6-23.2 51.8-51.8 51.8h-38.9v194.3c0 28.6 23.2 51.8 51.8 51.8h647.7c28.6 0 51.8-23.2 51.8-51.8V149.3c0-28.6-23.2-51.8-51.8-51.8z m-311.3 723c-15.6 0-146.7-71.6-146.7-91 0-19.4 102-368.6 102-368.6l-83.6-104s-12.3-23.1 24.6-23.1h208.9c36.9 0 18.4 23.1 18.4 23.1l-79 104s102 351.3 102 368.6c0.1 17.3-131 91-146.6 91z m169.2-253.6l-27.9 40.2-74.5-240 103.4 171.7c4.6 7.9 4.2 20.6-1 28.1z" p-id="4000"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/qq.svg b/src/assets/icons/qq.svg
deleted file mode 100644
index ee13d4ec..00000000
--- a/src/assets/icons/qq.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M18.448 57.545l-.244-.744-.198-.968-.132-.53v-2.181l.236-.859.24-.908.317-.953.428-1.06.561-1.103.794-1.104v-.773l.077-.724.123-.984.34-1.106.313-1.194.25-.548.289-.511.371-.569.405-.423v-2.73l.234-1.407.236-1.633.42-1.955.577-2.035.43-1.118.426-1.217.468-1.135.559-1.216.57-1.332.655-1.247.737-1.331.929-1.33.43-.762.457-.624.995-1.406 1.025-1.403 1.163-1.444 1.246-1.405 1.352-1.384 1.41-1.423 1.708-1.536 1.083-.934 1.322-1.008 1.34-.89 1.448-.855 1.392-.76 1.57-.63 1.667-.775 1.657-.532 1.653-.552 1.787-.548 1.785-.417 1.876-.347L59.128.68l1.879-.245 1.876-.252 2.002-.106h5.912l1.97.243 1.981.231 2.019.207 1.874.441 1.979.413 1.857.475 2.035.53 1.862.646 1.782.738 1.904.78 1.736.853 1.689.95 1.655 1.044 1.425.971.662.548.693.401 1.323 1.1 1.115 1.064 1.112 1.1 1.083 1.214.894 1.178 1.064 1.217.74 1.306.752 1.162.798 1.352.661 1.175 1.113 2.489.546 1.286.428 1.192.428 1.294.384 1.217.267 1.047.347 1.231.607 2.198.388 1.924.253 1.861.217 1.497.342 2.28.077.362.274.41.737 1.18.473.8.42.832.534.892.472 1.07.307 1.093.334 1.2.252 1.232.115.605.106.746v.648l-.106.643v.8l-.192.774-.35 1.5-.403.76-.299.852v.213l.142.264.4.623 1.746 2.53 1.377 1.9.66 1.267.889 1.389.774 1.52.893 1.627.894 1.828 1.006 2.069.567 1.268.518 1.239.447 1.307.44 1.175.336 1.235.342 1.16.432 2.261.343 2.31.235 2.05v2.891l-.158 1.025-.226 1.768-.308 1.59-.48 1.44-.18.588-.336.707-.28.493-.375.607-.33.383-.42.494-.375.4-.401.34-.48.207-.432.207-.355.114h-.543l-.346-.114-.66-.32-.302-.212-.317-.223-.347-.304-.35-.342-.579-.63-.684-.89-.539-.917-.538-.734-.526-.855-.741-1.517-.833-1.579-.098-.055h-.138l-.338.247-.196.415-.326.516-.567 1.533-.856 2.182-1.096 2.626-.824 1.308-.864 1.366-1.027 1.536-1.09 1.503-.557.68-.676.743-1.555 1.497.136.135.21.214.777.446 3.235 1.524 1.41.779 1.347.756 1.332.953 1.187.982.574.443.432.511.445.593.367.643.198.533.242.64.105.554.115.647-.115.433v.44l-.105.454-.242.415-.092.325-.22.394-.587.784-.543.627-.42.47-.35.348-.893.638-1.01.556-1.077.532-1.155.511-1.287.495-.693.207-.608.167-1.496.342-1.545.325-1.552.323-1.689.27-1.74.072-1.785.21h-5.539l-1.998-.114-1.86-.168-2.005-.27-1.99-.209-2.095-.286-2.03-.495-1.981-.374-1.968-.552-2.019-.707-1.98-.585-1.044-.342-.927-.323-.586-.223-.582-.12h-1.647l-1.904-.131-.962-.096-1.24-.135-.795.705-1.085.665-1.471.701-1.628.875-.99.475-1.033.376-2.281.914-1.24.305-1.3.343-1.803.344-1.13.086-1.193.1-1.246.135-1.45.053h-5.926l-3.346-.053-3.25-.321-1.644-.23-1.589-.23-1.546-.227-1.547-.305-1.442-.456-1.434-.325-1.294-.51-1.223-.474-1.142-.533-.99-.583-.984-.71-.336-.343-.44-.415-.334-.362-.3-.417-.278-.415-.215-.42-.311-.89-.109-.46-.138-.51v-.473l.138-.533v-.53l.109-.53v-1.069l.052-.564.259-.647.215-.646.39-.779.286-.3.236-.348.615-.738.49-.38.464-.266.428-.338.676-.21.543-.324.676-.341.77-.227.775-.231.897-.192.85-.11 1.008-.13 1.093-.081.284-.092h.063l.137-.115v-.13l-.2-.266-.58-.27-1.45-1.231-.975-.761-1.127-.967-1.136-1.082-1.181-1.382-1.36-1.558-.508-.843-.672-.87-.58-1.007-.522-1.1-.704-1.047-.459-1.194-.547-1.192-.546-1.33-.397-1.273-.378-1.575-.112-.057h-.115l-.059-.113h-.14l-.23.113-.114.057-.158.264-.057.321-.119.286-.206.477-.664 1.157-.345.701-.546.612-.58.736-.641.816-.677.724-.795.701-.734.658-.814.524-.89.546-.855.325-1.008.247-.99.095h-.233l-.228-.095-.18-.384-.29-.188-.38-.912-.237-.493-.255-.707-.21-.734-.113-.724-.313-1.648-.12-.972v-3.185l.12-2.379.196-1.214.23-1.252.21-1.347.374-1.254.42-1.443.431-1.407.578-1.448.545-1.38.754-1.4.699-1.52.855-1.425 1.006-1.538 1.023-1.382 1.069-1.538.891-1.071 1.142-1.227 1.202-1.237.56-.59.678-.662.985-.836 1.012-.853 1.647-1.446 1.242-.889z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/question.svg b/src/assets/icons/question.svg
deleted file mode 100644
index cf75bd4b..00000000
--- a/src/assets/icons/question.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1581238842264" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1409" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 0C229.233778 0 0 229.233778 0 512s229.233778 512 512 512 512-229.233778 512-512A512 512 0 0 0 512 0z m0 938.666667C276.366222 938.666667 85.333333 747.633778 85.333333 512 85.333333 276.366222 276.366222 85.333333 512 85.333333c235.633778 0 426.666667 191.032889 426.666667 426.666667a426.666667 426.666667 0 0 1-426.666667 426.666667z m0-717.653334a170.666667 170.666667 0 0 0-170.666667 170.666667 42.666667 42.666667 0 0 0 85.333334 0 85.333333 85.333333 0 1 1 85.333333 85.333333 42.666667 42.666667 0 0 0-42.666667 42.666667v111.36a42.666667 42.666667 0 0 0 85.333334 0v-74.24A170.666667 170.666667 0 0 0 512 221.013333z m-42.666667 542.293334a42.666667 42.666667 0 1 0 85.333334 0 42.666667 42.666667 0 0 0-85.333334 0z" p-id="1410"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/radio.svg b/src/assets/icons/radio.svg
deleted file mode 100644
index 0cde3452..00000000
--- a/src/assets/icons/radio.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575966775973" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="879" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M507.39346659 71.84873358c241.53533667 0 437.39770766 195.85422109 437.39770767 437.37442191 0 241.53766571-195.86237099 437.38955776-437.39770767 437.38955776-241.50040803 0-437.34997219-195.85189205-437.34997219-437.38955776C70.0434944 267.70295467 265.89189347 71.84873358 507.39346659 71.84873358L507.39346659 71.84873358zM507.39346659 282.81899805c-125.00686734 0-226.37039389 101.38914133-226.37039388 226.41813048 0 125.01268821 101.36352768 226.39717262 226.37039388 226.39717262 125.04295993 0 226.42395136-101.38448441 226.42395136-226.39717262C733.81625401 384.20813938 632.43642653 282.81899805 507.39346659 282.81899805L507.39346659 282.81899805zM507.39346659 120.78172615c-214.46664192 0-388.42047261 173.95150279-388.4204726 388.44026539 0 214.51204949 173.95499463 388.46122325 388.4204726 388.46122325 214.52369237 0 388.46005817-173.94800981 388.46005818-388.46122325C895.85236082 294.73322894 721.91715897 120.78172615 507.39346659 120.78172615z" p-id="880"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/route.svg b/src/assets/icons/route.svg
deleted file mode 100644
index b2071244..00000000
--- a/src/assets/icons/route.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg t="1612242856287" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5203" width="128" height="128"><path d="M422.4 395.392l-27.2-327.68L256.768 194.88 114.688 64 65.472 109.12 207.616 240 69.184 367.168 422.4 395.392zM960 66.752 604.096 91.776l138.112 127.488L600.064 350.08l49.216 45.312 142.016-130.88 138.112 127.552L960 66.752zM423.936 675.392 374.848 630.016l-142.144 130.88L94.592 633.344 64 958.656l355.84-25.024-138.112-127.488L423.936 675.392zM958.528 914.88l-142.016-130.88 138.368-127.104L601.472 628.608l27.328 327.744 138.432-127.232L909.248 960 958.528 914.88z" p-id="5204" fill="#666666"></path></svg>
diff --git a/src/assets/icons/row.svg b/src/assets/icons/row.svg
deleted file mode 100644
index 07809922..00000000
--- a/src/assets/icons/row.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1579339929870" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1182" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M152 854.856875h325.7146875V237.715625H134.856875v600q0 6.99375 5.0746875 12.0684375T152 854.856875z m737.143125-17.1421875v-600H546.284375v617.1421875H872q6.99375 0 12.0684375-5.07375t5.0746875-12.0684375z m68.5715625-651.429375V837.715625q0 35.3821875-25.16625 60.5484375T872 923.4284375H152q-35.383125 0-60.5484375-25.1653125T66.284375 837.7146875V186.284375q0-35.3821875 25.16625-60.5484375T152 100.5715625h720q35.383125 0 60.5484375 25.1653125t25.16625 60.5484375z" p-id="1183"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/search.svg b/src/assets/icons/search.svg
deleted file mode 100644
index 84233dda..00000000
--- a/src/assets/icons/search.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M124.884 109.812L94.256 79.166c-.357-.357-.757-.629-1.129-.914a50.366 50.366 0 0 0 8.186-27.59C101.327 22.689 78.656 0 50.67 0 22.685 0 0 22.688 0 50.663c0 27.989 22.685 50.663 50.656 50.663 10.186 0 19.643-3.03 27.6-8.201.286.385.557.771.9 1.114l30.628 30.632a10.633 10.633 0 0 0 7.543 3.129c2.728 0 5.457-1.043 7.543-3.115 4.171-4.157 4.171-10.915.014-15.073M50.671 85.338C31.557 85.338 16 69.78 16 50.663c0-19.102 15.557-34.661 34.67-34.661 19.115 0 34.657 15.559 34.657 34.675 0 19.102-15.557 34.661-34.656 34.661"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/select.svg b/src/assets/icons/select.svg
deleted file mode 100644
index d6283828..00000000
--- a/src/assets/icons/select.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575803481213" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="804" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M62 511.97954521C62 263.86590869 263.90681826 62 511.97954521 62s449.97954521 201.825 449.97954521 449.97954521c0 248.19545479-201.90681826 449.97954521-449.97954521 449.97954521C263.90681826 962 62 760.175 62 511.97954521M901.98636348 511.97954521c0-215.24318174-175.00909131-390.41590869-390.00681827-390.41590869-215.03863652 0-389.96590869 175.17272695-389.96590868 390.41590869 0 215.28409131 175.00909131 390.45681826 389.96590868 390.45681826C727.01818174 902.47727305 901.98636348 727.30454521 901.98636348 511.97954521M264.17272695 430.28409131c0-5.76818174 2.12727305-11.51590869 6.64772696-15.87272696 8.71363652-8.75454521 22.88863652-8.75454521 31.725 0l209.4340913 208.22727305L721.45454521 414.53409131c8.75454521-8.71363652 22.97045479-8.71363652 31.90909132 0 8.71363652 8.75454521 8.71363652 22.88863652 0 31.60227304L511.97954521 685.74090869 270.71818174 446.01363653C266.27954521 441.77954521 264.17272695 436.05227305 264.17272695 430.28409131" p-id="805"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/slider.svg b/src/assets/icons/slider.svg
deleted file mode 100644
index fbe4f39f..00000000
--- a/src/assets/icons/slider.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577185310368" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1238" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M951.453125 476.84375H523.671875a131.8359375 131.8359375 0 0 0-254.1796875 0H72.546875v70.3125h196.9453125a131.8359375 131.8359375 0 0 0 254.1796875 0H951.453125z" p-id="1239"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/star.svg b/src/assets/icons/star.svg
deleted file mode 100644
index 6cf86e66..00000000
--- a/src/assets/icons/star.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M70.66 4.328l14.01 29.693c1.088 2.29 3.177 3.882 5.603 4.25l31.347 4.76c6.087.926 8.528 8.756 4.117 13.247L103.05 79.395c-1.75 1.78-2.544 4.352-2.132 6.867l5.352 32.641c1.043 6.337-5.33 11.182-10.778 8.19l-28.039-15.409a7.13 7.13 0 0 0-6.91 0l-28.039 15.41c-5.448 2.99-11.821-1.854-10.777-8.19l5.352-32.642c.415-2.515-.387-5.088-2.136-6.867L2.264 56.278C-2.146 51.787.286 43.957 6.38 43.031l31.343-4.76c2.419-.368 4.51-1.96 5.595-4.25L57.334 4.328c2.728-5.77 10.605-5.77 13.325 0z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/swagger.svg b/src/assets/icons/swagger.svg
deleted file mode 100644
index 05d4e7bc..00000000
--- a/src/assets/icons/swagger.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1566036776944" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6463" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M64 223.995345h168.001164v47.997673c0 26.428509 18.878836 47.997673 41.984 47.997673h140.036654c23.095855 0 41.984-21.569164 41.984-47.997673v-47.997673h504.003491a32.004655 32.004655 0 0 0 0-64.009309H455.996509V111.988364c0-26.428509-18.878836-47.997673-41.984-47.997673H273.985164c-23.095855 0-41.984 21.569164-41.984 47.997673v47.997672H64a32.004655 32.004655 0 0 0 0 64.009309zM288.004655 128h111.997672V256H288.004655V128zM960 479.995345H791.998836v-47.997672c0-26.372655-18.878836-47.997673-41.984-47.997673H609.978182c-23.095855 0-41.984 21.634327-41.984 47.997673v47.997672H64a32.004655 32.004655 0 0 0 0 64.00931h504.003491v47.997672c0 26.363345 18.878836 47.997673 41.984 47.997673h140.036654c23.095855 0 41.984-21.634327 41.984-47.997673v-47.997672h168.001164a32.004655 32.004655 0 1 0-0.009309-64.00931zM735.995345 576H623.997673v-128h111.997672v128zM960 800.293236v-0.288581H455.996509v-47.997673c0-26.363345-18.878836-47.997673-41.984-47.997673H274.050327c-23.105164 0-41.984 21.634327-41.984 47.997673v47.997673H64v0.288581a32.004655 32.004655 0 0 0 0 64.009309c0.986764 0 1.917673-0.195491 2.885818-0.288581h165.115346v47.997672c0 26.363345 18.878836 47.997673 41.984 47.997673h140.036654c23.095855 0 41.984-21.634327 41.984-47.997673v-47.997672h501.108364c0.968145 0.093091 1.899055 0.288582 2.895127 0.288581a32.004655 32.004655 0 1 0-0.009309-64.009309zM400.002327 896H288.004655V768h111.997672v128z" fill="" p-id="6464"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/switch.svg b/src/assets/icons/switch.svg
deleted file mode 100644
index 0ba61e38..00000000
--- a/src/assets/icons/switch.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1576042673958" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1110" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M692 792H332c-150 0-270-120-270-270s120-270 270-270h360c150 0 270 120 270 270 0 147-120 270-270 270zM332 312c-117 0-210 93-210 210s93 210 210 210h360c117 0 210-93 210-210s-93-210-210-210H332z" p-id="1111"></path><path d="M341 522m-150 0a150 150 0 1 0 300 0 150 150 0 1 0-300 0Z" p-id="1112"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/tab.svg b/src/assets/icons/tab.svg
deleted file mode 100644
index b4b48e48..00000000
--- a/src/assets/icons/tab.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.921.052H49.08c-1.865 0-3.198 1.599-3.198 3.464v6.661c0 1.865 1.6 3.464 3.198 3.464h29.84c1.865 0 3.198-1.599 3.198-3.464V3.516C82.385 1.65 80.786.052 78.92.052zm45.563 0H94.642c-1.865 0-3.464 1.599-3.464 3.464v6.661c0 1.865 1.599 3.464 3.464 3.464h29.842c1.865-.266 3.464-1.599 3.464-3.464V3.516c0-1.865-1.599-3.464-3.464-3.464zm0 22.382H40.02c-1.866 0-3.464-1.599-3.464-3.464V3.516c0-1.865-1.599-3.464-3.464-3.464H3.516C1.65.052.052 1.651.052 3.516V124.75c0 1.598 1.599 3.197 3.464 3.197h120.968c1.865 0 3.464-1.599 3.464-3.464V25.898c0-1.865-1.599-3.464-3.464-3.464z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/table.svg b/src/assets/icons/table.svg
deleted file mode 100644
index 0e3dc9de..00000000
--- a/src/assets/icons/table.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/textarea.svg b/src/assets/icons/textarea.svg
deleted file mode 100644
index 2709f292..00000000
--- a/src/assets/icons/textarea.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1575802855098" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2984" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M896 160H128c-35.2 0-64 28.8-64 64v576c0 35.2 28.8 64 64 64h768c35.2 0 64-28.8 64-64V224c0-35.2-28.8-64-64-64z m0 608c0 16-12.8 32-32 32H160c-19.2 0-32-12.8-32-32V256c0-16 12.8-32 32-32h704c19.2 0 32 12.8 32 32v512z" p-id="2985"></path><path d="M224 288c-19.2 0-32 12.8-32 32v256c0 16 12.8 32 32 32s32-12.8 32-32V320c0-16-12.8-32-32-32z m608 480c19.2 0 32-12.8 32-32V608L704 768h128z" p-id="2986"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/time-range.svg b/src/assets/icons/time-range.svg
deleted file mode 100644
index 13c1202b..00000000
--- a/src/assets/icons/time-range.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1579774825624" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1248" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M498.595712 482.290351 345.420077 482.290351l0 57.307194 210.477712 0L555.897789 274.196942l-57.301054 0L498.596735 482.290351zM498.595712 482.290351" p-id="1249"></path><path d="M577.685002 644.98478l379.879913 0 0 57.302077L577.685002 702.286858 577.685002 644.98478 577.685002 644.98478zM577.685002 644.98478" p-id="1250"></path><path d="M577.685002 773.764795l379.879913 0 0 57.307194L577.685002 831.071989 577.685002 773.764795 577.685002 773.764795zM577.685002 773.764795" p-id="1251"></path><path d="M577.685002 902.549927l379.879913 0 0 57.307194L577.685002 959.857121 577.685002 902.549927 577.685002 902.549927zM577.685002 902.549927" p-id="1252"></path><path d="M102.523001 382.290823c4.450359 2.615571 9.470699 3.954055 14.530948 3.954055 2.969635 0 5.952572-0.461511 8.836249-1.394766l190.809767-61.886489c15.052834-4.882194 23.297612-21.040199 18.415418-36.08894-4.882194-15.052834-21.040199-23.297612-36.093033-18.415418L175.676092 308.458257c15.994276-26.115797 35.170011-50.537 57.370639-72.743768 73.767074-73.767074 171.845857-114.388237 276.16783-114.388237 104.32095 0 202.39564 40.622186 276.16169 114.388237s114.393353 171.845857 114.393353 276.16783c0 26.427906-2.615571 52.449559-7.709589 77.780481l58.302871 0c4.464685-25.499767 6.708795-51.470255 6.708795-77.780481 0-60.449767-11.845793-119.102608-35.204803-174.336584-22.559808-53.334719-54.850236-101.226472-95.968725-142.349055-41.122583-41.122583-89.017406-73.408917-142.348032-95.968725C628.317169 75.866898 569.659211 64.021106 509.215584 64.021106c-60.448744 0-119.106702 11.845793-174.336584 35.207873-53.334719 22.559808-101.230566 54.846142-142.349055 95.968725-23.980157 23.980157-44.934398 50.278103-62.727647 78.601172l-20.738323-105.655342c-3.043313-15.527648-18.105357-25.642007-33.631982-22.599717-15.527648 3.048429-25.64303 18.105357-22.599717 33.637098l36.102243 183.932126C90.51348 371.153158 95.460142 378.13313 102.523001 382.290823L102.523001 382.290823zM102.523001 382.290823" p-id="1253"></path><path d="M126.020158 587.9416 67.768453 587.9416c5.759167 33.679054 15.368012 66.544579 28.789697 98.278327 22.559808 53.333696 54.850236 101.225449 95.971795 142.348032 41.122583 41.122583 89.014336 73.408917 142.349055 95.968725 54.112432 22.88829 111.517863 34.71157 170.668031 35.18229L505.547031 902.395408c-102.94972-0.941442-199.594851-41.445948-272.499277-114.349351C177.545672 732.543975 140.810003 663.275355 126.020158 587.9416L126.020158 587.9416zM126.020158 587.9416" p-id="1254"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/time.svg b/src/assets/icons/time.svg
deleted file mode 100644
index b376e32a..00000000
--- a/src/assets/icons/time.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1577099827399" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1008" xmlns:xlink="http://www.w3.org/1999/xlink" width="81" height="81"><defs><style type="text/css"></style></defs><path d="M520 559h204c17.673 0 32 14.327 32 32 0 17.673-14.327 32-32 32H488c-17.673 0-32-14.327-32-32 0-0.167 0.001-0.334 0.004-0.5a32.65 32.65 0 0 1-0.004-0.5V277c0-17.673 14.327-32 32-32 17.673 0 32 14.327 32 32v282z m-8 401C264.576 960 64 759.424 64 512S264.576 64 512 64s448 200.576 448 448-200.576 448-448 448z m0-64c212.077 0 384-171.923 384-384S724.077 128 512 128 128 299.923 128 512s171.923 384 384 384z" p-id="1009"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/tool.svg b/src/assets/icons/tool.svg
deleted file mode 100644
index c813067e..00000000
--- a/src/assets/icons/tool.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1553828490559" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1684" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M898.831744 900.517641 103.816972 900.517641c-36.002982 0-65.363683-29.286-65.363683-65.313541l0-554.949184c0-36.041868 29.361725-65.326844 65.363683-65.326844l795.015795 0c36.002982 0 65.198931 29.284977 65.198931 65.326844l0 554.949184C964.030675 871.231641 934.834726 900.517641 898.831744 900.517641L898.831744 900.517641zM103.816972 255.593236c-13.576203 0-24.711821 11.085476-24.711821 24.662703l0 554.949184c0 13.576203 11.136641 24.662703 24.711821 24.662703l795.015795 0c13.577227 0 24.547069-11.086499 24.547069-24.662703l0-554.949184c0-13.577227-10.970866-24.662703-24.547069-24.662703L103.816972 255.593236 103.816972 255.593236zM664.346245 251.774257c-11.161201 0-20.332071-9.080819-20.332071-20.332071l0-101.278661c0-13.576203-11.047614-24.623817-24.699542-24.623817L383.181611 105.539708c-13.576203 0-24.712845 11.04659-24.712845 24.623817l0 101.278661c0 11.252275-9.041934 20.332071-20.332071 20.332071-11.20111 0-20.319791-9.080819-20.319791-20.332071l0-101.278661c0-35.989679 29.323862-65.275679 65.364707-65.275679l236.133022 0c36.06745 0 65.402569 29.284977 65.402569 65.275679l0 101.278661C684.717202 242.694461 675.636383 251.774257 664.346245 251.774257L664.346245 251.774257zM413.233044 521.725502 75.694471 521.725502c-11.163247 0-20.333094-9.117658-20.333094-20.35663 0-11.252275 9.169847-20.332071 20.333094-20.332071l337.538573 0c11.277858 0 20.319791 9.080819 20.319791 20.332071C433.552835 512.607844 424.510902 521.725502 413.233044 521.725502L413.233044 521.725502zM912.894018 521.725502 575.367725 521.725502c-11.213389 0-20.332071-9.117658-20.332071-20.35663 0-11.252275 9.118682-20.332071 20.332071-20.332071l337.526293 0c11.290137 0 20.332071 9.080819 20.332071 20.332071C933.226089 512.607844 924.184155 521.725502 912.894018 521.725502L912.894018 521.725502zM557.56322 634.217552 445.085496 634.217552c-11.213389 0-20.332071-9.079796-20.332071-20.331048l0-168.763658c0-11.251252 9.118682-20.332071 20.332071-20.332071l112.478747 0c11.290137 0 20.370956 9.080819 20.370956 20.332071l0 168.763658C577.934177 625.137757 568.853357 634.217552 557.56322 634.217552L557.56322 634.217552zM465.417567 593.514525l71.827909 0L537.245476 465.454918l-71.827909 0L465.417567 593.514525 465.417567 593.514525z" p-id="1685" fill="#bfbfbf"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/validCode.svg b/src/assets/icons/validCode.svg
deleted file mode 100644
index cfb10214..00000000
--- a/src/assets/icons/validCode.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569580729849" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1939" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M513.3 958.5c-142.2 0-397.9-222.1-401.6-440.5V268c1.7-39.6 31.7-72.3 71.1-77.3 49-4.6 97.1-16.5 142.7-35.3 47.8-14 91.9-38.3 129.4-71.1 30.3-24.4 72.9-26.3 105.3-4.6 39.9 30.7 83.8 55.9 130.5 74.6 48.6 14.7 98.2 25.9 148.4 33.7 38.5 7.6 67.1 40.3 69.5 79.5 3.3 84.9 2.5 169.9-2.6 254.7-33.7 281.6-253.7 436.4-392.7 436.3z m-0.1-813.7c-7.2-0.2-14.3 2-20 6.4-39.7 35.2-86.8 61.1-137.7 75.7-46.8 19.2-96.2 31-146.6 35.2-11 3.2-18.8 13-19.5 24.4v230.1c3.5 180.3 223.3 361 323.9 361s287.3-120.2 317.6-360.5c7.3-142.7 0-228.6 0-229.6-1.3-13.3-11-24.3-24-27.3-49.6-7.7-98.6-19-146.5-33.7-46.3-19.5-89.7-45.3-129-76.7-5.8-3.8-12.7-5.5-19.5-4.9l1.3-0.1z" fill="#C6CCDA" p-id="1940"></path><path d="M750.1 428L490.7 673.2c-11.7 11.1-29.5 12.9-43.1 4.2l-6.8-5.8-141.2-149.4c-9.3-9.3-12.7-22.9-9-35.5 3.8-12.6 14.1-22.1 27-24.8 12.9-2.7 26.1 1.9 34.6 11.9L469 597.5l233.7-221c14.6-12.8 36.8-11.6 49.9 2.7 13.2 14.2 11.5 35.3-2.5 48.8" fill="#C6CCDA" p-id="1941"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/valid_code.svg b/src/assets/icons/valid_code.svg
new file mode 100644
index 00000000..39bf4783
--- /dev/null
+++ b/src/assets/icons/valid_code.svg
@@ -0,0 +1,9 @@
+<svg t="1655050462467" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2131"
+  width="200" height="200">
+  <path
+    d="M917.6 267.2c-36.1-2.5-72.4-9.3-103.6-19.3-10.1-3-20.2-6.4-30.3-10-21.4-6.3-50.5-18.8-83.6-36.6-0.4-0.2-0.7-0.4-1.1-0.6-7.8-4.2-15.7-8.7-23.8-13.4-10.9-6.3-21.7-12.9-32.5-19.9-0.4-0.3-0.8-0.5-1.2-0.8-7.7-5-15.5-10.2-23.1-15.5-5-3.4-10-7.1-15-10.7-3.8-2.8-7.5-5.3-11.3-8.2-27.4-20.5-54.5-43.5-79.9-68.3-25.4 24.8-52.5 47.8-79.9 68.3-3.7 2.8-7.5 5.4-11.3 8.2-5 3.6-10 7.3-15 10.7-7.7 5.4-15.4 10.5-23.1 15.5-0.4 0.3-0.8 0.5-1.2 0.8-10.8 6.9-21.6 13.6-32.5 19.9-8.1 4.7-16 9.2-23.8 13.4-0.3 0.2-0.7 0.4-1 0.6-33 17.8-62.2 30.3-83.6 36.6-10.1 3.6-20.2 7-30.3 10-31.1 10-67.4 16.8-103.6 19.3h0.1c1.1 16.2 2.1 37.7 3.4 60.9h0.7c6.1 86.8 23.5 210.2 49.7 282.8 1.2 3.2 2.2 6.5 3.3 9.6 0.6 1.5 1.2 2.8 1.8 4.3 62.8 162.1 171.9 280.1 303 323.4v0.4c17.3 5.7 31.9 9.3 43.5 11.5 11.5-2.2 26.1-5.8 43.5-11.5v-0.4C687 905 796.1 787 858.9 624.8c0.6-1.5 1.2-2.8 1.8-4.3 1.2-3.1 2.2-6.4 3.3-9.6 26.2-72.5 43.6-196 49.7-282.8h0.7c1.1-23.3 2.2-44.7 3.2-60.9z m-47.4 41.9l-0.5 9.5c-0.5 2.2-0.9 4.4-1 6.6C863 406 847 525.7 821.3 596.7c-0.7 1.9-1.4 3.9-2 5.8-0.4 1.2-0.8 2.5-1.4 4.1-0.5 1.2-1 2.5-1.4 3.4C758.1 760.8 657.7 869.3 541 907.8c-1.9 0.6-3.7 1.4-5.5 2.2-7.9 2.5-15.7 4.6-23.2 6.3-7.5-1.7-15.2-3.8-23.1-6.3-1.8-0.9-3.6-1.6-5.5-2.2-116.7-38.5-217.1-147-275.4-297.5-0.5-1.2-0.9-2.4-1.7-4.1-0.4-1.2-0.8-2.4-1.3-3.6-0.7-2-1.3-3.9-1.9-5.6-25.8-71.2-41.7-191-47.4-271.7-0.2-2.3-0.5-4.5-1-6.6l-0.5-9.3c-0.1-1.5-0.2-3-0.2-4.5 24.6-3.8 48.4-9.3 70-16.2 10.1-3 20.4-6.4 31.4-10.4 25.2-7.6 56.5-21.2 90.5-39.6 0.6-0.3 1.2-0.6 1.7-0.9 8.2-4.4 16.7-9.2 24.8-14 10.7-6.1 22-13 34.5-21.1 0.4-0.2 1-0.6 1.3-0.8 8.2-5.3 16.4-10.8 24.1-16.2 4.5-3.1 9.1-6.4 13.7-9.7l2.4-1.8 4-2.9c2.6-1.9 5.2-3.7 7.5-5.5 17.9-13.4 35.3-27.5 52-42.1 16.7 14.7 34 28.7 51.8 42 2.6 1.9 5.1 3.8 7.7 5.6l4.3 3.1 1.5 1.1c4.8 3.5 9.6 6.9 14 9.9 8.1 5.7 16.3 11.2 23.7 16l2.1 1.3c12.4 8 23.7 14.9 34.1 20.8 8.6 5 17 9.8 25 14.1 0.4 0.2 1 0.5 1.5 0.8 34.2 18.4 65.6 32.1 90.9 39.7 11 3.9 21.3 7.3 30.6 10.1 22.1 7.1 46.1 12.6 70.8 16.5 0.1 1.5 0.1 3 0 4.4z"
+    p-id="2132"></path>
+  <path
+    d="M710.6 411.2L476.1 651.6l-120-123c-8.3-8.5-21.8-8.5-30.1 0s-8.3 22.3 0 30.9L461.1 698c4.2 4.3 9.6 6.4 15.1 6.4 5.4 0 10.9-2.1 15-6.4l249.5-255.7c8.3-8.5 8.3-22.3 0-30.9-8.3-8.7-21.8-8.7-30.1-0.2z"
+    p-id="2133"></path>
+</svg>
diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index 8a586411..9f6aa7a2 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -15,9 +15,9 @@ import {
   computed,
   onMounted,
   onBeforeUnmount,
-  getCurrentInstance
+  getCurrentInstance,
 } from 'vue';
-import { TagView } from '@/types';
+import { TagView } from '@/types/store/tagsview';
 import useStore from '@/store';
 
 const tagAndTagSpacing = ref(4);
@@ -25,8 +25,8 @@ const { proxy } = getCurrentInstance() as any;
 
 const emits = defineEmits(['scroll']);
 const emitScroll = () => {
-  emits('scroll')
-}
+  emits('scroll');
+};
 
 const { tagsView } = useStore();
 
@@ -35,12 +35,11 @@ const visitedViews = computed(() => tagsView.visitedViews);
 const scrollWrapper = computed(() => proxy?.$refs.scrollContainer.$refs.wrap$);
 
 onMounted(() => {
-  scrollWrapper.value.addEventListener('scroll', emitScroll, {passive:true})
-})
+  scrollWrapper.value.addEventListener('scroll', emitScroll, true);
+});
 onBeforeUnmount(() => {
-  scrollWrapper.value.removeEventListener('scroll', emitScroll)
-})
-
+  scrollWrapper.value.removeEventListener('scroll', emitScroll);
+});
 
 function handleScroll(e: WheelEvent) {
   const eventDelta = (e as any).wheelDelta || -e.deltaY * 40;
@@ -69,7 +68,7 @@ function moveToTarget(currentTag: TagView) {
   } else {
     const tagListDom = document.getElementsByClassName('tags-view__item');
     const currentIndex = visitedViews.value.findIndex(
-      item => item === currentTag
+      (item) => item === currentTag
     );
     let prevTag = null;
     let nextTag = null;
@@ -81,7 +80,8 @@ function moveToTarget(currentTag: TagView) {
         ) {
           prevTag = tagListDom[k];
         }
-        if ((tagListDom[k] as any).dataset.path ===
+        if (
+          (tagListDom[k] as any).dataset.path ===
           visitedViews.value[currentIndex + 1].path
         ) {
           nextTag = tagListDom[k];
@@ -107,7 +107,7 @@ function moveToTarget(currentTag: TagView) {
 }
 
 defineExpose({
-  moveToTarget
+  moveToTarget,
 });
 </script>
 
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index b2b51c6c..ac63fb93 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -65,13 +65,14 @@ import {
   nextTick,
   ref,
   watch,
-  onMounted
+  onMounted,
+  ComponentInternalInstance,
 } from 'vue';
 
 import path from 'path-browserify';
 
 import { RouteRecordRaw, useRoute, useRouter } from 'vue-router';
-import { TagView } from '@/types';
+import { TagView } from '@/types/store/tagsview';
 
 import ScrollPane from './ScrollPane.vue';
 import SvgIcon from '@/components/SvgIcon/index.vue';
@@ -80,7 +81,7 @@ import useStore from '@/store';
 
 const { tagsView, permission } = useStore();
 
-const { proxy } = getCurrentInstance() as any;
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const router = useRouter();
 const route = useRoute();
 
@@ -102,13 +103,13 @@ watch(
   },
   {
     //初始化立即执行
-    immediate: true
+    immediate: true,
   }
 );
 
-watch(visible, value => {
+watch(visible, (value) => {
   if (value) {
-    document.body.addEventListener('click', closeMenu, {passive:true});
+    document.body.addEventListener('click', closeMenu);
   } else {
     document.body.removeEventListener('click', closeMenu);
   }
@@ -117,14 +118,14 @@ watch(visible, value => {
 function filterAffixTags(routes: RouteRecordRaw[], basePath = '/') {
   let tags: TagView[] = [];
 
-  routes.forEach(route => {
+  routes.forEach((route) => {
     if (route.meta && route.meta.affix) {
       const tagPath = path.resolve(basePath, route.path);
       tags.push({
         fullPath: tagPath,
         path: tagPath,
         name: route.name,
-        meta: { ...route.meta }
+        meta: { ...route.meta },
       });
     }
 
@@ -166,7 +167,7 @@ function moveToCurrentTag() {
         }
       }
     }
-  })
+  });
 }
 
 function isActive(tag: TagView) {
@@ -204,7 +205,7 @@ function refreshSelectedTag(view: TagView) {
   tagsView.delCachedView(view);
   const { fullPath } = view;
   nextTick(() => {
-    router.replace({ path: '/redirect' + fullPath }).catch(err => {
+    router.replace({ path: '/redirect' + fullPath }).catch((err) => {
       console.warn(err);
     });
   });
@@ -254,7 +255,7 @@ function closeRightTags() {
 }
 
 function closeOtherTags() {
-  router.push(selectedTag.value)
+  router.push(selectedTag.value);
   tagsView.delOtherViews(selectedTag.value).then(() => {
     moveToCurrentTag();
   });
@@ -333,8 +334,19 @@ onMounted(() => {
       }
 
       &.active {
-        background-color: var(--el-color-primary-light-9);
-        color: var(--el-color-primary);
+        background-color: var(--el-color-primary);
+        color: var(--el-color-primary-light-9);
+        border-color: var(--el-color-primary);
+        &::before {
+          content: '';
+          background: #fff;
+          display: inline-block;
+          width: 8px;
+          height: 8px;
+          border-radius: 50%;
+          position: relative;
+          margin-right: 5px;
+        }
       }
 
       .icon-close {
diff --git a/src/main.ts b/src/main.ts
index 28cb57f8..02e9190e 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -9,7 +9,7 @@ import 'element-plus/theme-chalk/index.css';
 import Pagination from '@/components/Pagination/index.vue';
 import '@/permission';
 
-import 'default-passive-events'
+import 'default-passive-events';
 
 // 引入svg注册脚本
 import 'virtual:svg-icons-register';
@@ -21,25 +21,25 @@ import i18n from '@/lang/index';
 import '@/styles/index.scss';
 
 // 根据字典编码获取字典列表全局方法
-import { listDictsByCode } from '@/api/system/dict';
+import { getDictItemsByTypeCode } from '@/api/system/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]);
 });
 
 // 全局方法
-app.config.globalProperties.$listDictsByCode = listDictsByCode;
+app.config.globalProperties.$getDictItemsByTypeCode = getDictItemsByTypeCode;
 
 // 注册全局组件
 app
   .component('Pagination', Pagination)
-  .use(createPinia() as any)
-  .use(router as any)
+  .use(createPinia())
+  .use(router)
   .use(ElementPlus)
-  .use(i18n as any)
+  .use(i18n)
   .mount('#app');
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 09832345..064d3863 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -1,4 +1,4 @@
-import { AppState } from '@/types';
+import { AppState } from '@/types/store/app';
 import { localStorage } from '@/utils/storage';
 import { defineStore } from 'pinia';
 import { getLanguage } from '@/lang/index';
@@ -11,10 +11,10 @@ const useAppStore = defineStore({
       opened: localStorage.get('sidebarStatus')
         ? !!+localStorage.get('sidebarStatus')
         : true,
-      withoutAnimation: false
+      withoutAnimation: false,
     },
     language: getLanguage(),
-    size: localStorage.get('size') || 'default'
+    size: localStorage.get('size') || 'default',
   }),
   actions: {
     toggleSidebar() {
@@ -41,8 +41,8 @@ const useAppStore = defineStore({
     setLanguage(language: string) {
       this.language = language;
       localStorage.set('language', language);
-    }
-  }
+    },
+  },
 });
 
 export default useAppStore;
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 98531af9..e1743e1c 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -1,4 +1,4 @@
-import { PermissionState } from '@/types';
+import { PermissionState } from '@/types/store/permission';
 import { RouteRecordRaw } from 'vue-router';
 import { defineStore } from 'pinia';
 import { constantRoutes } from '@/router';
@@ -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/settings.ts b/src/store/modules/settings.ts
index 31e9a60e..43ffbe11 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia';
-import { SettingState } from '@/types';
+import { SettingState } from '@/types/store/setting';
 import defaultSettings from '../../settings';
 import { localStorage } from '@/utils/storage';
 
@@ -18,7 +18,7 @@ export const useSettingStore = defineStore({
         ? localStorage.get('tagsView')
         : tagsView,
     fixedHeader: fixedHeader,
-    sidebarLogo: sidebarLogo
+    sidebarLogo: sidebarLogo,
   }),
   actions: {
     async changeSetting(payload: { key: string; value: any }) {
@@ -43,8 +43,8 @@ export const useSettingStore = defineStore({
         default:
           break;
       }
-    }
-  }
+    },
+  },
 });
 
 export default useSettingStore;
diff --git a/src/store/modules/tagsView.ts b/src/store/modules/tagsView.ts
index 45b60424..77c553e9 100644
--- a/src/store/modules/tagsView.ts
+++ b/src/store/modules/tagsView.ts
@@ -1,38 +1,37 @@
 import { defineStore } from 'pinia';
-import { TagsViewState } from '@/types';
+import { TagsViewState } from '@/types/store/tagsview';
 
 const useTagsViewStore = defineStore({
   id: 'tagsView',
   state: (): TagsViewState => ({
     visitedViews: [],
-    cachedViews: []
+    cachedViews: [], //  keepAlive 缓存页面
   }),
   actions: {
     addVisitedView(view: any) {
-      if (this.visitedViews.some(v => v.path === view.path)) return;
+      if (this.visitedViews.some((v) => v.path === view.path)) return;
       if (view.meta && view.meta.affix) {
         this.visitedViews.unshift(
           Object.assign({}, view, {
-            title: view.meta?.title || 'no-name'
+            title: view.meta?.title || 'no-name',
           })
         );
       } else {
         this.visitedViews.push(
           Object.assign({}, view, {
-            title: view.meta?.title || 'no-name'
+            title: view.meta?.title || 'no-name',
           })
         );
       }
     },
     addCachedView(view: any) {
       if (this.cachedViews.includes(view.name)) return;
-      if (!view.meta.noCache) {
+      if (view.meta.keepAlive) {
         this.cachedViews.push(view.name);
       }
     },
-
     delVisitedView(view: any) {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         for (const [i, v] of this.visitedViews.entries()) {
           if (v.path === view.path) {
             this.visitedViews.splice(i, 1);
@@ -43,23 +42,22 @@ const useTagsViewStore = defineStore({
       });
     },
     delCachedView(view: any) {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const index = this.cachedViews.indexOf(view.name);
         index > -1 && this.cachedViews.splice(index, 1);
         resolve([...this.cachedViews]);
       });
     },
-
     delOtherVisitedViews(view: any) {
-      return new Promise(resolve => {
-        this.visitedViews = this.visitedViews.filter(v => {
+      return new Promise((resolve) => {
+        this.visitedViews = this.visitedViews.filter((v) => {
           return v.meta?.affix || v.path === view.path;
         });
         resolve([...this.visitedViews]);
       });
     },
     delOtherCachedViews(view: any) {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const index = this.cachedViews.indexOf(view.name);
         if (index > -1) {
           this.cachedViews = this.cachedViews.slice(index, index + 1);
@@ -84,29 +82,29 @@ const useTagsViewStore = defineStore({
       this.addCachedView(view);
     },
     delView(view: any) {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         this.delVisitedView(view);
         this.delCachedView(view);
         resolve({
           visitedViews: [...this.visitedViews],
-          cachedViews: [...this.cachedViews]
+          cachedViews: [...this.cachedViews],
         });
       });
     },
     delOtherViews(view: any) {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         this.delOtherVisitedViews(view);
         this.delOtherCachedViews(view);
         resolve({
           visitedViews: [...this.visitedViews],
-          cachedViews: [...this.cachedViews]
+          cachedViews: [...this.cachedViews],
         });
       });
     },
     delLeftViews(view: any) {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const currIndex = this.visitedViews.findIndex(
-          v => v.path === view.path
+          (v) => v.path === view.path
         );
         if (currIndex === -1) {
           return;
@@ -124,14 +122,14 @@ const useTagsViewStore = defineStore({
           return false;
         });
         resolve({
-          visitedViews: [...this.visitedViews]
+          visitedViews: [...this.visitedViews],
         });
       });
     },
     delRightViews(view: any) {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         const currIndex = this.visitedViews.findIndex(
-          v => v.path === view.path
+          (v) => v.path === view.path
         );
         if (currIndex === -1) {
           return;
@@ -149,35 +147,35 @@ const useTagsViewStore = defineStore({
           return false;
         });
         resolve({
-          visitedViews: [...this.visitedViews]
+          visitedViews: [...this.visitedViews],
         });
       });
     },
     delAllViews() {
-      return new Promise(resolve => {
-        const affixTags = this.visitedViews.filter(tag => tag.meta?.affix);
+      return new Promise((resolve) => {
+        const affixTags = this.visitedViews.filter((tag) => tag.meta?.affix);
         this.visitedViews = affixTags;
         this.cachedViews = [];
         resolve({
           visitedViews: [...this.visitedViews],
-          cachedViews: [...this.cachedViews]
+          cachedViews: [...this.cachedViews],
         });
       });
     },
     delAllVisitedViews() {
-      return new Promise(resolve => {
-        const affixTags = this.visitedViews.filter(tag => tag.meta?.affix);
+      return new Promise((resolve) => {
+        const affixTags = this.visitedViews.filter((tag) => tag.meta?.affix);
         this.visitedViews = affixTags;
         resolve([...this.visitedViews]);
       });
     },
     delAllCachedViews() {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         this.cachedViews = [];
         resolve([...this.cachedViews]);
       });
-    }
-  }
+    },
+  },
 });
 
 export default useTagsViewStore;
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 55b4a42e..d4c3dbdc 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,5 +1,7 @@
 import { defineStore } from 'pinia';
-import { LoginFormData, UserState } from '@/types';
+import { LoginFormData } from '@/types/api/system/login';
+import { UserState } from '@/types/store/user';
+
 import { localStorage } from '@/utils/storage';
 import { login, logout } from '@/api/login';
 import { getUserInfo } from '@/api/system/user';
@@ -12,38 +14,33 @@ const useUserStore = defineStore({
     nickname: '',
     avatar: '',
     roles: [],
-    perms: []
+    perms: [],
   }),
   actions: {
     async RESET_STATE() {
       this.$reset();
     },
     /**
-     * 用户登录请求
-     * @param userInfo 登录用户信息
-     *  username: 用户名
-     *  password: 密码
-     *  code: 验证码
-     *  uuid: 匹配正确验证码的 key
+     * 登录
      */
-    login(userInfo: LoginFormData) {
-      const { username, password, code, uuid } = userInfo;
+    login(loginData: LoginFormData) {
+      const { username, password, code, uuid } = loginData;
       return new Promise((resolve, reject) => {
         login({
           username: username.trim(),
           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);
           });
       });
@@ -68,7 +65,7 @@ const useUserStore = defineStore({
             this.perms = perms;
             resolve(data);
           })
-          .catch(error => {
+          .catch((error) => {
             reject(error);
           });
       });
@@ -86,7 +83,7 @@ const useUserStore = defineStore({
             resetRouter();
             resolve(null);
           })
-          .catch(error => {
+          .catch((error) => {
             reject(error);
           });
       });
@@ -96,13 +93,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/sms/coupon.ts b/src/types/api/sms/coupon.ts
new file mode 100644
index 00000000..5f81ee6b
--- /dev/null
+++ b/src/types/api/sms/coupon.ts
@@ -0,0 +1,33 @@
+import { PageQueryParam ,PageResult} from '../base';
+
+/**
+ * 优惠券查询参数类型
+ */
+export interface CouponQueryParam extends PageQueryParam {
+  status?: number;
+}
+
+/**
+ * 优惠券分页列表项
+ */
+ export interface CouponItem {
+  id: string;
+  name: string;
+  type: string;
+}
+
+/**
+ *优惠券分页项类型
+ */
+export type CouponPageResult = PageResult<CouponItem[]>;
+
+
+
+/**
+ * 广告表单类型声明
+ */
+ export interface CouponFormData {
+  id?: number;
+  name: string;
+  type: string;
+}
diff --git a/src/types/api/system/client.d.ts b/src/types/api/system/client.d.ts
index 98f97467..4703a42d 100644
--- a/src/types/api/system/client.d.ts
+++ b/src/types/api/system/client.d.ts
@@ -1,17 +1,14 @@
 import { PageQueryParam, PageResult } from '../base';
 
 /**
- * 客户端查询参数类型声明
+ * 客户端查询参数类型
  */
 export interface ClientQueryParam extends PageQueryParam {
-  /**
-   * 客户端名称
-   */
-  clientId: string | undefined;
+  keywords?: string;
 }
 
 /**
- * 客户端分页列表项声明
+ * 客户端分页列表项
  */
 export interface ClientItem {
   clientId: string;
@@ -28,12 +25,12 @@ export interface ClientItem {
 }
 
 /**
- * 客户端分页项类型声明
+ * 客户端分页项类型
  */
 export type ClientPageResult = PageResult<ClientItem[]>;
 
 /**
- * 客户端表单类型声明
+ * 客户端表单类型
  */
 export interface ClientFormData {
   authorizedGrantTypes: string;
diff --git a/src/types/api/system/dict.d.ts b/src/types/api/system/dict.d.ts
index 53f47f7e..f268a399 100644
--- a/src/types/api/system/dict.d.ts
+++ b/src/types/api/system/dict.d.ts
@@ -29,7 +29,7 @@ export type DictPageResult = PageResult<Dict[]>;
 /**
  * 字典表单类型声明
  */
-export interface DictFormData {
+export interface DictFormTypeData {
   id: number | undefined;
   name: string;
   code: string;
@@ -44,11 +44,11 @@ export interface DictItemQueryParam extends PageQueryParam {
   /**
    * 字典项名称
    */
-  name: string | undefined;
+  name?: string;
   /**
-   * 字典编码
+   * 字典类型编码
    */
-  dictCode: string | undefined;
+  typeCode?: string;
 }
 
 /**
@@ -75,8 +75,8 @@ export type DictItemPageResult = PageResult<DictItem[]>;
  */
 export interface DictItemFormData {
   id?: number;
-  dictCode?: string;
-  dictName?: string;
+  typeCode?: string;
+  typeName?: string;
   name: string;
   code: string;
   value: string;
diff --git a/src/types/api/system/role.d.ts b/src/types/api/system/role.d.ts
index f4dc31b2..3ce9a228 100644
--- a/src/types/api/system/role.d.ts
+++ b/src/types/api/system/role.d.ts
@@ -1,14 +1,14 @@
 import { PageQueryParam, PageResult } from '../base';
 
 /**
- * 角色查询参数类型声明
+ * 角色查询参数类型
  */
 export interface RoleQueryParam extends PageQueryParam {
   name?: string;
 }
 
 /**
- * 角色分页列表项声明
+ * 角色分页列表项
  */
 export interface RoleItem {
   id: string;
@@ -22,17 +22,25 @@ export interface RoleItem {
 }
 
 /**
- * 角色分页项类型声明
+ * 角色分页项类型
  */
 export type RolePageResult = PageResult<RoleItem[]>;
 
 /**
- * 角色表单类型声明
+ * 角色表单类型
  */
 export interface RoleFormData {
-  id: number | undefined;
+  id: string | undefined;
   name: string;
   code: string;
   sort: number;
   status: number;
 }
+
+/**
+ *
+ */
+export interface RoleResourceData {
+  menuIds: string[];
+  permIds: string[];
+}
diff --git a/src/types/common.d.ts b/src/types/common.d.ts
index 7a00ee13..c2c55b79 100644
--- a/src/types/common.d.ts
+++ b/src/types/common.d.ts
@@ -1,9 +1,5 @@
 /**
- * 组件类型声明
- */
-
-/**
- * 弹窗属性类型声明
+ * 弹窗类型
  */
 export interface Dialog {
   title: string;
@@ -11,10 +7,11 @@ export interface Dialog {
 }
 
 /**
- * 通用组件选择项类型声明
+ * 通用组件选择项类型
  */
 export interface Option {
   value: string;
   label: string;
+  checked?: boolean;
   children?: Option[];
 }
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
deleted file mode 100644
index 3784e446..00000000
--- a/src/types/index.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-export * from './api/system/login';
-export * from './api/system/user';
-export * from './api/system/role';
-export * from './api/system/menu';
-export * from './api/system/dept';
-export * from './api/system/dict';
-export * from './api/system/perm';
-export * from './api/system/client';
-
-export * from './api/pms/goods';
-export * from './api/pms/brand';
-export * from './api/sms/advert';
-export * from './api/oms/order';
-export * from './api/ums/member';
-export * from './api/lab/seata';
-
-export * from './store';
-
-export * from './common';
diff --git a/src/types/store.d.ts b/src/types/store.d.ts
deleted file mode 100644
index 6cc47a8a..00000000
--- a/src/types/store.d.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { RouteRecordRaw, RouteLocationNormalized } from 'vue-router';
-/**
- * 用户状态类型声明
- */
-export interface AppState {
-  device: string;
-  sidebar: {
-    opened: boolean;
-    withoutAnimation: boolean;
-  };
-  language: string;
-  size: string;
-}
-
-/**
- * 权限类型声明
- */
-export interface PermissionState {
-  routes: RouteRecordRaw[];
-  addRoutes: RouteRecordRaw[];
-}
-
-/**
- * 设置状态类型声明
- */
-export interface SettingState {
-  theme: string;
-  tagsView: boolean;
-  fixedHeader: boolean;
-  showSettings: boolean;
-  sidebarLogo: boolean;
-}
-
-/**
- * 标签状态类型声明
- */
-export interface TagView extends Partial<RouteLocationNormalized> {
-  title?: string;
-}
-
-export interface TagsViewState {
-  visitedViews: TagView[];
-  cachedViews: string[];
-}
-
-/**
- * 用户状态类型声明
- */
-export interface UserState {
-  token: string;
-  nickname: string;
-  avatar: string;
-  roles: string[];
-  perms: string[];
-}
diff --git a/src/types/store/app.d.ts b/src/types/store/app.d.ts
new file mode 100644
index 00000000..569fcf9d
--- /dev/null
+++ b/src/types/store/app.d.ts
@@ -0,0 +1,12 @@
+/**
+ * 系统类型声明
+ */
+ export interface AppState {
+  device: string;
+  sidebar: {
+    opened: boolean;
+    withoutAnimation: boolean;
+  };
+  language: string;
+  size: string;
+}
diff --git a/src/types/store/permission.d.ts b/src/types/store/permission.d.ts
new file mode 100644
index 00000000..c0ec4dcb
--- /dev/null
+++ b/src/types/store/permission.d.ts
@@ -0,0 +1,7 @@
+/**
+ * 权限类型声明
+ */
+ export interface PermissionState {
+  routes: RouteRecordRaw[];
+  addRoutes: RouteRecordRaw[];
+}
diff --git a/src/types/store/setting.d.ts b/src/types/store/setting.d.ts
new file mode 100644
index 00000000..e83734d0
--- /dev/null
+++ b/src/types/store/setting.d.ts
@@ -0,0 +1,10 @@
+/**
+ * 设置状态类型声明
+ */
+ export interface SettingState {
+  theme: string;
+  tagsView: boolean;
+  fixedHeader: boolean;
+  showSettings: boolean;
+  sidebarLogo: boolean;
+}
diff --git a/src/types/store/tagsview.d.ts b/src/types/store/tagsview.d.ts
new file mode 100644
index 00000000..ce388072
--- /dev/null
+++ b/src/types/store/tagsview.d.ts
@@ -0,0 +1,13 @@
+import { RouteLocationNormalized } from 'vue-router';
+
+/**
+ * 标签状态类型声明
+ */
+export interface TagView extends Partial<RouteLocationNormalized> {
+  title?: string;
+}
+
+export interface TagsViewState {
+  visitedViews: TagView[];
+  cachedViews: string[];
+}
diff --git a/src/types/store/user.d.ts b/src/types/store/user.d.ts
new file mode 100644
index 00000000..698c7445
--- /dev/null
+++ b/src/types/store/user.d.ts
@@ -0,0 +1,7 @@
+export interface UserState {
+  token: string;
+  nickname: string;
+  avatar: string;
+  roles: string[];
+  perms: string[];
+}
diff --git a/src/views/ums/member/index.vue b/src/views/index.vue
similarity index 96%
rename from src/views/ums/member/index.vue
rename to src/views/index.vue
index f597ba7a..0b36312e 100644
--- a/src/views/ums/member/index.vue
+++ b/src/views/index.vue
@@ -1,7 +1,6 @@
-<!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
 <script lang="ts">
 export default {
-  name: 'member'
+  name: 'member',
 };
 </script>
 
@@ -11,7 +10,7 @@ import { ElTable } from 'element-plus';
 import { Search, Refresh } from '@element-plus/icons-vue';
 
 import { listMemebersPage } from '@/api/ums/member';
-import { MemberQueryParam, MemberItem } from '@/types';
+import { MemberQueryParam, MemberItem } from '@/types/api/ums/member';
 
 const state = reactive({
   // 遮罩层
@@ -25,9 +24,9 @@ const state = reactive({
   total: 0,
   queryParams: {
     pageNum: 1,
-    pageSize: 10
+    pageSize: 10,
   } as MemberQueryParam,
-  memberList: [] as MemberItem[]
+  memberList: [] as MemberItem[],
 });
 
 const { loading, queryParams, memberList, total } = toRefs(state);
@@ -45,7 +44,7 @@ function resetQuery() {
   state.queryParams = {
     pageNum: 1,
     pageSize: 10,
-    nickName: ''
+    nickName: '',
   };
   handleQuery();
 }
diff --git a/src/views/lab/seata/index.vue b/src/views/lab/seata/index.vue
index 553180c0..84670087 100644
--- a/src/views/lab/seata/index.vue
+++ b/src/views/lab/seata/index.vue
@@ -1,7 +1,7 @@
 <!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
 <script lang="ts">
 export default {
-  name: 'seata'
+  name: 'seata',
 };
 </script>
 
@@ -14,42 +14,42 @@ import {
   RefreshLeft,
   Right,
   CircleCheckFilled,
-  CircleCloseFilled
+  CircleCloseFilled,
 } from '@element-plus/icons-vue';
 import { payOrder, getSeataData, resetSeataData } from '@/api/lab/seata';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { SeataFormData } from '@/types';
+import { SeataFormData } from '@/types/api/lab/seata';
 
 const state = reactive({
   // 保留改变前数据
   cacheSeataData: {
     status: undefined,
     stockNum: undefined,
-    balance: undefined
+    balance: undefined,
   },
   seataData: {
     orderInfo: {
       orderSn: undefined,
-      status: undefined
+      status: undefined,
     },
     stockInfo: {
       name: undefined,
       picUrl: undefined,
-      stockNum: undefined
+      stockNum: undefined,
     },
     accountInfo: {
       nickName: undefined,
       avatarUrl: undefined,
-      balance: undefined
-    }
+      balance: undefined,
+    },
   },
 
   loading: false,
 
   submitData: {
     openTx: true, // 是否开启事务
-    orderEx: true // 订单修改异常
-  } as SeataFormData
+    orderEx: true, // 订单修改异常
+  } as SeataFormData,
 });
 
 const { cacheSeataData, seataData, loading, submitData } = toRefs(state);
@@ -73,7 +73,7 @@ function handleOrderPay() {
       {
         confirmButtonText: '重置数据',
         cancelButtonText: '取消',
-        type: 'warning'
+        type: 'warning',
       }
     )
       .then(() => {
@@ -92,7 +92,7 @@ function handleOrderPay() {
         cacheSeataData.value = {
           status: seataData.value.orderInfo.status,
           stockNum: seataData.value.stockInfo.stockNum,
-          balance: seataData.value.accountInfo.balance
+          balance: seataData.value.accountInfo.balance,
         };
         loadData();
       });
@@ -129,7 +129,7 @@ function handleDataReset() {
     cacheSeataData.value = {
       status: undefined,
       stockNum: undefined,
-      balance: undefined
+      balance: undefined,
     };
     loadData();
   });
@@ -367,6 +367,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 .card-panel__col {
   margin-bottom: 12px;
+
   .el-link {
     font-size: 16px;
     margin-right: 8px;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 2ef33a69..4bb2c064 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -61,7 +61,7 @@
       <!-- 验证码 -->
       <el-form-item prop="code">
         <span class="svg-container">
-          <svg-icon icon-class="validCode" />
+          <svg-icon icon-class="valid_code" />
         </span>
         <el-input
           v-model="loginForm.code"
@@ -119,7 +119,7 @@ import useStore from '@/store';
 // API依赖
 import { getCaptcha } from '@/api/login';
 import { useRoute } from 'vue-router';
-import { LoginFormData } from '@/types';
+import { LoginFormData } from '@/types/api/system/login';
 
 const { user } = useStore();
 const route = useRoute();
@@ -133,11 +133,13 @@ const state = reactive({
     username: 'admin',
     password: '123456',
     code: '',
-    uuid: ''
+    uuid: '',
   } as LoginFormData,
   loginRules: {
     username: [{ required: true, trigger: 'blur' }],
-    password: [{ required: true, trigger: 'blur', validator: validatePassword }]
+    password: [
+      { required: true, trigger: 'blur', validator: validatePassword },
+    ],
   },
   loading: false,
   passwordType: 'password',
@@ -146,7 +148,7 @@ const state = reactive({
   capslockTooltipDisabled: true,
   otherQuery: {},
   clientHeight: document.documentElement.clientHeight,
-  showCopyright: true
+  showCopyright: true,
 });
 
 function validatePassword(rule: any, value: any, callback: any) {
@@ -164,7 +166,7 @@ const {
   passwordType,
   captchaBase64,
   capslockTooltipDisabled,
-  showCopyright
+  showCopyright,
 } = toRefs(state);
 
 function checkCapslock(e: any) {
@@ -223,7 +225,7 @@ watch(
     }
   },
   {
-    immediate: true
+    immediate: true,
   }
 );
 
diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index e0f5a550..ed1493b4 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -1,14 +1,15 @@
-<!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
 <script lang="ts">
 export default {
-  name: 'order'
+  name: 'order',
 };
 </script>
 
 <script setup lang="ts">
 import { onMounted, reactive, ref, toRefs } from 'vue';
 import { ElForm } from 'element-plus';
-import { Dialog, Order, OrderQueryParam } from '@/types';
+import { Order, OrderQueryParam } from '@/types/api/oms/order';
+import { Dialog } from '@/types/common';
+
 import { listOrderPages, getOrderDetail } from '@/api/oms/order';
 import { Search, Refresh } from '@element-plus/icons-vue';
 
@@ -17,7 +18,7 @@ const queryFormRef = ref(ElForm);
 const orderSourceMap = {
   1: '微信小程序',
   2: 'APP',
-  3: 'PC'
+  3: 'PC',
 };
 
 const orderStatusMap = {
@@ -31,13 +32,13 @@ const orderStatusMap = {
   401: '已发货',
   501: '用户收货',
   502: '系统收货',
-  901: '已完成'
+  901: '已完成',
 };
 
 const payTypeMap = {
   1: '支付宝',
   2: '微信',
-  3: '会员余额'
+  3: '会员余额',
 };
 
 const state = reactive({
@@ -45,16 +46,16 @@ const state = reactive({
   ids: [],
   single: true,
   multiple: true,
-  dateRange: [],
+  dateRange: [] as any,
   queryParams: {
     pageNum: 1,
-    pageSize: 10
+    pageSize: 10,
   } as OrderQueryParam,
   orderList: [] as Order[],
   total: 0,
   dialog: {
     title: '订单详情',
-    visible: false
+    visible: false,
   } as Dialog,
   dialogVisible: false,
   orderDetail: {
@@ -73,14 +74,14 @@ const state = reactive({
       skuPrice: undefined,
       couponPrice: undefined,
       freightPrice: undefined,
-      orderPrice: undefined
+      orderPrice: undefined,
     },
     member: {},
-    orderItems: []
+    orderItems: [],
   },
   orderSourceMap,
   orderStatusMap,
-  payTypeMap
+  payTypeMap,
 });
 
 const { loading, queryParams, orderList, total, dateRange } = toRefs(state);
diff --git a/src/views/pms/brand/index.vue b/src/views/pms/brand/index.vue
index 9e186fd9..d351385c 100644
--- a/src/views/pms/brand/index.vue
+++ b/src/views/pms/brand/index.vue
@@ -1,7 +1,6 @@
-<!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
 <script lang="ts">
 export default {
-  name: 'brand'
+  name: 'brand',
 };
 </script>
 
@@ -9,13 +8,18 @@ export default {
 import { onMounted, reactive, ref, toRefs } from 'vue';
 import { ElForm, ElTable, ElMessage, ElMessageBox } from 'element-plus';
 import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue';
-import { BrandFormData, BrandItem, BrandQueryParam, Dialog } from '@/types';
+import {
+  BrandFormData,
+  BrandItem,
+  BrandQueryParam,
+} from '@/types/api/pms/brand';
+import { Dialog } from '@/types/common';
 import {
   listBrandPages,
   getBrandFormDetail,
   updateBrand,
   addBrand,
-  deleteBrands
+  deleteBrands,
 } from '@/api/pms/brand';
 import SingleUpload from '@/components/Upload/SingleUpload.vue';
 
@@ -32,7 +36,7 @@ const state = reactive({
   multiple: true,
   queryParams: {
     pageNum: 1,
-    pageSize: 10
+    pageSize: 10,
   } as BrandQueryParam,
   brandList: [] as BrandItem[],
   total: 0,
@@ -43,10 +47,10 @@ const state = reactive({
       {
         required: true,
         message: '请输入品牌名称',
-        trigger: 'blur'
-      }
-    ]
-  }
+        trigger: 'blur',
+      },
+    ],
+  },
 });
 
 const {
@@ -57,7 +61,7 @@ const {
   total,
   dialog,
   formData,
-  rules
+  rules,
 } = toRefs(state);
 
 function handleQuery() {
@@ -83,14 +87,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 brandId = row.id || state.ids;
   getBrandFormDetail(brandId).then(({ data }) => {
@@ -137,7 +141,7 @@ function handleDelete(row: any) {
   ElMessageBox.confirm('确认删除已选中的数据项?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning'
+    type: 'warning',
   })
     .then(() => {
       deleteBrands(ids).then(() => {
diff --git a/src/views/pms/category/components/Attribute.vue b/src/views/pms/category/components/Attribute.vue
index 0b81e3c8..d103db67 100644
--- a/src/views/pms/category/components/Attribute.vue
+++ b/src/views/pms/category/components/Attribute.vue
@@ -67,7 +67,7 @@ import { ElMessage } from 'element-plus';
 const props = defineProps({
   attributeType: {
     type: Number,
-    default: 1
+    default: 1,
   },
   category: {
     type: Object,
@@ -75,10 +75,10 @@ const props = defineProps({
       return {
         id: undefined,
         name: '',
-        childrenLen: 0
+        childrenLen: 0,
       };
-    }
-  }
+    },
+  },
 });
 
 const attributeTypeName = computed(() =>
@@ -100,17 +100,17 @@ const state = reactive({
     attributes: [
       {
         id: undefined,
-        name: ''
-      }
-    ]
+        name: '',
+      },
+    ],
   },
   rules: {
     attribute: {
       name: [
-        { required: true, validator: attributeNameValidator, trigger: 'blur' }
-      ]
-    }
-  }
+        { required: true, validator: attributeNameValidator, trigger: 'blur' },
+      ],
+    },
+  },
 });
 
 const { formData, rules } = toRefs(state);
@@ -122,8 +122,8 @@ watch(
     if (categoryId) {
       listAttributes({
         categoryId: categoryId,
-        type: props.attributeType
-      }).then(response => {
+        type: props.attributeType,
+      }).then((response) => {
         const { data } = response;
         if (data && data.length > 0) {
           state.formData.attributes = response.data;
@@ -131,8 +131,8 @@ watch(
           state.formData.attributes = [
             {
               id: undefined,
-              name: ''
-            }
+              name: '',
+            },
           ];
         }
       });
@@ -140,8 +140,8 @@ watch(
       state.formData.attributes = [
         {
           id: undefined,
-          name: ''
-        }
+          name: '',
+        },
       ];
     }
   }
@@ -150,7 +150,7 @@ watch(
 function handleAdd() {
   state.formData.attributes.push({
     id: undefined,
-    name: ''
+    name: '',
   });
 }
 
@@ -159,8 +159,8 @@ function handleDelete(index: number) {
     state.formData.attributes = [
       {
         id: undefined,
-        name: ''
-      }
+        name: '',
+      },
     ];
     return;
   }
diff --git a/src/views/pms/category/components/Category.vue b/src/views/pms/category/components/Category.vue
index 9cdbfc6f..ddb80ceb 100644
--- a/src/views/pms/category/components/Category.vue
+++ b/src/views/pms/category/components/Category.vue
@@ -111,7 +111,7 @@ import {
   listCategories,
   addCategory,
   updateCategory,
-  deleteCategories
+  deleteCategories,
 } from '@/api/pms/category';
 import { Plus, Edit, Delete, Picture } from '@element-plus/icons-vue';
 import SingleUpload from '@/components/Upload/SingleUpload.vue';
@@ -136,30 +136,30 @@ const state = reactive({
     level: undefined,
     iconUrl: undefined,
     visible: 1,
-    sort: 100
+    sort: 100,
   },
   rules: {
     parentId: [
       {
         required: true,
         message: '请选择上级分类',
-        trigger: 'blur'
-      }
+        trigger: 'blur',
+      },
     ],
     name: [
       {
         required: true,
         message: '请输入分类名称',
-        trigger: 'blur'
-      }
-    ]
+        trigger: 'blur',
+      },
+    ],
   },
   dialog: {
     title: '',
-    visible: false
+    visible: false,
   },
   parent: {} as any,
-  current: {} as any
+  current: {} as any,
 });
 
 const { loading, categoryOptions, formData, rules, dialog, parent } =
@@ -167,15 +167,15 @@ const { loading, categoryOptions, formData, rules, dialog, parent } =
 
 function handleQuery() {
   state.loading = true;
-  listCategories(state.queryParam).then(response => {
+  listCategories(state.queryParam).then((response) => {
     state.categoryOptions = [
       {
         id: 0,
         name: '全部分类',
         parentId: 0,
         level: 0,
-        children: response.data
-      }
+        children: response.data,
+      },
     ];
     state.loading = false;
   });
@@ -188,7 +188,7 @@ function handleNodeClick(row: any) {
   state.parent = {
     id: parentNode.key,
     name: parentNode.label,
-    level: row.level
+    level: row.level,
   };
   state.current = JSON.parse(JSON.stringify(row));
   emit('categoryClick', row);
@@ -197,14 +197,14 @@ function handleNodeClick(row: any) {
 function handleAdd(row: any) {
   state.dialog = {
     title: '新增商品分类',
-    visible: true
+    visible: true,
   };
   if (row.id != null) {
     // 行点击新增
     state.parent = {
       id: row.id,
       name: row.name,
-      level: row.level
+      level: row.level,
     };
   }
 }
@@ -213,7 +213,7 @@ function handleUpdate(row: any) {
   handleNodeClick(row);
   state.dialog = {
     title: '修改商品分类',
-    visible: true
+    visible: true,
   };
   Object.assign(state.formData, state.current);
 }
@@ -229,6 +229,7 @@ function submitForm() {
         });
       } else {
         const parentCategory = state.parent as any;
+        console.log('parent', parentCategory);
         state.formData.parentId = parentCategory.id;
         state.formData.level = parentCategory.level + 1;
 
@@ -247,7 +248,7 @@ function handleDelete(row: any) {
   ElMessageBox.confirm('确认删除已选中的数据项?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning'
+    type: 'warning',
   }).then(() => {
     deleteCategories(ids).then(() => {
       ElMessage.success('删除成功');
diff --git a/src/views/pms/category/index.vue b/src/views/pms/category/index.vue
index 367c8e91..c54c67dd 100644
--- a/src/views/pms/category/index.vue
+++ b/src/views/pms/category/index.vue
@@ -1,7 +1,7 @@
 <!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
 <script lang="ts">
 export default {
-  name: 'category'
+  name: 'category',
 };
 </script>
 
@@ -16,8 +16,8 @@ const state = reactive({
   category: {
     id: undefined,
     name: '',
-    childrenLen: 0
-  }
+    childrenLen: 0,
+  },
 });
 
 const { category } = toRefs(state);
@@ -27,13 +27,13 @@ function handleCategoryClick(categoryRow: any) {
     state.category = {
       id: categoryRow.id,
       name: categoryRow.name,
-      childrenLen: categoryRow.children.length
+      childrenLen: categoryRow.children.length,
     };
   } else {
     state.category = {
       id: undefined,
       name: '',
-      childrenLen: 0
+      childrenLen: 0,
     };
   }
 }
diff --git a/src/views/pms/goods/components/GoodsAttribute.vue b/src/views/pms/goods/components/GoodsAttribute.vue
index b56589f5..de8aa067 100644
--- a/src/views/pms/goods/components/GoodsAttribute.vue
+++ b/src/views/pms/goods/components/GoodsAttribute.vue
@@ -89,20 +89,20 @@ const dataFormRef = ref(ElForm);
 const props = defineProps({
   modelValue: {
     type: Object,
-    default: () => {}
-  }
+    default: () => {},
+  },
 });
 
 const goodsInfo: any = computed({
   get: () => props.modelValue,
-  set: value => {
+  set: (value) => {
     emit('update:modelValue', value);
-  }
+  },
 });
 
 watch(
   () => goodsInfo.value.categoryId,
-  newVal => {
+  (newVal) => {
     // 商品编辑不加载分类下的属性
     const goodsId = goodsInfo.value.id;
     if (goodsId) {
@@ -111,7 +111,7 @@ watch(
     // 商品新增加载默认分类下的属性
     if (newVal) {
       // type=2 商品分类下的属性
-      listAttributes({ categoryId: newVal, type: 2 }).then(response => {
+      listAttributes({ categoryId: newVal, type: 2 }).then((response) => {
         const attrList = response.data;
         if (attrList && attrList.length > 0) {
           goodsInfo.value.attrList = attrList;
@@ -125,15 +125,15 @@ watch(
   },
   {
     immediate: true,
-    deep: true
+    deep: true,
   }
 );
 
 const state = reactive({
   rules: {
     name: [{ required: true, message: '请填写属性名称', trigger: 'blur' }],
-    value: [{ required: true, message: '请填写属性值', trigger: 'blur' }]
-  }
+    value: [{ required: true, message: '请填写属性值', trigger: 'blur' }],
+  },
 });
 
 const { rules } = toRefs(state);
diff --git a/src/views/pms/goods/components/GoodsCategory.vue b/src/views/pms/goods/components/GoodsCategory.vue
index 65459f00..142c862f 100644
--- a/src/views/pms/goods/components/GoodsCategory.vue
+++ b/src/views/pms/goods/components/GoodsCategory.vue
@@ -48,26 +48,26 @@ const emit = defineEmits(['next', 'update:modelValue']);
 const props = defineProps({
   modelValue: {
     type: Object,
-    default: () => {}
-  }
+    default: () => {},
+  },
 });
 
 const goodsInfo: any = computed({
   get: () => props.modelValue,
-  set: value => {
+  set: (value) => {
     emit('update:modelValue', value);
-  }
+  },
 });
 
 const state = reactive({
   categoryOptions: [],
-  pathLabels: []
+  pathLabels: [],
 });
 
 const { categoryOptions, pathLabels } = toRefs(state);
 
 function loadData() {
-  listCascadeCategories().then(response => {
+  listCascadeCategories().then((response) => {
     state.categoryOptions = response.data;
     if (goodsInfo.value.id) {
       nextTick(() => {
diff --git a/src/views/pms/goods/components/GoodsInfo.vue b/src/views/pms/goods/components/GoodsInfo.vue
index 3f57f59e..1e4ddd93 100644
--- a/src/views/pms/goods/components/GoodsInfo.vue
+++ b/src/views/pms/goods/components/GoodsInfo.vue
@@ -53,7 +53,10 @@
             <single-upload v-model="item.url" :show-close="true" />
 
             <div v-if="item.url">
-              <el-link type="danger" class="button" v-if="item.main == true"
+              <el-link
+                type="danger"
+                class="button"
+                v-if="item.main == true"
                 >商品主图</el-link
               >
               <el-link
@@ -61,8 +64,7 @@
                 class="button"
                 v-else
                 @click="changeMainPicture(index)"
-                >设为主图</el-link
-              >
+                >设为主图</el-link>
             </div>
 
             <div v-else>
@@ -103,15 +105,15 @@ const dataFormRef = ref(ElForm);
 const props = defineProps({
   modelValue: {
     type: Object,
-    default: () => {}
-  }
+    default: () => {},
+  },
 });
 
 const goodsInfo: any = computed({
   get: () => props.modelValue,
-  set: value => {
+  set: (value) => {
     emit('update:modelValue', value);
-  }
+  },
 });
 
 const state = reactive({
@@ -122,14 +124,14 @@ const state = reactive({
     { url: undefined, main: false },
     { url: undefined, main: false },
     { url: undefined, main: false },
-    { url: undefined, main: false }
+    { url: undefined, main: false },
   ] as Array<any>,
   rules: {
     name: [{ required: true, message: '请填写商品名称', trigger: 'blur' }],
     originPrice: [{ required: true, message: '请填写原价', trigger: 'blur' }],
     price: [{ required: true, message: '请填写现价', trigger: 'blur' }],
-    brandId: [{ required: true, message: '请选择商品品牌', trigger: 'blur' }]
-  }
+    brandId: [{ required: true, message: '请选择商品品牌', trigger: 'blur' }],
+  },
 });
 
 const { brandOptions, pictures, rules } = toRefs(state);
@@ -142,7 +144,7 @@ function loadData() {
   if (goodsId) {
     const mainPicUrl = goodsInfo.value.picUrl;
     if (mainPicUrl) {
-      state.pictures.filter(item => item.main)[0].url = mainPicUrl;
+      state.pictures.filter((item) => item.main)[0].url = mainPicUrl;
     }
     const subPicUrls = goodsInfo.value.subPicUrls;
     if (subPicUrls && subPicUrls.length > 0) {
@@ -175,14 +177,14 @@ function handleNext() {
     if (valid) {
       // 商品图片
       const mainPicUrl = state.pictures
-        .filter(item => item.main == true && item.url)
-        .map(item => item.url);
+        .filter((item) => item.main == true && item.url)
+        .map((item) => item.url);
       if (mainPicUrl && mainPicUrl.length > 0) {
         goodsInfo.value.picUrl = mainPicUrl[0];
       }
       const subPicUrl = state.pictures
-        .filter(item => item.main == false && item.url)
-        .map(item => item.url);
+        .filter((item) => item.main == false && item.url)
+        .map((item) => item.url);
       if (subPicUrl && subPicUrl.length > 0) {
         goodsInfo.value.subPicUrls = subPicUrl;
       }
diff --git a/src/views/pms/goods/components/GoodsStock.vue b/src/views/pms/goods/components/GoodsStock.vue
index 995d595d..2e52cefc 100644
--- a/src/views/pms/goods/components/GoodsStock.vue
+++ b/src/views/pms/goods/components/GoodsStock.vue
@@ -187,7 +187,7 @@ import {
   reactive,
   ref,
   toRefs,
-  watch
+  watch,
 } from 'vue';
 import { useRouter } from 'vue-router';
 import { Plus, Minus } from '@element-plus/icons-vue';
@@ -216,39 +216,41 @@ const props = defineProps({
     type: Object,
     default: () => {
       return {};
-    }
-  }
+    },
+  },
 });
 
 const goodsInfo: any = computed({
   get: () => props.modelValue,
-  set: value => {
+  set: (value) => {
     emit('update:modelValue', value);
-  }
+  },
 });
 
 const state = reactive({
   specForm: {
-    specList: [] as any[]
+    specList: [] as any[],
   },
   skuForm: {
-    skuList: [] as any[]
+    skuList: [] as any[],
   },
   // 规格项表格标题
   specTitles: [] as any[],
   rules: {
     spec: {
       name: [{ required: true, message: '请输入规格名称', trigger: 'blur' }],
-      value: [{ required: true, message: '请输入规格值', trigger: 'blur' }]
+      value: [{ required: true, message: '请输入规格值', trigger: 'blur' }],
     },
     sku: {
       skuSn: [{ required: true, message: '请输入商品编号', trigger: 'blur' }],
       price: [{ required: true, message: '请输入商品价格', trigger: 'blur' }],
-      stockNum: [{ required: true, message: '请输入商品库存', trigger: 'blur' }]
-    }
+      stockNum: [
+        { required: true, message: '请输入商品库存', trigger: 'blur' },
+      ],
+    },
   },
   colors: ['', 'success', 'warning', 'danger'],
-  tagInputs: [{ value: undefined, visible: false }] // 规格值标签临时值和显隐控制
+  tagInputs: [{ value: undefined, visible: false }], // 规格值标签临时值和显隐控制
 });
 
 const { specForm, skuForm, specTitles, rules, colors, tagInputs } =
@@ -256,7 +258,7 @@ const { specForm, skuForm, specTitles, rules, colors, tagInputs } =
 
 watch(
   () => goodsInfo.value.categoryId,
-  newVal => {
+  (newVal) => {
     // 商品编辑不加载分类下的规格
     const goodsId = goodsInfo.value.id;
     if (goodsId) {
@@ -264,13 +266,13 @@ watch(
     }
     if (newVal) {
       // type=1 商品分类下的规格
-      listAttributes({ categoryId: newVal, type: 1 }).then(response => {
+      listAttributes({ categoryId: newVal, type: 1 }).then((response) => {
         const specList = response.data;
         if (specList && specList.length > 0) {
           specList.forEach((item: any) => {
             state.specForm.specList.push({
               name: item.name,
-              values: []
+              values: [],
             });
           });
           loadData();
@@ -280,7 +282,7 @@ watch(
   },
   {
     immediate: true,
-    deep: true
+    deep: true,
   }
 );
 
@@ -297,14 +299,14 @@ function loadData() {
       (state.specForm.specList[specIndex] as any).values.push({
         id: specItem.id,
         value: specItem.value,
-        picUrl: specItem.picUrl
+        picUrl: specItem.picUrl,
       });
     } else {
       state.specForm.specList.push({
         name: specItem.name,
         values: [
-          { id: specItem.id, value: specItem.value, picUrl: specItem.picUrl }
-        ]
+          { id: specItem.id, value: specItem.value, picUrl: specItem.picUrl },
+        ],
       });
     }
   });
@@ -388,7 +390,7 @@ function generateSkuList() {
   const specList = JSON.parse(
     JSON.stringify(
       state.specForm.specList.filter(
-        item => item.values && item.values.length > 0
+        (item) => item.values && item.values.length > 0
       )
     )
   ); // 深拷贝，取有属性的规格项，否则笛卡尔积运算得到的SKU列表值为空
@@ -527,11 +529,11 @@ function handleSpecValueInput(rowIndex: any) {
         }, 0);
       state.specForm.specList[rowIndex].values[specValues.length] = {
         value: currSpecValue,
-        id: 'tid_' + (rowIndex + 1) + '_' + ++maxSpecValueIndex
+        id: 'tid_' + (rowIndex + 1) + '_' + ++maxSpecValueIndex,
       };
     } else {
       state.specForm.specList[rowIndex].values = [
-        { value: currSpecValue, id: 'tid_' + (rowIndex + 1) + '_1' }
+        { value: currSpecValue, id: 'tid_' + (rowIndex + 1) + '_1' },
       ];
     }
   }
@@ -549,7 +551,7 @@ function handleSpecValueInput(rowIndex: any) {
 const objectSpanMethod = ({ rowIndex, columnIndex }: any) => {
   let mergeRows = [1, 1, 1]; // 分别对应规格1、规格2、规格3列合并的行数
   const specLen = state.specForm.specList.filter(
-    item => item.values && item.values.length > 0
+    (item) => item.values && item.values.length > 0
   ).length;
   if (specLen == 2) {
     const values_len_2 = state.specForm.specList[1].values
@@ -600,7 +602,7 @@ function submitForm() {
           delete submitsData.skuList;
 
           let specList = [] as any[];
-          state.specForm.specList.forEach(item => {
+          state.specForm.specList.forEach((item) => {
             item.values.forEach((value: any) => {
               value.name = item.name;
             });
@@ -626,7 +628,7 @@ function submitForm() {
               ElNotification({
                 title: '提示',
                 message: '编辑商品成功',
-                type: 'success'
+                type: 'success',
               });
             });
           } else {
@@ -636,7 +638,7 @@ function submitForm() {
               ElNotification({
                 title: '提示',
                 message: '新增商品成功',
-                type: 'success'
+                type: 'success',
               });
             });
           }
diff --git a/src/views/pms/goods/detail.vue b/src/views/pms/goods/detail.vue
index 80f90263..398cb090 100644
--- a/src/views/pms/goods/detail.vue
+++ b/src/views/pms/goods/detail.vue
@@ -53,7 +53,7 @@ import GoodsStock from './components/GoodsStock.vue';
 
 import { getGoodsDetail } from '@/api/pms/goods';
 import { useRoute } from 'vue-router';
-import { GoodsDetail } from '@/types';
+import { GoodsDetail } from '@/types/api/pms/goods';
 
 const route = useRoute();
 
@@ -64,8 +64,8 @@ const state = reactive({
     album: [],
     attrList: [],
     specList: [],
-    skuList: []
-  } as GoodsDetail
+    skuList: [],
+  } as GoodsDetail,
 });
 
 const { loaded, active, goodsInfo } = toRefs(state);
@@ -74,7 +74,7 @@ function loadData() {
   const goodsId = route.query.goodsId as string;
 
   if (goodsId) {
-    getGoodsDetail(goodsId).then(response => {
+    getGoodsDetail(goodsId).then((response) => {
       state.goodsInfo = response.data;
       state.goodsInfo.originPrice = (state.goodsInfo.originPrice as any) / 100;
       state.goodsInfo.price = (state.goodsInfo.price as any) / 100;
diff --git a/src/views/pms/goods/index.vue b/src/views/pms/goods/index.vue
index e5b31438..8ac7b4d7 100644
--- a/src/views/pms/goods/index.vue
+++ b/src/views/pms/goods/index.vue
@@ -1,7 +1,7 @@
 <!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
 <script lang="ts">
 export default {
-  name: 'goods'
+  name: 'goods',
 };
 </script>
 
@@ -16,11 +16,11 @@ import {
   Edit,
   Refresh,
   Delete,
-  View
+  View,
 } from '@element-plus/icons-vue';
-import { listGoodsPages, deleteGoods } from '@/api/pms/goods';
+import { listPageGoods, deleteGoods } from '@/api/pms/goods';
 import { listCascadeCategories } from '@/api/pms/category';
-import { GoodsItem, GoodsQueryParam } from '@/types';
+import { GoodsItem, GoodsQueryParam } from '@/types/api/pms/goods';
 import { moneyFormatter } from '@/utils/filter';
 
 const dataTableRef = ref(ElTable);
@@ -38,12 +38,12 @@ const state = reactive({
   total: 0,
   queryParams: {
     pageNum: 1,
-    pageSize: 10
+    pageSize: 10,
   } as GoodsQueryParam,
   goodsList: [] as GoodsItem[],
   categoryOptions: [],
   goodDetail: undefined,
-  dialogVisible: false
+  dialogVisible: false,
 });
 
 const {
@@ -54,12 +54,12 @@ const {
   categoryOptions,
   goodDetail,
   total,
-  dialogVisible
+  dialogVisible,
 } = toRefs(state);
 
 function handleQuery() {
   state.loading = true;
-  listGoodsPages(state.queryParams).then(({ data }) => {
+  listPageGoods(state.queryParams).then(({ data }) => {
     state.goodsList = data.list;
     state.total = data.total;
     state.loading = false;
@@ -71,7 +71,7 @@ function resetQuery() {
     pageNum: 1,
     pageSize: 10,
     name: undefined,
-    categoryId: undefined
+    categoryId: undefined,
   };
   handleQuery();
 }
@@ -88,7 +88,7 @@ function handleAdd() {
 function handleUpdate(row: any) {
   router.push({
     path: 'goods-detail',
-    query: { goodsId: row.id, categoryId: row.categoryId }
+    query: { goodsId: row.id, categoryId: row.categoryId },
   });
 }
 
@@ -97,7 +97,7 @@ function handleDelete(row: any) {
   ElMessageBox.confirm('是否确认删除选中的数据项?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning'
+    type: 'warning',
   })
     .then(function () {
       return deleteGoods(ids);
@@ -119,7 +119,7 @@ function handleSelectionChange(selection: any) {
 }
 
 onMounted(() => {
-  listCascadeCategories({}).then(response => {
+  listCascadeCategories({}).then((response) => {
     state.categoryOptions = ref(response.data);
   });
   handleQuery();
diff --git a/src/views/sms/advert/index.vue b/src/views/sms/advert/index.vue
index b74fab47..c1aedc35 100644
--- a/src/views/sms/advert/index.vue
+++ b/src/views/sms/advert/index.vue
@@ -1,7 +1,6 @@
-<!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
 <script lang="ts">
 export default {
-  name: 'advert'
+  name: 'advert',
 };
 </script>
 
@@ -11,13 +10,18 @@ import { ElForm, ElMessage, ElMessageBox } from 'element-plus';
 import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue';
 import SingleUpload from '@/components/Upload/SingleUpload.vue';
 import {
-  listAdvertPages,
+  listAdvertsPage,
   getAdvertFormDetail,
   updateAdvert,
   addAdvert,
-  deleteAdverts
+  deleteAdverts,
 } from '@/api/sms/advert';
-import { AdvertFormData, AdvertItem, AdvertQueryParam, Dialog } from '@/types';
+import { Dialog } from '@/types/common';
+import {
+  AdvertFormData,
+  AdvertItem,
+  AdvertQueryParam,
+} from '@/types/api/sms/advert';
 
 const queryFormRef = ref(ElForm); // 属性名必须和元素的ref属性值一致
 const dataFormRef = ref(ElForm); // 属性名必须和元素的ref属性值一致
@@ -36,14 +40,14 @@ const state = reactive({
   dialog: {} as Dialog,
   formData: {
     status: 1,
-    sort: 100
+    sort: 100,
   } as AdvertFormData,
   rules: {
     title: [{ required: true, message: '请输入广告名称', trigger: 'blur' }],
     beginTime: [{ required: true, message: '请填写开始时间', trigger: 'blur' }],
     endTime: [{ required: true, message: '请填写结束时间', trigger: 'blur' }],
-    picUrl: [{ required: true, message: '请上传广告图片', trigger: 'blur' }]
-  }
+    picUrl: [{ required: true, message: '请上传广告图片', trigger: 'blur' }],
+  },
 });
 
 const {
@@ -54,12 +58,12 @@ const {
   total,
   dialog,
   formData,
-  rules
+  rules,
 } = toRefs(state);
 
 function handleQuery() {
   state.loading = true;
-  listAdvertPages(state.queryParams).then(({ data }) => {
+  listAdvertsPage(state.queryParams).then(({ data }) => {
     state.advertList = data.list;
     state.total = data.total;
     state.loading = false;
@@ -80,17 +84,17 @@ 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 advertId = row.id || state.ids;
-  getAdvertFormDetail(advertId).then(response => {
+  getAdvertFormDetail(advertId).then((response) => {
     state.formData = response.data;
   });
 }
@@ -127,7 +131,7 @@ function handleDelete(row: any) {
   ElMessageBox.confirm('确认删除已选中的数据项?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning'
+    type: 'warning',
   })
     .then(() => {
       deleteAdverts(ids).then(() => {
diff --git a/src/views/system/role/components/Role.vue b/src/views/sms/coupon/index.vue
similarity index 50%
rename from src/views/system/role/components/Role.vue
rename to src/views/sms/coupon/index.vue
index 563c11ba..1ea17f6c 100644
--- a/src/views/system/role/components/Role.vue
+++ b/src/views/sms/coupon/index.vue
@@ -1,25 +1,28 @@
-<!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
 <script lang="ts">
 export default {
-  name: 'role'
+  name: 'advert',
 };
 </script>
 
 <script setup lang="ts">
 import { onMounted, reactive, ref, toRefs } from 'vue';
-import {
-  listRolePages,
-  updateRole,
-  getRoleFormDetail,
-  addRole,
-  deleteRoles
-} from '@/api/system/role';
 import { ElForm, ElMessage, ElMessageBox } from 'element-plus';
 import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue';
-import { RoleFormData, RoleItem, RoleQueryParam } from '@/types';
+import {
+  listCouponsPage,
+  getCouponFormDetail,
+  updateCoupon,
+  addCoupon,
+  deleteCoupons,
+} from '@/api/sms/coupon';
+import { Dialog } from '@/types/common';
+import {
+  CouponItem,
+  CouponQueryParam,
+  CouponFormData,
+} from '@/types/api/sms/coupon';
 
-const emit = defineEmits(['roleClick']);
-const queryFormRef = ref(ElForm);
+const queryFormRef = ref(ElForm); // 属性名必须和元素的ref属性值一致
 const dataFormRef = ref(ElForm); // 属性名必须和元素的ref属性值一致
 
 const state = reactive({
@@ -30,39 +33,38 @@ const state = reactive({
   single: true,
   // 非多个禁用
   multiple: true,
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10
-  } as RoleQueryParam,
-  roleList: [] as RoleItem[],
+  queryParams: { pageNum: 1, pageSize: 10 } as CouponQueryParam,
+  couponList: [] as CouponItem[],
   total: 0,
-  dialog: {
-    title: '',
-    visible: false
-  },
-  formData: {} as RoleFormData,
+  dialog: {} as Dialog,
+  formData: {
+    id: undefined,
+    name: '',
+    type: '',
+  } as CouponFormData,
   rules: {
-    name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }],
-    code: [{ required: true, message: '请输入角色编码', trigger: 'blur' }]
-  }
+    title: [{ required: true, message: '请输入优惠券名称', trigger: 'blur' }],
+    beginTime: [{ required: true, message: '请填写开始时间', trigger: 'blur' }],
+    endTime: [{ required: true, message: '请填写结束时间', trigger: 'blur' }],
+    picUrl: [{ required: true, message: '请上传优惠券图片', trigger: 'blur' }],
+  },
 });
 
 const {
   loading,
   multiple,
   queryParams,
-  roleList,
+  couponList,
   total,
   dialog,
   formData,
-  rules
+  rules,
 } = toRefs(state);
 
 function handleQuery() {
-  emit('roleClick', {});
   state.loading = true;
-  listRolePages(state.queryParams).then(({ data }) => {
-    state.roleList = data.list;
+  listCouponsPage(state.queryParams).then(({ data }) => {
+    state.couponList = data.list;
     state.total = data.total;
     state.loading = false;
   });
@@ -79,39 +81,36 @@ function handleSelectionChange(selection: any) {
   state.multiple = !selection.length;
 }
 
-function handleRowClick(row: any) {
-  emit('roleClick', row);
-}
-
 function handleAdd() {
   state.dialog = {
-    title: '添加角色',
-    visible: true
+    title: '添加优惠券',
+    visible: true,
   };
 }
 
 function handleUpdate(row: any) {
   state.dialog = {
-    title: '修改角色',
-    visible: true
+    title: '修改优惠券',
+    visible: true,
   };
-  const roleId = row.id || state.ids;
-  getRoleFormDetail(roleId).then(({ data }) => {
-    state.formData = data;
+  const advertId = row.id || state.ids;
+  getCouponFormDetail(advertId).then((response) => {
+    state.formData = response.data;
   });
 }
 
 function submitForm() {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      if (state.formData.id) {
-        updateRole(state.formData.id as any, state.formData).then(() => {
+      const avertId = state.formData.id;
+      if (avertId) {
+        updateCoupon(avertId, state.formData).then(() => {
           ElMessage.success('修改成功');
           cancel();
           handleQuery();
         });
       } else {
-        addRole(state.formData).then(() => {
+        addCoupon(state.formData).then(() => {
           ElMessage.success('新增成功');
           cancel();
           handleQuery();
@@ -121,12 +120,10 @@ function submitForm() {
   });
 }
 
-/**
- * 重置表单
- */
 function cancel() {
-  state.dialog.visible = false;
+  state.formData.id = undefined;
   dataFormRef.value.resetFields();
+  state.dialog.visible = false;
 }
 
 function handleDelete(row: any) {
@@ -134,10 +131,10 @@ function handleDelete(row: any) {
   ElMessageBox.confirm('确认删除已选中的数据项?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning'
+    type: 'warning',
   })
     .then(() => {
-      deleteRoles(ids).then(() => {
+      deleteCoupons(ids).then(() => {
         ElMessage.success('删除成功');
         handleQuery();
       });
@@ -167,15 +164,14 @@ onMounted(() => {
         >
       </el-form-item>
 
-      <el-form-item prop="name">
+      <el-form-item prop="title">
         <el-input
-          v-model="queryParams.name"
-          placeholder="角色名称"
+          v-model="queryParams.status"
+          placeholder="优惠券标题"
           clearable
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-
       <el-form-item>
         <el-button type="primary" :icon="Search" @click="handleQuery"
           >搜索</el-button
@@ -184,20 +180,38 @@ onMounted(() => {
       </el-form-item>
     </el-form>
 
-    <!-- 数据表格 -->
     <el-table
-      ref="dataTableRef"
       v-loading="loading"
-      :data="roleList"
+      :data="couponList"
       @selection-change="handleSelectionChange"
-      @row-click="handleRowClick"
-      highlight-current-row
       border
     >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色名称" prop="name" />
-      <el-table-column label="角色编码" prop="code" />
-      <el-table-column label="操作" align="center" width="120">
+      <el-table-column type="selection" min-width="5" align="center" />
+      <el-table-column type="index" label="序号" width="80" align="center" />
+      <el-table-column prop="title" min-width="100" label="优惠券标题" />
+      <el-table-column label="优惠券图片" width="100">
+        <template #default="scope">
+          <el-popover placement="right" :width="400" trigger="hover">
+            <img :src="scope.row.picUrl" width="400" height="400" />
+            <template #reference>
+              <img
+                :src="scope.row.picUrl"
+                style="max-height: 60px; max-width: 60px"
+              />
+            </template>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column prop="beginTime" label="开始时间" width="150" />
+      <el-table-column prop="endTime" label="结束时间" width="150" />
+      <el-table-column prop="status" label="状态" width="100">
+        <template #default="scope">
+          <el-tag v-if="scope.row.status === 1" type="success">开启</el-tag>
+          <el-tag v-else type="info">关闭</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sort" label="排序" width="80" />
+      <el-table-column label="操作" align="center" width="150">
         <template #default="scope">
           <el-button
             type="primary"
@@ -227,41 +241,53 @@ onMounted(() => {
     />
 
     <!-- 表单弹窗 -->
-    <el-dialog
-      :title="dialog.title"
-      v-model="dialog.visible"
-      @close="cancel"
-      width="450px"
-    >
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="700px">
       <el-form
         ref="dataFormRef"
         :model="formData"
         :rules="rules"
         label-width="100px"
       >
-        <el-form-item label="角色名称" prop="name">
-          <el-input v-model="formData.name" placeholder="请输入角色名称" />
+        <!--   <el-form-item label="优惠券标题" prop="title">
+          <el-input v-model="formData.title" />
         </el-form-item>
 
-        <el-form-item label="角色编码" prop="code">
-          <el-input v-model="formData.code" placeholder="请输入角色编码" />
-        </el-form-item>
-
-        <el-form-item label="排序" prop="sort">
-          <el-input-number
-            v-model="formData.sort"
-            controls-position="right"
-            :min="0"
-            style="width: 100px"
+        <el-form-item label="有效期" prop="beginTime">
+          <el-date-picker
+            v-model="formData.beginTime"
+            placeholder="开始时间"
+            value-format="YYYY-MM-DD"
+          />
+          ~
+          <el-date-picker
+            v-model="formData.endTime"
+            placeholder="结束时间"
+            value-format="YYYY-MM-DD"
           />
         </el-form-item>
 
-        <el-form-item label="状态">
+        <el-form-item label="优惠券图片" prop="picUrl">
+          <single-upload v-model="formData.picUrl" />
+        </el-form-item>
+
+        <el-form-item label="排序" prop="sort">
+          <el-input v-model="formData.sort" style="width: 200px" />
+        </el-form-item>
+
+        <el-form-item label="状态" prop="status">
           <el-radio-group v-model="formData.status">
-            <el-radio :label="1">正常</el-radio>
-            <el-radio :label="0">停用</el-radio>
+            <el-radio :label="1">开启</el-radio>
+            <el-radio :label="0">关闭</el-radio>
           </el-radio-group>
         </el-form-item>
+
+        <el-form-item label="跳转链接" prop="url">
+          <el-input v-model="formData.url" />
+        </el-form-item>
+
+        <el-form-item label="备注" prop="remark">
+          <el-input type="textarea" v-model="formData.remark" />
+        </el-form-item> -->
       </el-form>
 
       <template #footer>
@@ -273,5 +299,3 @@ onMounted(() => {
     </el-dialog>
   </div>
 </template>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index a880a30e..553d31b5 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -1,7 +1,7 @@
 <!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
 <script lang="ts">
 export default {
-  name: 'client'
+  name: 'client',
 };
 </script>
 
@@ -11,12 +11,18 @@ import {
   getClientFormDetial,
   addClient,
   updateClient,
-  deleteClients
+  deleteClients,
 } from '@/api/system/client';
 import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue';
 import { onMounted, reactive, getCurrentInstance, ref, toRefs } from 'vue';
 import { ElForm, ElMessage, ElMessageBox } from 'element-plus';
-import { ClientFormData, ClientItem, ClientQueryParam, Option } from '@/types';
+import {
+  ClientFormData,
+  ClientItem,
+  ClientQueryParam,
+} from '@/types/api/system/client';
+import { Option } from '@/types/common';
+
 const { proxy }: any = getCurrentInstance();
 
 const queryFormRef = ref(ElForm);
@@ -31,21 +37,23 @@ const state = reactive({
   multiple: true,
   queryParams: {
     pageNum: 1,
-    pageSize: 10
+    pageSize: 10,
   } as ClientQueryParam,
   clientList: [] as ClientItem[],
   total: 0,
   dialog: {
     title: '',
     visible: false,
-    type: 'create'
+    type: 'create',
   },
   formData: {} as ClientFormData,
   rules: {
-    clientId: [{ required: true, message: '客户端ID不能为空', trigger: 'blur' }]
+    clientId: [
+      { required: true, message: '客户端ID不能为空', trigger: 'blur' },
+    ],
   },
   authorizedGrantTypesOptions: [] as Option[],
-  checkedAuthorizedGrantTypes: [] as string[]
+  checkedAuthorizedGrantTypes: [] as string[],
 });
 
 const {
@@ -59,7 +67,7 @@ const {
   formData,
   rules,
   authorizedGrantTypesOptions,
-  checkedAuthorizedGrantTypes
+  checkedAuthorizedGrantTypes,
 } = toRefs(state);
 
 function handleQuery() {
@@ -82,14 +90,14 @@ function handleSelectionChange(selection: any) {
 }
 
 function handleAdd() {
-  proxy.$listDictsByCode('grant_type').then((response: any) => {
+  proxy.$getDictItemsByTypeCode('grant_type').then((response: any) => {
     state.authorizedGrantTypesOptions = response.data;
   });
 
   state.dialog = {
     title: '添加客户端',
     visible: true,
-    type: 'create'
+    type: 'create',
   };
 }
 
@@ -97,11 +105,11 @@ function handleUpdate(row: any) {
   state.dialog = {
     title: '修改客户端',
     visible: true,
-    type: 'edit'
+    type: 'edit',
   };
   const clientId = row.clientId || ids;
 
-  proxy.$listDictsByCode('grant_type').then((res: any) => {
+  proxy.$getDictItemsByTypeCode('grant_type').then((res: any) => {
     state.authorizedGrantTypesOptions = res.data;
 
     getClientFormDetial(clientId).then(({ data }) => {
@@ -149,7 +157,7 @@ function handleDelete(row: any) {
   ElMessageBox.confirm('确认删除已选中的数据项?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning'
+    type: 'warning',
   })
     .then(() => {
       deleteClients(clientIds).then(() => {
@@ -182,10 +190,10 @@ onMounted(() => {
         >
       </el-form-item>
 
-      <el-form-item prop="clientId">
+      <el-form-item>
         <el-input
-          v-model="queryParams.clientId"
-          placeholder="输入客户端ID"
+          v-model="queryParams.keywords"
+          placeholder="客户端ID"
           clearable
           style="width: 240px"
           @keyup.enter="handleQuery"
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index c97868b5..deb4a0d0 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,7 +1,6 @@
-<!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
 <script lang="ts">
 export default {
-  name: 'dept'
+  name: 'dept',
 };
 </script>
 
@@ -11,12 +10,12 @@ import { onMounted, reactive, ref, toRefs } from 'vue';
 
 // API依赖
 import {
-  getDeptDetail,
+  getDeptForrmData,
   deleteDept,
   updateDept,
   addDept,
   listSelectDepartments,
-  listTableDepartments
+  listDepartments,
 } from '@/api/system/dept';
 
 // 组件依赖
@@ -26,9 +25,8 @@ import {
   DeptFormData,
   DeptItem,
   DeptQueryParam,
-  Dialog,
-  Option
-} from '@/types';
+} from '@/types/api/system/dept';
+import { Dialog, Option } from '@/types/common';
 
 // DOM元素的引用声明定义
 const queryFormRef = ref(ElForm);
@@ -51,16 +49,16 @@ const state = reactive({
   // 表单数据
   formData: {
     sort: 1,
-    status: 1
+    status: 1,
   } as DeptFormData,
   // 表单参数校验
   rules: {
     parentId: [
-      { required: true, message: '上级部门不能为空', trigger: 'blur' }
+      { required: true, message: '上级部门不能为空', trigger: 'blur' },
     ],
     name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
-    sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }]
-  }
+    sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
+  },
 });
 
 const {
@@ -71,7 +69,7 @@ const {
   queryParams,
   formData,
   rules,
-  dialog
+  dialog,
 } = toRefs(state);
 
 /**
@@ -79,7 +77,7 @@ const {
  */
 function handleQuery() {
   state.loading = true;
-  listTableDepartments(state.queryParams).then(({ data }) => {
+  listDepartments(state.queryParams).then(({ data }) => {
     state.deptList = data;
     state.loading = false;
   });
@@ -103,11 +101,11 @@ function handleSelectionChange(selection: any) {
  */
 async function loadDeptData() {
   const deptOptions: any[] = [];
-  listSelectDepartments().then(response => {
+  listSelectDepartments().then((response) => {
     const rootDeptOption = {
       value: '0',
       label: '顶级部门',
-      children: response.data
+      children: response.data,
     };
     deptOptions.push(rootDeptOption);
     state.deptOptions = deptOptions;
@@ -123,7 +121,7 @@ function handleAdd(row: any) {
   state.formData.parentId = row.id;
   state.dialog = {
     title: '添加部门',
-    visible: true
+    visible: true,
   };
 }
 
@@ -135,9 +133,9 @@ async function handleUpdate(row: any) {
   const deptId = row.id || state.ids;
   state.dialog = {
     title: '修改部门',
-    visible: true
+    visible: true,
   };
-  getDeptDetail(deptId).then((response: any) => {
+  getDeptForrmData(deptId).then((response: any) => {
     state.formData = response.data;
   });
 }
@@ -175,7 +173,7 @@ function handleDelete(row: any) {
   ElMessageBox.confirm(`确认删除已选中的数据项?`, '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning'
+    type: 'warning',
   })
     .then(() => {
       deleteDept(ids)
diff --git a/src/views/system/dict/components/DictItem.vue b/src/views/system/dict/components/DictItem.vue
index 3b83ff35..33f83c79 100644
--- a/src/views/system/dict/components/DictItem.vue
+++ b/src/views/system/dict/components/DictItem.vue
@@ -1,3 +1,188 @@
+<script lang="ts">
+export default {
+  name: 'dictItem',
+};
+</script>
+
+<script setup lang="ts">
+import { onMounted, reactive, ref, toRefs, watch } from 'vue';
+import { ElForm, ElMessage, ElMessageBox } from 'element-plus';
+import {
+  DictItem,
+  DictItemFormData,
+  DictItemQueryParam,
+} from '@/types/api/system/dict';
+
+import { Dialog } from '@/types/common';
+import {
+  listPageDictItems,
+  getDictItemData,
+  addDictItem,
+  updateDictItem,
+  deleteDictItems,
+} from '@/api/system/dict';
+import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue';
+
+const props = defineProps({
+  typeCode: {
+    type: String,
+    default: () => {
+      return '';
+    },
+  },
+  typeName: {
+    type: String,
+    default: () => {
+      return '';
+    },
+  },
+});
+
+watch(
+  () => props.typeCode,
+  (value) => {
+    state.queryParams.typeCode = value;
+    state.formData.typeCode = value;
+    handleQuery();
+  }
+);
+
+const queryFormRef = ref(ElForm);
+const dataFormRef = ref(ElForm);
+
+const state = reactive({
+  loading: true,
+  // 选中ID数组
+  ids: [] as number[],
+  // 非单个禁用
+  single: true,
+  // 非多个禁用
+  multiple: true,
+  total: 0,
+  queryParams: { pageNum: 1, pageSize: 10 } as DictItemQueryParam,
+  dictItemList: [] as DictItem[],
+  dialog: { visible: false } as Dialog,
+  formData: {
+    typeCode: props.typeCode,
+    typeName: props.typeName,
+    status: 1,
+    sort: 1,
+  } as DictItemFormData,
+  rules: {
+    name: [{ required: true, message: '请输入字典项名称', trigger: 'blur' }],
+    value: [{ required: true, message: '请输入字典项值', trigger: 'blur' }],
+  },
+  localDictCode: props.typeCode,
+  localDictName: props.typeName,
+});
+
+const {
+  loading,
+  multiple,
+  queryParams,
+  dictItemList,
+  dialog,
+  formData,
+  rules,
+  total,
+} = toRefs(state);
+
+function handleQuery() {
+  if (state.queryParams.typeCode) {
+    state.loading = true;
+    listPageDictItems(state.queryParams).then(({ data }) => {
+      state.dictItemList = data.list;
+      state.total = data.total;
+      state.loading = false;
+    });
+  } else {
+    state.dictItemList = [];
+    state.total = 0;
+    state.queryParams.pageNum = 1;
+    state.loading = false;
+  }
+}
+
+function resetQuery() {
+  queryFormRef.value.resetFields();
+  handleQuery();
+}
+
+function handleSelectionChange(selection: any) {
+  state.ids = selection.map((item: any) => item.id);
+  state.single = selection.length !== 1;
+  state.multiple = !selection.length;
+}
+
+function handleAdd() {
+  if (!state.formData.typeCode) {
+    ElMessage.warning('请选择字典类型后添加数据项');
+    return;
+  }
+  state.dialog = {
+    title: '添加字典数据项',
+    visible: true,
+  };
+}
+
+function handleUpdate(row: any) {
+  state.dialog = {
+    title: '修改字典数据项',
+    visible: true,
+  };
+  const id = row.id || state.ids;
+  getDictItemData(id).then(({ data }) => {
+    state.formData = data;
+  });
+}
+
+function submitForm() {
+  dataFormRef.value.validate((isValid: boolean) => {
+    if (isValid) {
+      if (state.formData.id) {
+        updateDictItem(state.formData.id, state.formData).then(() => {
+          ElMessage.success('修改成功');
+          cancel();
+          handleQuery();
+        });
+      } else {
+        addDictItem(state.formData).then(() => {
+          ElMessage.success('新增成功');
+          cancel();
+          handleQuery();
+        });
+      }
+    }
+  });
+}
+
+function cancel() {
+  state.dialog.visible = false;
+  state.formData.id = undefined;
+  dataFormRef.value.resetFields();
+}
+
+function handleDelete(row: any) {
+  const ids = [row.id || state.ids].join(',');
+  ElMessageBox.confirm('确认删除已选中的数据项?', '警告', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+      deleteDictItems(ids).then(() => {
+        ElMessage.success('删除成功');
+        handleQuery();
+      });
+    })
+    .catch(() => ElMessage.info('已取消删除'));
+}
+
+onMounted(() => {
+  handleQuery();
+});
+</script>
+
 <template>
   <div class="app-container">
     <!-- 搜索表单 -->
@@ -86,12 +271,15 @@
         :rules="rules"
         label-width="100px"
       >
-        <el-form-item label="字典名称"> </el-form-item>
-        <el-form-item label="字典项名称" prop="name">
-          <el-input v-model="formData.name" placeholder="请输入字典项名称" />
+        <el-form-item label="字典类型名称">{{ typeName }}</el-form-item>
+        <el-form-item label="数据项名称" prop="name">
+          <el-input
+            v-model="formData.name"
+            placeholder="请输入字典数据项名称"
+          />
         </el-form-item>
-        <el-form-item label="字典项值" prop="value">
-          <el-input v-model="formData.value" placeholder="请输入字典项值" />
+        <el-form-item label="数据项值" prop="value">
+          <el-input v-model="formData.value" placeholder="请输入字典数据项值" />
         </el-form-item>
         <el-form-item label="排序" prop="sort">
           <el-input-number
@@ -120,181 +308,3 @@
     </el-dialog>
   </div>
 </template>
-
-<script setup lang="ts">
-import { onMounted, reactive, ref, toRefs, watch } from 'vue';
-import { ElForm, ElMessage, ElMessageBox } from 'element-plus';
-import {
-  Dialog,
-  DictItem,
-  DictItemFormData,
-  DictItemQueryParam
-} from '@/types';
-import {
-  listDictItemPages,
-  getDictItemDetail,
-  addDictItem,
-  updateDictItem,
-  deleteDictItem
-} from '@/api/system/dict';
-import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue';
-
-const props = defineProps({
-  dictCode: {
-    type: String,
-    default: () => {
-      return '';
-    }
-  },
-  dictName: {
-    type: String,
-    default: () => {
-      return '';
-    }
-  }
-});
-
-watch(
-  () => props.dictCode,
-  value => {
-    state.queryParams.dictCode = value;
-    state.formData.dictCode = value;
-    handleQuery();
-  }
-);
-
-const queryFormRef = ref(ElForm);
-const dataFormRef = ref(ElForm);
-
-const state = reactive({
-  loading: true,
-  // 选中ID数组
-  ids: [] as number[],
-  // 非单个禁用
-  single: true,
-  // 非多个禁用
-  multiple: true,
-  total: 0,
-  queryParams: { pageNum: 1, pageSize: 10 } as DictItemQueryParam,
-  dictItemList: [] as DictItem[],
-  dialog: { visible: false } as Dialog,
-  formData: {
-    dictCode: props.dictCode,
-    dictName: props.dictName,
-    status: 1,
-    sort: 1
-  } as DictItemFormData,
-  rules: {
-    name: [{ required: true, message: '请输入字典项名称', trigger: 'blur' }],
-    value: [{ required: true, message: '请输入字典项值', trigger: 'blur' }]
-  },
-  localDictCode: props.dictCode,
-  localDictName: props.dictName
-});
-
-const {
-  loading,
-  multiple,
-  queryParams,
-  dictItemList,
-  dialog,
-  formData,
-  rules,
-  total
-} = toRefs(state);
-
-function handleQuery() {
-  if (state.queryParams.dictCode) {
-    state.loading = true;
-    listDictItemPages(state.queryParams).then(({ data }) => {
-      state.dictItemList = data.list;
-      state.total = data.total;
-      state.loading = false;
-    });
-  } else {
-    state.dictItemList = [];
-    state.total = 0;
-    state.queryParams.pageNum = 1;
-    state.loading = false;
-  }
-}
-
-function resetQuery() {
-  queryFormRef.value.resetFields();
-  handleQuery();
-}
-
-function handleSelectionChange(selection: any) {
-  state.ids = selection.map((item: any) => item.id);
-  state.single = selection.length !== 1;
-  state.multiple = !selection.length;
-}
-
-function handleAdd() {
-  if (!state.formData.dictCode) {
-    ElMessage.warning('请选择字典后添加数据项');
-    return;
-  }
-  state.dialog = {
-    title: '添加字典项',
-    visible: true
-  };
-}
-
-function handleUpdate(row: any) {
-  state.dialog = {
-    title: '修改字典项',
-    visible: true
-  };
-  const id = row.id || state.ids;
-  getDictItemDetail(id).then(({ data }) => {
-    state.formData = data;
-  });
-}
-
-function submitForm() {
-  dataFormRef.value.validate((isValid: boolean) => {
-    if (isValid) {
-      if (state.formData.id) {
-        updateDictItem(state.formData.id, state.formData).then(() => {
-          ElMessage.success('修改成功');
-          cancel();
-          handleQuery();
-        });
-      } else {
-        addDictItem(state.formData).then(() => {
-          ElMessage.success('新增成功');
-          cancel();
-          handleQuery();
-        });
-      }
-    }
-  });
-}
-
-function cancel() {
-  state.dialog.visible = false;
-  state.formData.id = undefined;
-  dataFormRef.value.resetFields();
-}
-
-function handleDelete(row: any) {
-  const ids = [row.id || state.ids].join(',');
-  ElMessageBox.confirm('确认删除已选中的数据项?', '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  })
-    .then(() => {
-      deleteDictItem(ids).then(() => {
-        ElMessage.success('删除成功');
-        handleQuery();
-      });
-    })
-    .catch(() => ElMessage.info('已取消删除'));
-}
-
-onMounted(() => {
-  handleQuery();
-});
-</script>
diff --git a/src/views/system/dict/components/Dict.vue b/src/views/system/dict/components/DictType.vue
similarity index 90%
rename from src/views/system/dict/components/Dict.vue
rename to src/views/system/dict/components/DictType.vue
index 91c126b8..e2398934 100644
--- a/src/views/system/dict/components/Dict.vue
+++ b/src/views/system/dict/components/DictType.vue
@@ -1,7 +1,6 @@
-<!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
 <script lang="ts">
 export default {
-  name: 'dict'
+  name: 'dictType',
 };
 </script>
 
@@ -132,15 +131,21 @@ export default {
 <script setup lang="ts">
 import { onMounted, reactive, ref, toRefs } from 'vue';
 import {
-  listDictPages,
-  getDictFormDetail,
-  addDict,
-  updateDict,
-  deleteDict
+  listPageDictTypes,
+  getDictFormData,
+  addDictType,
+  updateDictType,
+  deleteDictTypes,
 } from '@/api/system/dict';
 import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue';
 import { ElForm, ElMessage, ElMessageBox } from 'element-plus';
-import { Dialog, Dict, DictFormData, DictQueryParam } from '@/types';
+
+import { Dialog } from '@/types/common';
+import {
+  Dict,
+  DictFormTypeData,
+  DictQueryParam,
+} from '@/types/api/system/dict';
 
 const queryFormRef = ref(ElForm);
 const dataFormRef = ref(ElForm);
@@ -157,18 +162,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
-  } as DictFormData,
+    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 } =
@@ -177,7 +182,7 @@ const { total, dialog, loading, dictList, formData, rules, queryParams } =
 function handleQuery() {
   emit('dictClick', null);
   state.loading = true;
-  listDictPages(state.queryParams).then(({ data }) => {
+  listPageDictTypes(state.queryParams).then(({ data }) => {
     state.dictList = data.list;
     state.total = data.total;
     state.loading = false;
@@ -198,17 +203,17 @@ 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;
-  getDictFormDetail(id).then(({ data }) => {
+  getDictFormData(id).then(({ data }) => {
     state.formData = data;
   });
 }
@@ -217,13 +222,13 @@ function submitForm() {
   dataFormRef.value.validate((isValid: boolean) => {
     if (isValid) {
       if (state.formData.id) {
-        updateDict(state.formData.id, state.formData).then(() => {
+        updateDictType(state.formData.id, state.formData).then(() => {
           ElMessage.success('修改成功');
           cancel();
           handleQuery();
         });
       } else {
-        addDict(state.formData).then(() => {
+        addDictType(state.formData).then(() => {
           ElMessage.success('新增成功');
           cancel();
           handleQuery();
@@ -244,10 +249,10 @@ function handleDelete(row: any) {
   ElMessageBox.confirm('确认删除已选中的数据项?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning'
+    type: 'warning',
   })
     .then(() => {
-      deleteDict(ids).then(() => {
+      deleteDictTypes(ids).then(() => {
         ElMessage.success('删除成功');
         handleQuery();
       });
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index cc2f16b2..ca1789ff 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,56 +1,55 @@
+<script setup lang="ts">
+import SvgIcon from '@/components/SvgIcon/index.vue';
+import DictType from './components/DictType.vue';
+import DictItem from './components/DictItem.vue';
+
+import { reactive, toRefs } from 'vue';
+
+const state = reactive({
+  typeCode: '',
+  typeName: '',
+});
+
+const { typeCode, typeName } = toRefs(state);
+
+const handleDictTypeClick = (row: any) => {
+  if (row) {
+    state.typeName = row.name;
+    state.typeCode = row.code;
+  } else {
+    state.typeName = '';
+    state.typeCode = '';
+  }
+};
+</script>
+
 <template>
   <div class="app-container">
     <el-row :gutter="10">
       <el-col :span="12" :xs="24">
         <el-card class="box-card">
           <template #header>
-            <svg-icon color="#333" icon-class="education" />
-            字典列表
+            <svg-icon icon-class="dict" />
+            字典类型
           </template>
-          <!-- 字典列表子组件 -->
-          <dict @dictClick="handleDictClick" />
+          <dict-type @dictClick="handleDictTypeClick" />
         </el-card>
       </el-col>
 
       <el-col :span="12" :xs="24">
         <el-card class="box-card">
           <template #header>
-            <svg-icon color="#333" icon-class="dict" />
+            <svg-icon icon-class="dict_item" />
             <span style="margin: 0 5px">字典数据项</span>
-            <el-tag type="success" v-if="dictCode" size="small">{{
-              dictName
+            <el-tag type="success" v-if="typeCode" size="small">{{
+              typeName
             }}</el-tag>
             <el-tag type="warning" v-else size="small">未选择字典</el-tag>
           </template>
           <!-- 字典项组件 -->
-          <dict-item :dictName="dictName" :dictCode="dictCode" />
+          <dict-item :typeName="typeName" :typeCode="typeCode" />
         </el-card>
       </el-col>
     </el-row>
   </div>
 </template>
-
-<script setup lang="ts">
-import SvgIcon from '@/components/SvgIcon/index.vue';
-import Dict from './components/Dict.vue';
-import DictItem from './components/DictItem.vue';
-
-import { reactive, toRefs } from 'vue';
-
-const state = reactive({
-  dictCode: '',
-  dictName: '' // 字典名称，用于字典项组件回显
-});
-
-const { dictCode, dictName } = toRefs(state);
-
-const handleDictClick = (dictRow: any) => {
-  if (dictRow) {
-    state.dictName = dictRow.name;
-    state.dictCode = dictRow.code;
-  } else {
-    state.dictName = '';
-    state.dictCode = '';
-  }
-};
-</script>
diff --git a/src/views/system/menu/components/Menu.vue b/src/views/system/menu/components/Menu.vue
index 590a3466..13e2f649 100644
--- a/src/views/system/menu/components/Menu.vue
+++ b/src/views/system/menu/components/Menu.vue
@@ -170,7 +170,7 @@
                 @click="iconSelectVisible = true"
               >
                 <template #prefix>
-                  <svg-icon :icon-class="formData.icon" style="margin: auto" />
+                  <svg-icon :icon-class="formData.icon" />
                 </template>
               </el-input>
             </template>
@@ -220,21 +220,21 @@ import { reactive, ref, onMounted, toRefs } from 'vue';
 import { Search, Plus, Edit, Refresh, Delete } from '@element-plus/icons-vue';
 import { ElForm, ElMessage, ElMessageBox, ElPopover } from 'element-plus';
 
+import { Dialog, Option } from '@/types/common';
+
 import {
-  Dialog,
-  Option,
   MenuFormData,
   MenuItem,
-  MenuQueryParam
-} from '@/types';
+  MenuQueryParam,
+} from '@/types/api/system/menu';
 // API 依赖
 import {
-  listTableMenus,
+  listMenus,
   getMenuDetail,
   listSelectMenus,
   addMenu,
   deleteMenus,
-  updateMenu
+  updateMenu,
 } from '@/api/system/menu';
 
 import SvgIcon from '@/components/SvgIcon/index.vue';
@@ -262,7 +262,7 @@ const state = reactive({
     visible: 1,
     sort: 1,
     component: 'Layout',
-    type: 'MENU'
+    type: 'MENU',
   } as MenuFormData,
   rules: {
     parentId: [{ required: true, message: '请选择顶级菜单', trigger: 'blur' }],
@@ -270,8 +270,8 @@ const state = reactive({
     type: [{ required: true, message: '请选择菜单类型', trigger: 'blur' }],
     path: [{ required: true, message: '请输入路由路径', trigger: 'blur' }],
     component: [
-      { required: true, message: '请输入组件完整路径', trigger: 'blur' }
-    ]
+      { required: true, message: '请输入组件完整路径', trigger: 'blur' },
+    ],
   },
   menuOptions: [] as Option[],
   currentRow: undefined,
@@ -279,8 +279,8 @@ const state = reactive({
   iconSelectVisible: false,
   cacheData: {
     menuType: '',
-    menuPath: ''
-  }
+    menuPath: '',
+  },
 });
 
 const {
@@ -292,7 +292,7 @@ const {
   rules,
   menuOptions,
   iconSelectVisible,
-  cacheData
+  cacheData,
 } = toRefs(state);
 
 /**
@@ -302,7 +302,7 @@ function handleQuery() {
   // 重置父组件
   emit('menuClick', null);
   state.loading = true;
-  listTableMenus(state.queryParams).then(({ data }) => {
+  listMenus(state.queryParams).then(({ data }) => {
     state.menuList = data;
     state.loading = false;
   });
@@ -338,7 +338,7 @@ async function handleAdd(row: any) {
   await loadMenuData();
   state.dialog = {
     title: '添加菜单',
-    visible: true
+    visible: true,
   };
   if (row.id) {
     // 行点击新增
@@ -368,7 +368,7 @@ async function handleUpdate(row: any) {
   await loadMenuData();
   state.dialog = {
     title: '修改菜单',
-    visible: true
+    visible: true,
   };
   const id = row.id || state.ids;
   getMenuDetail(id).then(({ data }) => {
@@ -417,7 +417,7 @@ function handleDelete(row: any) {
   ElMessageBox.confirm('确认删除已选中的数据项?', '警告', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
-    type: 'warning'
+    type: 'warning',
   })
     .then(() => {
       deleteMenus(ids).then(() => {
diff --git a/src/views/system/menu/components/Perm.vue b/src/views/system/menu/components/Perm.vue
index 4e8444b1..a00e8a24 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,18 +13,18 @@ import {
   getPermFormDetail,
   addPerm,
   updatePerm,
-  deletePerms
+  deletePerms,
 } from '@/api/system/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 {
-  Dialog,
   PermFormData,
   PermItem,
   PermQueryParam,
-  Option
-} from '@/types';
+} from '@/types/api/system/perm';
 
 const { proxy }: any = getCurrentInstance();
 
@@ -34,13 +34,15 @@ const dataFormRef = ref(ElForm);
 const props = defineProps({
   menuId: {
     type: String,
-    default: () => {}
-  }
+    default: () => {
+      return '';
+    },
+  },
 });
 
 watch(
   () => props.menuId,
-  value => {
+  (value) => {
     state.queryParams.menuId = value;
     handleQuery();
   }
@@ -56,26 +58,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 {
@@ -89,7 +91,7 @@ const {
   microServiceOptions,
   requestMethodOptions,
   urlPerm,
-  queryParams
+  queryParams,
 } = toRefs(state);
 
 function handleQuery() {
@@ -123,11 +125,11 @@ function handleSelectionChange(selection: any) {
  * 加载字典数据
  */
 function loadDictOptions() {
-  proxy.$listDictsByCode('micro_service').then((response: any) => {
+  proxy.$getDictItemsByTypeCode('micro_service').then((response: any) => {
     state.microServiceOptions = response.data;
   });
 
-  proxy.$listDictsByCode('request_method').then((response: any) => {
+  proxy.$getDictItemsByTypeCode('request_method').then((response: any) => {
     state.requestMethodOptions = response.data;
   });
 }
@@ -136,7 +138,7 @@ function handleAdd() {
   loadDictOptions();
   state.dialog = {
     title: '添加权限',
-    visible: true
+    visible: true,
   };
 }
 
@@ -144,10 +146,10 @@ 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) {
@@ -169,6 +171,7 @@ function submitForm() {
   dataFormRef.value.validate((isValid: any) => {
     if (isValid) {
       // 接口权限和按钮权限必填其一
+      console.log(state.urlPerm.requestPath, state.formData.btnPerm);
       if (!(state.urlPerm.requestPath || state.formData.btnPerm)) {
         ElMessage.warning('请至少填写一种权限');
         return false;
@@ -217,7 +220,7 @@ function resetForm() {
   state.urlPerm = {
     requestMethod: '',
     serviceName: '',
-    requestPath: ''
+    requestPath: '',
   };
 }
 
@@ -231,7 +234,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 e31eb23f..b9df5126 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -4,7 +4,7 @@
       <el-col :span="10" :xs="24">
         <el-card class="box-card" shadow="always">
           <template #header>
-            <svg-icon color="#333" icon-class="menu" />
+            <svg-icon icon-class="menu" />
             菜单列表
           </template>
           <menu-table @menuClick="handleMenuClick" />
@@ -13,7 +13,7 @@
       <el-col :span="14" :xs="24">
         <el-card class="box-card" shadow="always">
           <template #header>
-            <svg-icon color="#333" icon-class="perm" />
+            <svg-icon icon-class="perm" />
             <span style="margin: 0 5px">权限列表</span>
             <el-tag type="success" v-if="menuId" size="small">{{
               menuName
@@ -38,7 +38,7 @@ import { reactive, toRefs } from 'vue';
 
 const state = reactive({
   menuId: undefined,
-  menuName: ''
+  menuName: '',
 });
 
 const { menuId, menuName } = toRefs(state);
diff --git a/src/views/system/role/components/Menu.vue b/src/views/system/role/components/Menu.vue
deleted file mode 100644
index 39e9d173..00000000
--- a/src/views/system/role/components/Menu.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
-<script lang="ts">
-export default {
-  name: 'cmenu'
-};
-</script>
-
-<script setup lang="ts">
-import { nextTick, onMounted, reactive, ref, toRefs, watch } from 'vue';
-import { listSelectMenus } from '@/api/system/menu';
-import { listRoleMenuIds, updateRoleMenu } from '@/api/system/role';
-import { ElTree, ElMessage } from 'element-plus';
-import { Switch, Position } from '@element-plus/icons-vue';
-import { Option } from '@/types';
-
-const emit = defineEmits(['menuClick']);
-const props = defineProps({
-  role: {
-    type: Object,
-    default: () => {}
-  }
-});
-
-const menuRef = ref(ElTree); // 属性名必须和元素的ref属性值一致
-
-watch(
-  () => props.role.id,
-  newVal => {
-    if (newVal) {
-      state.checkStrictly = true;
-      // 获取角色拥有的的菜单ID
-      listRoleMenuIds(newVal).then(({ data }) => {
-        menuRef.value.setCheckedKeys(data);
-        state.checkStrictly = false;
-      });
-    }
-  }
-);
-
-const state = reactive({
-  expandedKeys: [], // 展开的节点
-  menuOptions: [] as Option[],
-  checkStrictly: false,
-  isExpandAll: true,
-  refreshTree: true
-});
-
-const { expandedKeys, menuOptions, checkStrictly, isExpandAll, refreshTree } =
-  toRefs(state);
-
-/**
- * 加载菜单树
- */
-async function loadMenuData() {
-  await listSelectMenus().then(({ data }) => {
-    state.menuOptions = data;
-  });
-}
-
-function handleNodeClick(node: any) {
-  emit('menuClick', node);
-}
-
-/**
- * 展开/收缩
- */
-function toggleExpandAll() {
-  state.refreshTree = false;
-  state.isExpandAll = !state.isExpandAll;
-  nextTick(() => {
-    state.refreshTree = true;
-  });
-}
-
-/**
- * 保存角色菜单
- */
-function handleSubmit() {
-  const checkedMenuIds = menuRef.value
-    .getCheckedNodes(false, true)
-    .map((node: any) => node.value);
-  updateRoleMenu(props.role.id, checkedMenuIds).then(() => {
-    ElMessage.success('提交成功');
-  });
-}
-
-onMounted(() => {
-  loadMenuData();
-});
-</script>
-
-<template>
-  <div class="app-container">
-    <el-row>
-      <el-col :span="12">
-        <el-button plain :icon="Switch" @click="toggleExpandAll"
-          >展开/折叠</el-button
-        >
-      </el-col>
-      <el-col :span="12" style="text-align: right">
-        <el-button type="primary" :icon="Position" @click="handleSubmit"
-          >提交</el-button
-        >
-      </el-col>
-    </el-row>
-
-    <el-tree
-      class="menu-tree"
-      ref="menuRef"
-      v-if="refreshTree"
-      :default-expanded-keys="expandedKeys"
-      :default-expand-all="isExpandAll"
-      :data="menuOptions"
-      show-checkbox
-      node-key="value"
-      empty-text="加载菜单中..."
-      :check-strictly="checkStrictly"
-      highlight-current
-      @node-click="handleNodeClick"
-    />
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.menu-tree {
-  margin-top: 10px;
-}
-</style>
diff --git a/src/views/system/role/components/Perm.vue b/src/views/system/role/components/Perm.vue
deleted file mode 100644
index 380b9d0d..00000000
--- a/src/views/system/role/components/Perm.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-  <div class="perm-container">
-    <div v-if="permissionOptions.length > 0">
-      <el-row>
-        <el-col :span="12">
-          <el-checkbox
-            :indeterminate="isIndeterminate"
-            v-model="checkAll"
-            @change="handleCheckAllChange"
-            >全选
-          </el-checkbox>
-        </el-col>
-        <el-col :span="12" style="text-align: right">
-          <el-button type="primary" :icon="Position" @click="handleSubmit"
-            >提交</el-button
-          >
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col
-          :span="8"
-          v-for="item in permissionOptions"
-          style="margin-top: 20px"
-          :key="item.id"
-        >
-          <el-checkbox
-            border
-            v-model="item.checked"
-            :label="item.id"
-            :key="item.id"
-            @change="handleCheckedPermChange"
-          >
-            {{ item.name }}
-          </el-checkbox>
-        </el-col>
-      </el-row>
-    </div>
-    <div style="text-align: center" v-else>
-      <el-empty
-        :description="
-          !role
-            ? '请选择角色'
-            : !menu
-            ? '请选择菜单'
-            : '暂无数据，您可在【菜单管理】配置权限数据'
-        "
-      ></el-empty>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { onMounted, reactive, toRefs, watch } from 'vue';
-import { listPerms } from '@/api/system/perm';
-import { listRolePerms, saveRolePerms } from '@/api/system/role';
-import { ElMessage } from 'element-plus';
-import { Position } from '@element-plus/icons-vue';
-import { PermQueryParam } from '@/types';
-
-const props = defineProps({
-  role: {
-    type: Object,
-    default: () => {
-      return {};
-    }
-  },
-  menu: {
-    type: Object,
-    default: () => {
-      return {};
-    }
-  }
-});
-
-watch(
-  () => props.menu.id,
-  value => {
-    if (value) {
-      loadData();
-    }
-  }
-);
-
-const state = reactive({
-  loading: false,
-  permissionOptions: [] as Array<any>,
-  isIndeterminate: true,
-  checkAll: false,
-  checkedPerms: []
-});
-
-const { permissionOptions, isIndeterminate, checkAll } = toRefs(state);
-
-function handleCheckAllChange(checked: any) {
-  state.isIndeterminate = false;
-  if (checked) {
-    state.permissionOptions.map(item => (item.checked = true));
-  } else {
-    // 全不选
-    state.permissionOptions.map(item => (item.checked = false));
-  }
-}
-
-function handleCheckedPermChange() {
-  const checkedCount = state.permissionOptions.filter(
-    item => item.checked
-  ).length;
-  state.checkAll = checkedCount === state.permissionOptions.length;
-  state.isIndeterminate =
-    checkedCount > 0 && checkedCount < state.permissionOptions.length;
-}
-
-function loadData() {
-  if (!props.menu.id) {
-    resetData();
-    return false;
-  }
-  state.loading = true;
-
-  const params = { menuId: props.menu.id } as PermQueryParam;
-  listPerms(params).then(({ data }) => {
-    state.permissionOptions = data;
-    listRolePerms(props.role.id, props.menu.id).then(response => {
-      const checkedPermIds = response.data;
-      state.permissionOptions.map((item: any) => {
-        if (checkedPermIds.includes(item.id)) {
-          item.checked = true;
-        } else {
-          state.checkAll = false;
-        }
-      });
-      state.loading = false;
-    });
-  });
-}
-
-function handleSubmit() {
-  const checkedPermIds = state.permissionOptions
-    .filter(item => item.checked)
-    .map(item => item.id);
-  saveRolePerms(props.role.id, props.menu.id, checkedPermIds).then(() => {
-    ElMessage.success('提交成功');
-  });
-}
-
-function resetData() {
-  state.permissionOptions = [];
-  state.isIndeterminate = true;
-  state.checkAll = false;
-}
-
-onMounted(() => {
-  loadData();
-});
-</script>
-
-<style scoped>
-.perm-container {
-  width: 100%;
-}
-</style>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 61def509..a44f8e13 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,116 +1,462 @@
+<script lang="ts">
+export default {
+  name: 'role',
+};
+</script>
+
+<script setup lang="ts">
+import { nextTick, onMounted, reactive, ref, toRefs } from 'vue';
+import {
+  listPageRoles,
+  updateRole,
+  getRoleFormDetail,
+  addRole,
+  deleteRoles,
+  getRoleResourceIds,
+  updateRoleResource,
+} from '@/api/system/role';
+import { getResource } from '@/api/system/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 SvgIcon from '@/components/SvgIcon/index.vue';
+
+const emit = defineEmits(['roleClick']);
+const queryFormRef = ref(ElForm);
+const dataFormRef = ref(ElForm);
+const resourceRef = ref(ElTree);
+
+const state = reactive({
+  loading: true,
+  // 选中ID数组
+  ids: [],
+  // 非单个禁用
+  single: true,
+  // 非多个禁用
+  multiple: true,
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+  } as RoleQueryParam,
+  roleList: [] as RoleItem[],
+  total: 0,
+  dialog: {
+    title: '',
+    visible: false,
+  },
+  formData: {} as RoleFormData,
+  rules: {
+    name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }],
+    code: [{ required: true, message: '请输入角色编码', trigger: 'blur' }],
+  },
+  resourceDialogVisible: false,
+  menuOptions: [] as any[],
+  permOptions: [] as any[],
+  checkStrictly: false,
+  permGroupList: [],
+  checkedRole: {
+    id: '',
+    name: '',
+  }, // 选中的角色
+});
+
+const {
+  loading,
+  multiple,
+  queryParams,
+  roleList,
+  total,
+  dialog,
+  formData,
+  rules,
+  resourceDialogVisible,
+  menuOptions,
+  permOptions,
+  checkedRole,
+  checkStrictly,
+} = toRefs(state);
+
+function handleQuery() {
+  emit('roleClick', {});
+  state.loading = true;
+  listPageRoles(state.queryParams).then(({ data }) => {
+    state.roleList = data.list;
+    state.total = data.total;
+    state.loading = false;
+  });
+}
+
+function resetQuery() {
+  queryFormRef.value.resetFields();
+  handleQuery();
+}
+
+function handleSelectionChange(selection: any) {
+  state.ids = selection.map((item: any) => item.id);
+  state.single = selection.length !== 1;
+  state.multiple = !selection.length;
+}
+
+function handleRowClick(row: any) {
+  emit('roleClick', row);
+}
+
+function handleAdd() {
+  state.dialog = {
+    title: '添加角色',
+    visible: true,
+  };
+}
+
+function handleUpdate(row: any) {
+  state.dialog = {
+    title: '修改角色',
+    visible: true,
+  };
+  const roleId = row.id || state.ids;
+  getRoleFormDetail(roleId).then(({ data }) => {
+    state.formData = data;
+  });
+}
+
+function submitFormData() {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      if (state.formData.id) {
+        updateRole(state.formData.id as any, state.formData).then(() => {
+          ElMessage.success('修改成功');
+          cancel();
+          handleQuery();
+        });
+      } else {
+        addRole(state.formData).then(() => {
+          cancel();
+          ElMessage.success('新增成功');
+          handleQuery();
+        });
+      }
+    }
+  });
+}
+
+/**
+ * 弹窗关闭
+ */
+function cancel() {
+  state.dialog.visible = false;
+  dataFormRef.value.resetFields();
+}
+
+/**
+ *  删除
+ */
+function handleDelete(row: any) {
+  const ids = [row.id || state.ids].join(',');
+  ElMessageBox.confirm('确认删除已选中的数据项?', '警告', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning',
+  })
+    .then(() => {
+      deleteRoles(ids).then(() => {
+        ElMessage.success('删除成功');
+        handleQuery();
+      });
+    })
+    .catch(() => ElMessage.info('已取消删除'));
+}
+
+/**
+ * 分配资源权限
+ */
+function handleResourceAssign(row: RoleItem) {
+  resourceDialogVisible.value = true;
+  permOptions.value.map((item) => (item.checked = false));
+
+  const roleId: any = row.id;
+  checkedRole.value = {
+    id: roleId,
+    name: row.name,
+  };
+  //资源下拉数据
+  getResource().then((response) => {
+    checkStrictly.value = true; // 父子节点不互相关联
+    state.menuOptions = response.data.menus;
+    state.permOptions = response.data.perms;
+
+    // 获取角色拥有的资源数据进行勾选
+    getRoleResourceIds(roleId).then((res) => {
+      const checkedMenuIds = res.data.menuIds;
+      const checkedPermIds = res.data.permIds;
+
+      nextTick(() => {
+        resourceRef.value.setCheckedKeys(checkedMenuIds);
+        permOptions.value.forEach((perm) => {
+          if (checkedPermIds.includes(perm.value)) {
+            perm.checked = true;
+          } else {
+            perm.checked = false;
+          }
+        });
+      });
+      checkStrictly.value = false; // 父子节点互相关联
+    });
+  });
+}
+
+/**
+ * 提交资源权限
+ */
+function handleRoleResourceSubmit() {
+  const checkedMenuIds: any[] = resourceRef.value
+    .getCheckedNodes(false, true)
+    .map((node: any) => node.value);
+
+  const checkedPermIds = state.permOptions
+    .filter((item) => item.checked)
+    .map((item) => item.value);
+
+  const roleResourceData = {
+    menuIds: checkedMenuIds,
+    permIds: checkedPermIds,
+  };
+
+  updateRoleResource(checkedRole.value.id, roleResourceData).then((res) => {
+    ElMessage.success('修改成功');
+    state.resourceDialogVisible = false;
+    handleQuery();
+  });
+}
+
+// 取消资源分配
+function cancelResourceAssign() {
+  state.resourceDialogVisible = false;
+}
+
+onMounted(() => {
+  handleQuery();
+});
+</script>
+
 <template>
   <div class="app-container">
-    <el-row :gutter="10">
-      <el-col :span="10" :xs="24">
-        <el-card class="box-card" shadow="always">
-          <template #header>
-            <svg-icon color="#333" icon-class="role" />
-            角色列表
-          </template>
-          <Role ref="role" @roleClick="handleRoleClick" />
-        </el-card>
-      </el-col>
+    <!-- 搜索表单 -->
+    <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+      <el-form-item>
+        <el-button type="success" :icon="Plus" @click="handleAdd"
+          >新增</el-button
+        >
+        <el-button
+          type="danger"
+          :icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          >删除</el-button
+        >
+      </el-form-item>
 
-      <el-col :span="6" :xs="24">
-        <el-card class="box-card" shadow="always">
-          <template #header>
-            <svg-icon color="#333" icon-class="menu" />
-            <span style="margin: 0 5px">菜单分配</span>
-            <el-tag type="success" v-if="role.id">
-              <svg-icon color="green" icon-class="role" />
-              {{ role.name }}
-            </el-tag>
-            <el-tag type="warning" v-else size="small">请选择角色</el-tag>
-          </template>
-          <Menus ref="menu" @menuClick="handleMenuClick" :role="role" />
-        </el-card>
-      </el-col>
+      <el-form-item prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="角色名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
 
-      <el-col :span="8" :xs="24">
-        <el-card class="box-card" shadow="always">
-          <template #header>
+      <el-form-item>
+        <el-button type="primary" :icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button :icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 数据表格 -->
+    <el-table
+      ref="dataTableRef"
+      v-loading="loading"
+      :data="roleList"
+      @selection-change="handleSelectionChange"
+      @row-click="handleRowClick"
+      highlight-current-row
+      border
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="角色名称" prop="name" />
+      <el-table-column label="角色编码" prop="code" />
+      <el-table-column label="操作" align="center" width="200">
+        <template #default="scope">
+          <el-button
+            type="primary"
+            circle
+            plain
+            @click.stop="handleResourceAssign(scope.row)"
+          >
             <svg-icon icon-class="perm" />
-            <span style="margin: 0 5px">权限分配</span>
+          </el-button>
 
-            <el-tag type="success" style="margin: 0 5px 0 0" v-if="role.id">
-              <svg-icon color="green" icon-class="role" />
-              {{ role.name }}
-            </el-tag>
-            <el-tag
-              type="warning"
-              style="margin: 0 5px 0 0"
-              v-else
-              size="small"
-            >
-              请选择角色</el-tag
-            >
+          <el-button
+            type="primary"
+            :icon="Edit"
+            circle
+            plain
+            @click.stop="handleUpdate(scope.row)"
+          />
+          <el-button
+            type="danger"
+            :icon="Delete"
+            circle
+            plain
+            @click.stop="handleDelete(scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
 
-            <el-tag type="success" v-if="menu.id" size="small">
-              <svg-icon icon-class="menu" />
-              {{ menu.name }}
-            </el-tag>
-            <el-tag type="warning" v-else size="small"> 请选择菜单</el-tag>
+    <!-- 分页工具条 -->
+    <pagination
+      v-if="total > 0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="handleQuery"
+    />
+
+    <!-- 表单弹窗 -->
+    <el-dialog
+      :title="dialog.title"
+      v-model="dialog.visible"
+      width="500px"
+      destroy-on-close
+    >
+      <el-form
+        ref="dataFormRef"
+        :model="formData"
+        :rules="rules"
+        label-width="100px"
+      >
+        <el-form-item label="角色名称" prop="name">
+          <el-input v-model="formData.name" placeholder="请输入角色名称" />
+        </el-form-item>
+
+        <el-form-item label="角色编码" prop="code">
+          <el-input v-model="formData.code" placeholder="请输入角色编码" />
+        </el-form-item>
+
+        <el-form-item label="排序" prop="sort">
+          <el-input-number
+            v-model="formData.sort"
+            controls-position="right"
+            :min="0"
+            style="width: 100px"
+          />
+        </el-form-item>
+
+        <el-form-item label="状态">
+          <el-radio-group v-model="formData.status">
+            <el-radio :label="1">正常</el-radio>
+            <el-radio :label="0">停用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFormData">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog
+      :title="'【' + checkedRole.name + '】资源权限'"
+      v-model="resourceDialogVisible"
+      width="1000px"
+    >
+      <el-scrollbar max-height="600px">
+        <el-tree
+          ref="resourceRef"
+          node-key="value"
+          show-checkbox
+          :data="menuOptions"
+          :default-expand-all="true"
+        >
+          <template #default="{ node, data }">
+            <div v-if="data.isPerm == true" class="resource-tree-node">
+              <div class="resource-tree-node__content">
+                <el-checkbox
+                  v-for="perm in permOptions.filter(
+                    (perm) => perm.parentId == data.permPid
+                  )"
+                  :key="perm.value"
+                  :label="perm.value"
+                  v-model="perm.checked"
+                  border
+                  size="small"
+                  >{{ perm.label }}</el-checkbox
+                >
+              </div>
+            </div>
+            <span v-else>{{ node.label }}</span>
           </template>
-          <perm ref="perm" :menu="menu" :role="role" />
-        </el-card>
-      </el-col>
-    </el-row>
+        </el-tree>
+      </el-scrollbar>
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="handleRoleResourceSubmit"
+            >确 定</el-button
+          >
+          <el-button @click="cancelResourceAssign">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
-<script setup lang="ts">
-import { reactive, toRefs } from 'vue';
-import { ElMessage } from 'element-plus';
-import SvgIcon from '@/components/SvgIcon/index.vue';
+<style lang="scss">
+.resource-tree-node {
+  width: 100%;
+  flex-wrap: wrap;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
+  margin-left: -28px !important;
 
-import Role from './components/Role.vue';
-import Menus from './components/Menu.vue';
-import Perm from './components/Perm.vue';
-
-const state = reactive({
-  role: {
-    id: undefined,
-    name: ''
-  },
-  menu: {
-    id: undefined,
-    name: ''
+  &__content {
+    display: flex;
+    flex-wrap: wrap;
   }
-});
+  .el-checkbox--default {
+    background-color: transparent !important;
+  }
+}
+.el-tree-node__content {
+  height: auto !important;
+}
 
-const { role, menu } = toRefs(state);
-
-function handleRoleClick(roleRow: any) {
-  if (roleRow) {
-    state.role = {
-      id: roleRow.id,
-      name: roleRow.name
-    };
-  } else {
-    state.role = {
-      id: undefined,
-      name: ''
-    };
+.el-checkbox-group {
+  display: flex;
+  flex-wrap: wrap;
+  &:hover {
+    background-color: var(--el-tree-node-hover-bg-color);
+  }
+  &:active {
+    background-color: var(--el-tree-node-hover-bg-color);
   }
 }
 
-function handleMenuClick(menuRow: any) {
-  if (!state.role.id) {
-    ElMessage.warning('请选择角色');
-    return false;
-  }
-  if (menuRow) {
-    state.menu = {
-      id: menuRow.value,
-      name: menuRow.label
-    };
-  } else {
-    state.menu = {
-      id: undefined,
-      name: ''
-    };
-  }
+.el-checkbox.el-checkbox--small {
+  margin: 5px;
+  z-index: 999;
+  background: #fff;
 }
-</script>
-
-<style scoped></style>
+</style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f3b10234..6af5d65f 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,7 +1,6 @@
-<!-- setup 无法设置组件名称，组件名称keepAlive必须 -->
 <script lang="ts">
 export default {
-  name: 'user'
+  name: 'user',
 };
 </script>
 
@@ -13,23 +12,23 @@ import {
   watchEffect,
   onMounted,
   getCurrentInstance,
-  toRefs
+  toRefs,
 } from 'vue';
 
 // 导入API
 import {
   listUsersPage,
-  getUserDetail,
+  getUserFormData,
   deleteUsers,
   addUser,
   updateUser,
   updateUserPart,
   downloadTemplate,
   exportUser,
-  importUser
+  importUser,
 } from '@/api/system/user';
 import { listSelectDepartments } from '@/api/system/dept';
-import { listRoles } from '@/api/system/role';
+import { listSelectRoles } from '@/api/system/role';
 
 // 组件依赖
 import {
@@ -37,7 +36,7 @@ import {
   ElMessageBox,
   ElTree,
   ElForm,
-  UploadFile
+  UploadFile,
 } from 'element-plus';
 import {
   Search,
@@ -48,17 +47,16 @@ import {
   Lock,
   Download,
   Top,
-  UploadFilled
+  UploadFilled,
 } from '@element-plus/icons-vue';
 import {
   UserItem,
   UserQueryParam,
   UserFormData,
-  Option,
-  RoleItem,
-  Dialog,
-  UserImportFormData
-} from '@/types';
+  UserImportFormData,
+} from '@/types/api/system/user';
+
+import { Option, Dialog } from '@/types/common';
 
 // DOM元素的引用声明定义 ，变量名和DOM的ref属性值一致
 const deptTreeRef = ref(ElTree); // 部门树
@@ -83,7 +81,7 @@ const state = reactive({
   userList: [] as UserItem[],
   // 弹窗属性
   dialog: {
-    visible: false
+    visible: false,
   } as Dialog,
   deptName: undefined,
   // 部门树选项
@@ -92,47 +90,47 @@ const state = reactive({
   // 性别状态字典
   genderOptions: [] as any[],
   // 角色选项
-  roleOptions: [] as RoleItem[],
+  roleOptions: [] as Option[],
   // 表单参数
   formData: {
-    status: 1
+    status: 1,
   } as UserFormData,
   // 查询参数
   queryParams: {
     pageNum: 1,
-    pageSize: 10
+    pageSize: 10,
   } as UserQueryParam,
   // 表单校验
   rules: {
     username: [{ required: true, message: '用户名不能为空', trigger: 'blur' }],
     nickname: [
-      { required: true, message: '用户昵称不能为空', trigger: 'blur' }
+      { required: true, message: '用户昵称不能为空', trigger: 'blur' },
     ],
-    deptId: [{ required: true, message: '归属部门不能为空', trigger: 'blur' }],
+    deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
     roleIds: [{ required: true, message: '用户角色不能为空', trigger: 'blur' }],
     email: [
       {
         pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,
         message: '请输入正确的邮箱地址',
-        trigger: 'blur'
-      }
+        trigger: 'blur',
+      },
     ],
     mobile: [
       {
         pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
         message: '请输入正确的手机号码',
-        trigger: 'blur'
-      }
-    ]
+        trigger: 'blur',
+      },
+    ],
   },
 
   importDialog: {
     title: '用户导出',
-    visible: false
+    visible: false,
   } as Dialog,
   importFormData: {} as UserImportFormData,
   excelFile: undefined as any,
-  excelFilelist: [] as File[]
+  excelFilelist: [] as File[],
 });
 
 const {
@@ -149,7 +147,7 @@ const {
   roleOptions,
   importDialog,
   importFormData,
-  excelFilelist
+  excelFilelist,
 } = toRefs(state);
 
 /**
@@ -160,7 +158,7 @@ watchEffect(
     deptTreeRef.value.filter(state.deptName);
   },
   {
-    flush: 'post' // watchEffect会在DOM挂载或者更新之前就会触发，此属性控制在DOM元素更新后运行
+    flush: 'post', // watchEffect会在DOM挂载或者更新之前就会触发，此属性控制在DOM元素更新后运行
   }
 );
 
@@ -186,7 +184,7 @@ function handleDeptNodeClick(data: { [key: string]: any }) {
  * 加载角色数据
  */
 async function loadRoleOptions() {
-  listRoles().then(response => {
+  listSelectRoles().then((response) => {
     state.roleOptions = response.data;
   });
 }
@@ -202,7 +200,7 @@ function handleStatusChange(row: { [key: string]: any }) {
     {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
-      type: 'warning'
+      type: 'warning',
     }
   )
     .then(() => {
@@ -254,7 +252,7 @@ function resetPassword(row: { [key: string]: any }) {
     '重置密码',
     {
       confirmButtonText: '确定',
-      cancelButtonText: '取消'
+      cancelButtonText: '取消',
     }
   )
     .then(({ value }) => {
@@ -263,7 +261,7 @@ function resetPassword(row: { [key: string]: any }) {
         return false;
       }
       updateUserPart(row.id, {
-        password: value
+        password: value,
       }).then(() => {
         ElMessage.success('修改成功，新密码是：' + value);
       });
@@ -279,7 +277,7 @@ async function handleAdd() {
   await loadRoleOptions();
   state.dialog = {
     title: '添加用户',
-    visible: true
+    visible: true,
   };
 }
 
@@ -292,9 +290,9 @@ async function handleUpdate(row: { [key: string]: any }) {
   await loadRoleOptions();
   state.dialog = {
     title: '修改用户',
-    visible: true
+    visible: true,
   };
-  getUserDetail(userId).then(({ data }) => {
+  getUserFormData(userId).then(({ data }) => {
     state.formData = data;
   });
 }
@@ -334,7 +332,7 @@ function handleDelete(row: { [key: string]: any }) {
     {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
-      type: 'warning'
+      type: 'warning',
     }
   )
     .then(function () {
@@ -359,7 +357,7 @@ function cancel() {
  * 加载部门
  */
 async function loadDeptOptions() {
-  listSelectDepartments().then(response => {
+  listSelectDepartments().then((response) => {
     state.deptOptions = response.data;
   });
 }
@@ -368,18 +366,18 @@ async function loadDeptOptions() {
  * 加载性别字典
  */
 function loadGenderOptions() {
-  proxy.$listDictsByCode('gender').then((response: any) => {
+  proxy.$getDictItemsByTypeCode('gender').then((response: any) => {
     state.genderOptions = response?.data;
   });
 }
 
 /**
- * 下载用户导入模板
+ * 下载导入模板
  */
 function handleDownloadTemplate() {
   downloadTemplate().then((response: any) => {
     const blob = new Blob([response.data], {
-      type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
+      type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8',
     });
     const a = document.createElement('a');
     const href = window.URL.createObjectURL(blob); // 下载链接
@@ -395,7 +393,7 @@ function handleDownloadTemplate() {
 }
 
 /**
- * 导入用户表单弹窗
+ * 显示导入弹窗
  */
 async function showImportDialog() {
   await loadDeptOptions();
@@ -431,7 +429,7 @@ function submitImportForm() {
 
       const deptId = state.importFormData.deptId;
       const roleIds = state.importFormData.roleIds.join(',');
-      importUser(deptId, roleIds, state.excelFile).then(response => {
+      importUser(deptId, roleIds, state.excelFile).then((response) => {
         ElMessage.success(response.data);
         closeImportDialog();
         handleQuery();
@@ -456,7 +454,7 @@ function closeImportDialog() {
 function handleExport() {
   exportUser(queryParams.value).then((response: any) => {
     const blob = new Blob([response.data], {
-      type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
+      type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8',
     });
     const a = document.createElement('a');
     const href = window.URL.createObjectURL(blob); // 下载的链接
@@ -617,7 +615,7 @@ onMounted(() => {
             />
             <el-table-column label="用户昵称" align="center" prop="nickname" />
 
-            <el-table-column label="性别" align="center" prop="gender" />
+            <el-table-column label="性别" align="center" prop="genderLabel" />
 
             <el-table-column label="部门" align="center" prop="deptName" />
             <el-table-column
@@ -754,9 +752,9 @@ onMounted(() => {
           <el-select v-model="formData.roleIds" multiple placeholder="请选择">
             <el-option
               v-for="item in roleOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
             />
           </el-select>
         </el-form-item>
@@ -800,9 +798,9 @@ onMounted(() => {
           >
             <el-option
               v-for="item in roleOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
             />
           </el-select>
         </el-form-item>