Merge branch 'develop'

# Conflicts:
#	src/router/router.tsx

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: e542681506090b76695aee27259a3438c8c366d0
+  newTag: 046b00bc34aeb1390a76df60cbc7ff65172efa52

src/api/interface/categoryManage.ts

-import { InterFunction, InterItemFunction } from '~/api/interface';
+import { InterFunction, InterItemFunction, InterListFunction } from '~/api/interface';
 // 分类列表
 export interface categoryEntity {
   id: number;
@@ -131,3 +131,178 @@ export type updateSubCategoryType = InterFunction<
 >;
 //分类管理-2级分类删除（新）
 export type deleteSubCategoryType = InterFunction<{ id: number }, any>;
+// 一级行业列表
+export type industryListPagesType = InterListFunction<
+  {
+    id?: number;
+    typeName?: string;
+  },
+  {
+    id: number;
+    typeName: string;
+    typeImg: string;
+    description: string;
+    saleState: number;
+    createTime: string;
+    inspectionDTOS: Array<{
+      id: number;
+      inspectionNo: string;
+      inspectionName: string;
+      industryTypeId: number;
+      inspectionImg: string;
+      inspectionDescription: string;
+      saleState: null;
+      caseImg: string;
+      caseVideo: string;
+      companyInspectionDTOS: null;
+    }>;
+    inspectionName: string;
+    inspectionImg: string;
+    inspectionDescription: string;
+  }
+>;
+// 新增行业
+export type industryInsertType = InterFunction<
+  {
+    description?: string;
+    id?: number;
+    saleState?: number;
+    typeImg?: string;
+    typeName?: string;
+  },
+  NonNullable<unknown>
+>;
+// 修改行业
+export type industryUpdateType = InterFunction<
+  {
+    description?: string;
+    id?: number;
+    saleState?: number;
+    typeImg?: string;
+    typeName?: string;
+  },
+  NonNullable<unknown>
+>;
+// 新增服务
+export type inspectionInsertType = InterFunction<
+  {
+    caseImg?: string;
+    caseVideo?: string;
+    id?: number;
+    industryTypeId?: number;
+    inspectionDescription?: string;
+    inspectionImg?: string;
+    inspectionName?: string;
+    inspectionNo?: string;
+    saleState?: number;
+  },
+  NonNullable<unknown>
+>;
+// 修改服务
+export type inspectionUpdateType = InterFunction<
+  {
+    caseImg?: string;
+    caseVideo?: string;
+    id?: number;
+    industryTypeId?: number;
+    inspectionDescription?: string;
+    inspectionImg?: string;
+    inspectionName?: string;
+    inspectionNo?: string;
+    saleState?: number;
+  },
+  NonNullable<unknown>
+>;
+// 删除行业
+export type industryRemoveType = InterFunction<{ id: number }, NonNullable<unknown>>;
+// 删除服务
+export type inspectionRemoveType = InterFunction<{ id: number }, NonNullable<unknown>>;
+// 根据服务id查询标签列表
+export type listByInspectionIdType = InterFunction<
+  { id: number },
+  {
+    id: number;
+    inspectionId: number;
+    tagName: string;
+  }[]
+>;
+// 新增服务标签
+export type inspectionTagInsertType = InterFunction<
+  {
+    id?: number;
+    inspectionId?: number;
+    tagName?: string;
+  },
+  NonNullable<unknown>
+>;
+// 修改服务标签
+export type inspectionTagUpdateType = InterFunction<
+  {
+    id?: number;
+    inspectionId?: number;
+    tagName?: string;
+  },
+  NonNullable<unknown>
+>;
+// 删除服务标签
+export type inspectionTagDeleteType = InterFunction<
+  {
+    id: number;
+  },
+  NonNullable<unknown>
+>;
+// 服务详情
+export type inspectionDetailType = InterFunction<
+  {
+    id: number;
+  },
+  {
+    caseImg: string;
+    caseVideo: string;
+    companyInspectionDTOS: Array<{
+      companyInfoId: number;
+      companyName: string;
+      detailPage: string;
+      id: number;
+      industryTypeDTO: {
+        createTime: string;
+        description: string;
+        id: number;
+        inspectionDTOS: null;
+        saleState: number;
+        typeImg: string;
+        typeName: string;
+      };
+      inspectionDTO: null;
+      inspectionFileDTOS: Array<{
+        companyInspectionId: number;
+        fileType: number;
+        fileUrl: string;
+        first: number;
+        id: number;
+      }>;
+      inspectionFirstImg: string;
+      inspectionId: number;
+      inspectionPriceUnitId: number;
+      inspectionTagDTO: {
+        id: number;
+        inspectionId: number;
+        tagName: string;
+      };
+      inspectionTagId: number;
+      price: number;
+      priceRemark: string;
+      remark: string;
+      saleState: number;
+      serviceArea: string;
+    }>;
+    createTime: string;
+    id: number;
+    industryTypeId: number;
+    inspectionDescription: string;
+    inspectionImg: string;
+    inspectionName: string;
+    inspectionNo: string;
+    saleState: number;
+  }
+>;

src/api/interface/commonType.ts

@@ -177,5 +177,4 @@ type locationType = {
   level: number;
   childInfo: locationType[];
 };
-
 export type getSecondDistrictInfoType = InterFunction<any, locationType[]>;

src/api/interface/forumManageType.ts

@@ -50,6 +50,6 @@ export type likeUserInfoType = InterFunction<
 >;
 // 论坛-审核
 export type checkDynamicType = InterFunction<
-  { dynamicId: number; status: number },
+  { dynamicId: number; status: boolean },
   NonNullable<unknown>
 >;

src/api/interface/goodsType.ts

@@ -93,8 +93,6 @@ export type detailGoodsType = InterFunction<
     id: number;
   }
 >;
-//商品-其它服务列表
-export type otherServiceType = InterFunction<any, { id: number; saleServiceName: string }[]>;
 //商品-规格单位
 export type skuUnitType = InterFunction<any, { id: number; unitName: string }[]>;
 //商品-批量上下架
@@ -164,7 +162,7 @@ export type editMallGoodsType = InterFunction<goodsItemType & { id: number }, an
 //商品-列表（新）
 export type listPageGoodsInfoType = InterItemFunction<
   { categoryPrimaryId?: number; tradeName?: string; shelfStatus?: number },
-  goodsItemType & { id: number }[]
+  (goodsItemType & { id: number })[]
 >;
 //商城-详情（新）
 export type mallGoodsDetailsType = InterFunction<{ id: number }, goodsItemType & { id: number }>;

src/api/interface/mallManageType.ts

@@ -174,3 +174,232 @@ export type serviceDetailType = InterFunction<
 >;
 //服务-上下移动
 export type exChangeServiceType = InterFunction<{ id: number; sort: number }[], any>;
+// pc-单位服务列表
+export type listCompanyInspectionPageType = InterListFunction<
+  {
+    companyInfoId?: number;
+    industryTypeId?: number;
+    inspectionId?: number;
+    keyword?: string;
+  },
+  {
+    companyInfoId: number;
+    companyName: string;
+    detailPage: string;
+    id: number;
+    industryTypeDTO: {
+      createTime: string;
+      description: string;
+      id: number;
+      inspectionDTOS: Array<{
+        caseImg: string;
+        caseVideo: string;
+        companyInspectionDTOS: null;
+        id: number;
+        industryTypeId: number;
+        inspectionDescription: string;
+        inspectionImg: string;
+        inspectionName: string;
+        inspectionNo: string;
+        saleState: number;
+      }>;
+      saleState: number;
+      typeImg: string;
+      typeName: string;
+    };
+    inspectionDTO: {
+      caseImg: string;
+      caseVideo: string;
+      companyInspectionDTOS: null;
+      id: number;
+      industryTypeId: number;
+      inspectionDescription: string;
+      inspectionImg: string;
+      inspectionName: string;
+      inspectionNo: string;
+      saleState: number;
+    };
+    inspectionFileDTOS: Array<{
+      companyInspectionId: number;
+      fileType: number;
+      fileUrl: string;
+      first: number;
+      id: number;
+    }>;
+    inspectionFirstImg: string;
+    inspectionId: number;
+    inspectionPriceUnitId: number;
+    inspectionTagDTO: {
+      id: number;
+      inspectionId: number;
+      tagName: string;
+    };
+    inspectionTagId: number;
+    price: number;
+    priceRemark: string;
+    remark: string;
+    saleState: number;
+    serviceArea: string;
+  }
+>;
+// 新增服务
+export type companyInspectionInsertType = InterFunction<
+  {
+    companyInfoId?: number;
+    companyInspectionFiles?: Array<{
+      companyInspectionId?: number;
+      fileType?: number;
+      fileUrl?: string;
+      first?: number;
+      id?: number;
+    }>;
+    detailPage?: string;
+    id?: number;
+    inspectionId?: number;
+    inspectionPriceUnitId?: number;
+    inspectionTagId?: number;
+    price?: number;
+    priceRemark?: string;
+    remark?: string;
+    saleState?: number;
+    serviceArea?: string;
+  },
+  NonNullable<unknown>
+>;
+// 修改服务
+export type companyInspectionUpdateType = InterFunction<
+  {
+    companyInfoId?: number;
+    companyInspectionFiles?: Array<{
+      companyInspectionId?: number;
+      fileType?: number;
+      fileUrl?: string;
+      first?: number;
+      id?: number;
+    }>;
+    detailPage?: string;
+    id?: number;
+    inspectionId?: number;
+    inspectionPriceUnitId?: number;
+    inspectionTagId?: number;
+    price?: number;
+    priceRemark?: string;
+    remark?: string;
+    saleState?: number;
+    serviceArea?: string;
+  },
+  NonNullable<unknown>
+>;
+// 单位服务详情
+export type getCompanyInspectionByIdType = InterFunction<
+  {
+    id: number;
+  },
+  {
+    companyInfoId: number;
+    companyName: string;
+    detailPage: string;
+    id: number;
+    industryTypeDTO: {
+      createTime: string;
+      description: string;
+      id: number;
+      inspectionDTOS: Array<{
+        caseImg: string;
+        caseVideo: string;
+        companyInspectionDTOS: null;
+        createTime: string;
+        id: number;
+        industryTypeId: number;
+        inspectionDescription: string;
+        inspectionImg: string;
+        inspectionName: string;
+        inspectionNo: string;
+        saleState: number;
+      }>;
+      saleState: number;
+      typeImg: string;
+      typeName: string;
+    };
+    inspectionDTO: {
+      caseImg: string;
+      caseVideo: string;
+      companyInspectionDTOS: null;
+      createTime: string;
+      id: number;
+      industryTypeId: number;
+      inspectionDescription: string;
+      inspectionImg: string;
+      inspectionName: string;
+      inspectionNo: string;
+      saleState: number;
+    };
+    inspectionFileDTOS: Array<{
+      companyInspectionId: number;
+      fileType: number;
+      fileUrl: string;
+      first: number;
+      id: number;
+    }>;
+    inspectionFirstImg: string;
+    inspectionId: number;
+    inspectionPriceUnitId: number;
+    inspectionTagDTO: {
+      id: number;
+      inspectionId: number;
+      tagName: string;
+    };
+    inspectionTagId: number;
+    price: number;
+    priceRemark: string;
+    remark: string;
+    saleState: number;
+    serviceArea: string;
+  }
+>;
+// 价格单位列表
+export type listInspectionPriceUnitType = InterFunction<
+  NonNullable<unknown>,
+  {
+    id: number;
+    unitName: string;
+  }[]
+>;
+// 删除单位服务
+export type companyInspectionRemoveType = InterFunction<{ id: number }, NonNullable<unknown>>;
+// 合作商家列表-根据合作标签id获取
+export type listCompanyInfoByCoopIdType = InterListFunction<
+  {
+    coopId: number;
+    lat: number;
+    lon: number;
+    pageNo: number;
+    pageSize: number;
+  },
+  {
+    address: string;
+    brandLogo: string;
+    brandName: string;
+    companyName: string;
+    companyType: number;
+    companyUserName: string;
+    content: string;
+    creditCode: string;
+    fullName: string;
+    id: number;
+    lat: number;
+    leader: number;
+    licenseImg: string;
+    lon: number;
+    phoneNum: number;
+    remark: string;
+    score: string;
+    userAccountId: number;
+    backImg: string;
+    city: string;
+    distance: number;
+    district: string;
+    province: string;
+    backUserAccountId: number;
+  }
+>;

src/api/interface/rentManageType.ts

@@ -31,9 +31,166 @@ export type listBrandInfoType = InterItemFunction<
 >;
 
 //租赁-型号-新增
-export type addRentModeType = InterFunction<{ modeName: string; productTypeId: number }, any>;
+export type addRentModeType = InterFunction<
+  { modeName: string; productTypeId: number; brandInfoId: number; tag?: string },
+  any
+>;
+//租赁-型号-编辑
+export type editRentModeType = InterFunction<
+  { modeName: string; productTypeId: number; brandInfoId: number; tag?: string; id?: number },
+  any
+>;
+//租赁-型号-删除
+export type deleteModeType = InterFunction<{ id: number }, any>;
 //租赁-型号-列表
 export type rentModeListType = InterItemFunction<
   { brandInfoId?: number; productTypeId?: number },
+  { modeName: string; id: number; brandInfoId: number; productTypeId: number; tag: string }[]
+>;
+
+//租赁-商品-新增
+export type addRentGoodsType = InterFunction<
+  {
+    brandInfoId: number;
+    deviceModeId: number;
+    leasePartsList: { name: string; number: number; price: number }[];
+    level: number;
+    logisticsCompany: string;
+    maxLeaseTerm: number;
+    minLeaseTerm: number;
+    modeOfDelivery: number;
+    priceStock: {
+      cashPledge: number;
+      maxDaysRental?: number;
+      ninetyDaysRental?: number;
+      productSpec: string;
+      sevenDaysRental?: number;
+      showPrice?: number;
+      skuImage?: string;
+      stock?: number;
+      stockOut: number;
+      thirtyDaysRental?: number;
+      threeDaysRental?: number;
+    }[];
+    productDetails: string;
+    productParam: string;
+    productTypeId: number;
+    resourcesList: { type: number; url: string }[];
+    returnAddress: number;
+    sellingPoint: string;
+    shelfStatus: number;
+    shipAddress: number;
+    tradeName: string;
+    specAttrList: { specName: string; specValuesList: { specName: string }[] }[];
+  },
+  any
+>;
+//租赁商品-列表
+type rentGoodsType = {
+  brandInfoId: number;
+  brandName: string;
+  deviceModeId: number;
+  deviceModeName: string;
+  leasePartsList: { id: number; name: string; number: number; price: number }[];
+  level: number;
+  logisticsCompany: string;
+  maxLeaseTerm: number;
+  minLeaseTerm: number;
+  modeOfDelivery: number;
+  modeOfDeliveryInfo: string;
+  priceStock: {
+    cashPledge: number;
+    maxDaysRental?: number;
+    ninetyDaysRental?: number;
+    productSpec: string;
+    sevenDaysRental?: number;
+    showPrice?: number;
+    skuImage?: string;
+    stock?: number;
+    stockOut: number;
+    thirtyDaysRental?: number;
+    threeDaysRental?: number;
+    id: number;
+  }[];
+  productDetails: string;
+  productParam: string;
+  productTypeId: number;
+  productTypeName: string;
+  resourcesList: { id: number; type: number; url: string }[];
+  returnAddress: number;
+  sellingPoint: string;
+  shelfStatus: number;
+  shipAddress: number;
+  tradeName: string;
+  specAttrList: {
+    id: number;
+    specName: string;
+    specValuesList: { specName: string; id: number }[];
+  }[];
+  id: number;
+  createTime: string;
+};
+export type leaseGoodsListType = InterItemFunction<
+  {
+    brandInfoId?: number;
+    districtCode?: number;
+    productTypeId?: number;
+    shelfStatus?: number;
+    tradeName?: string;
+  },
+  rentGoodsType[]
+>;
+//租赁-商品-编辑
+export type editLeaseGoodsType = InterFunction<
+  {
+    brandInfoId: number;
+    deviceModeId: number;
+    leasePartsList: { id?: number; name: string; number: number; price: number }[];
+    level: number;
+    logisticsCompany: string;
+    maxLeaseTerm: number;
+    minLeaseTerm: number;
+    modeOfDelivery: number;
+    priceStock: {
+      cashPledge: number;
+      maxDaysRental?: number;
+      ninetyDaysRental?: number;
+      productSpec: string;
+      sevenDaysRental?: number;
+      showPrice?: number;
+      skuImage?: string;
+      stock?: number;
+      stockOut: number;
+      thirtyDaysRental?: number;
+      threeDaysRental?: number;
+      id?: number;
+    }[];
+    productDetails: string;
+    productParam: string;
+    productTypeId: number;
+    resourcesList: { type: number; url: string }[];
+    returnAddress: number;
+    sellingPoint: string;
+    shelfStatus: number;
+    shipAddress: number;
+    tradeName: string;
+    specAttrList: {
+      id: number;
+      specName: string;
+      specValuesList: { id: number; specName: string }[];
+    }[];
+    id: number;
+  },
   any
 >;
+//租赁-商品-详情
+export type leaseGoodsDetailsType = InterFunction<{ id: number }, rentGoodsType>;
+//租赁-商品-租期信息
+export type leaseTermInfoType = InterFunction<any, { id: number; leaseDate: string }[]>;
+//租赁-商品-物流-配送方式
+export type otherServiceType = InterFunction<any, { id: number; saleServiceName: string }[]>;
+
+//租赁-商品-上下架-批量
+export type batchOnShelfOrTakeDownType = InterFunction<{ goodsIds: number[]; status: number }, any>;
+//租赁-商品-删除-批量
+export type batchRemoveWareInfoType = InterFunction<number[], any>;

src/api/interface/systemManageType.ts

@@ -299,3 +299,44 @@ export type listMenuInfoType = InterFunction<any, menType>;
 export type listRoleMenuInfoType = InterFunction<{ roleId: number }, any>;
 //账号权限-修改角色菜单权限
 export type updateRoleMenuInfoType = InterFunction<{ menuInfoIds: number[]; roleId: number }, any>;
+
+//地址管理-列表
+export type addressListType = InterFunction<
+  any,
+  {
+    takeAddress: string;
+    takeName: string;
+    takePhone: string;
+    takeRegion: string;
+    type: number;
+    id: number;
+    districtCode: string;
+  }[]
+>;
+//地址管理-添加地址
+export type addressInsetType = InterFunction<
+  {
+    takeAddress: string;
+    takeName: string;
+    takePhone: string;
+    takeRegion: string;
+    type: number;
+    districtCode: string;
+  },
+  any
+>;
+//地址管理-编辑地址
+export type editAddressType = InterFunction<
+  {
+    id?: number;
+    takeAddress: string;
+    takeName: string;
+    takePhone: string;
+    takeRegion: string;
+    type: number;
+    districtCode: string;
+  },
+  any
+>;
+//地址管理-删除地址
+export type deleteAddressType = InterFunction<{ id: number }, any>;

src/api/modules/categoryManage.ts

@@ -11,6 +11,18 @@ import {
   directoryListType,
   directoryPageListType,
   exchangeType,
+  industryInsertType,
+  industryListPagesType,
+  industryRemoveType,
+  industryUpdateType,
+  inspectionDetailType,
+  inspectionInsertType,
+  inspectionRemoveType,
+  inspectionTagDeleteType,
+  inspectionTagInsertType,
+  inspectionTagUpdateType,
+  inspectionUpdateType,
+  listByInspectionIdType,
   updatePrimaryCategoryType,
   updateSubCategoryType,
 } from '~/api/interface/categoryManage';
@@ -129,4 +141,40 @@ export class CategoryManageAPI {
   //  分类管理-2级分类删除（新）
   static deleteSubCategory: deleteSubCategoryType = (params) =>
     axios.get('/pms/category/deleteSubCategory', { params });
+  // 一级行业列表
+  static industryListPages: industryListPagesType = (params) =>
+    axios.post('/pms/industry/listPages', params);
+  // 新增行业
+  static industryInsert: industryInsertType = (params) =>
+    axios.post('/pms/industry/insert', params);
+  // 修改行业
+  static industryUpdate: industryUpdateType = (params) =>
+    axios.post('/pms/industry/update', params);
+  // 新增服务
+  static inspectionInsert: inspectionInsertType = (params) =>
+    axios.post('/pms/inspection/insert', params);
+  // 修改服务
+  static inspectionUpdate: inspectionUpdateType = (params) =>
+    axios.post('/pms/inspection/update', params);
+  // 删除行业
+  static industryRemove: industryRemoveType = (params) =>
+    axios.get('/pms/industry/remove', { params });
+  // 删除服务
+  static inspectionRemove: inspectionRemoveType = (params) =>
+    axios.get('/pms/inspection/remove', { params });
+  // 根据服务id查询标签列表
+  static listByInspectionId: listByInspectionIdType = (params) =>
+    axios.get('/pms/inspection-tag/listByInspectionId', { params });
+  // 新增服务标签
+  static inspectionTagInsert: inspectionTagInsertType = (params) =>
+    axios.post('/pms/inspection-tag/insert', params);
+  // 修改服务标签
+  static inspectionTagUpdate: inspectionTagUpdateType = (params) =>
+    axios.post('/pms/inspection-tag/update', params);
+  // 删除服务标签
+  static inspectionTagDelete: inspectionTagDeleteType = (params) =>
+    axios.get('/pms/inspection-tag/delete', { params });
+  // 服务详情
+  static inspectionDetail: inspectionDetailType = (params) =>
+    axios.get('/pms/inspection/detail', { params });
 }

src/api/modules/goodsAPI.ts

@@ -10,7 +10,6 @@ import {
   listGoodsType,
   listPageGoodsInfoType,
   mallGoodsDetailsType,
-  otherServiceType,
   removeMallGoodsType,
   skuUnitType,
   upOrDownShelfType,
@@ -38,10 +37,6 @@ class GoodsAPI {
   static getSkuUnit: skuUnitType = () => {
     return axios.get('/pms/mall/goods/getSkuUnit');
   };
-  //  商品-其它服务列表
-  static getOtherServiceList: otherServiceType = () => {
-    return axios.get('/pms/goods/listOtherService');
-  };
   //  商品-批量上下架
   static batchOnShelfOrTakeDown: batchOnShelfOrTakeDownType = (data) => {
     return axios.post('/pms/goods/batchOnShelfOrTakeDown', data);

src/api/modules/mallManage.ts

@@ -13,6 +13,13 @@ import {
   deleteServiceType,
   serviceDetailType,
   exChangeServiceType,
+  listCompanyInspectionPageType,
+  companyInspectionInsertType,
+  companyInspectionUpdateType,
+  getCompanyInspectionByIdType,
+  listInspectionPriceUnitType,
+  companyInspectionRemoveType,
+  listCompanyInfoByCoopIdType,
 } from '~/api/interface/mallManageType';
 
 export class MallManageAPI {
@@ -56,4 +63,26 @@ export class MallManageAPI {
   //  服务-上下移
   static exChangeService: exChangeServiceType = (data) =>
     axios.post('/pms/backstage/work/exchange', data);
+  // pc-单位服务列表
+  static listCompanyInspectionPage: listCompanyInspectionPageType = (data) =>
+    axios.post('/pms/company-inspection/listCompanyInspectionPage', data);
+  // 新增服务
+  static companyInspectionInsert: companyInspectionInsertType = (data) =>
+    axios.post('/pms/company-inspection/insert', data);
+  // 修改服务
+  static companyInspectionUpdate: companyInspectionUpdateType = (data) =>
+    axios.post('/pms/company-inspection/update', data);
+  // 单位服务详情
+  static getCompanyInspectionById: getCompanyInspectionByIdType = (params) =>
+    axios.get('/pms/company-inspection/getCompanyInspectionById', { params });
+  // 价格单位列表
+  static listInspectionPriceUnit: listInspectionPriceUnitType = (params) =>
+    axios.get('/pms/company-inspection/listInspectionPriceUnit', { params });
+  // 删除单位服务
+  static companyInspectionRemove: companyInspectionRemoveType = (params) =>
+    axios.get('/pms/company-inspection/remove', { params });
+
+  // 合作商家列表-根据合作标签id获取
+  static listCompanyInfoByCoopId: listCompanyInfoByCoopIdType = (params) =>
+    axios.get('/userapp/cooperation/listCompanyInfoByCoopId', { params });
 }

src/api/modules/rentManageAPI.ts

 import {
+  addRentGoodsType,
   addRentModeType,
   addType,
+  batchRemoveWareInfoType,
+  deleteModeType,
   editBrandInfoType,
+  editLeaseGoodsType,
+  editRentModeType,
   getTypeListType,
+  leaseGoodsDetailsType,
+  leaseGoodsListType,
+  leaseTermInfoType,
   listBrandInfoType,
+  otherServiceType,
   rentMakeAddType,
   rentModeListType,
   rentTypeEditType,
   rentTypeRemoveType,
 } from '~/api/interface/rentManageType';
 import axios from '../request';
+import { batchOnShelfOrTakeDownType } from '~/api/interface/goodsType';
 
 export class RentManageAPI {
   //租赁-类型-新增
@@ -35,6 +45,36 @@ export class RentManageAPI {
 
   //  租赁-型号-新增
   static addRentMode: addRentModeType = (data) => axios.post('/pms/brand/addMode', data);
+  //租赁-型号-编辑
+  static editRentMode: editRentModeType = (data) => axios.post('/pms/brand/editMode', data);
+  //租赁-型号-删除
+  static deleteMode: deleteModeType = (params) => axios.get('/pms/brand/deleteMode', { params });
   //  租赁-型号-列表
   static getRentModeList: rentModeListType = (data) => axios.post('/pms/brand/modeList', data);
+
+  //  租赁-商品-新增
+  static addRentGoods: addRentGoodsType = (data) =>
+    axios.post('/pms/lease/goods/addLeaseGoods', data);
+  //租赁-商品-列表
+  static getLeaseGoodsList: leaseGoodsListType = (data) =>
+    axios.post('/pms/lease/goods/leaseGoodsList', data);
+  //租赁-商品-编辑
+  static editLeaseGoods: editLeaseGoodsType = (data) =>
+    axios.post('/pms/lease/goods/editLeaseGoods', data);
+  //租赁-商品-详情
+  static getLeaseGoodsDetails: leaseGoodsDetailsType = (params) =>
+    axios.get('/pms/lease/goods/leaseGoodsDetails', { params });
+  //  租赁-商品-租期信息
+  static getLeaseTermInfo: leaseTermInfoType = () =>
+    axios.post('/pms/lease/goods/getLeaseTermInfo');
+  //租赁-商品-上下架-批量
+  static batchOnShelfOrTakeDown: batchOnShelfOrTakeDownType = (data) =>
+    axios.post('/pms/lease/goods/batchOnShelfOrTakeDown', data);
+  ////租赁-商品-删除-批量
+  static batchRemoveWareInfo: batchRemoveWareInfoType = (data) =>
+    axios.post('/pms/lease/goods/batchRemoveWareInfo', data);
+  //  商品-其它服务列表
+  static getOtherServiceList: otherServiceType = () => {
+    return axios.get('/pms/goods/listOtherService');
+  };
 }

src/api/modules/systemManage.ts

 import {
+  addressInsetType,
+  addressListType,
   bindingCompanyMemberType,
+  deleteAddressType,
   deleteRoleInfoType,
+  editAddressType,
   getCompanyInfoByIdType,
   getSecondDistrictInfo,
   insertBAccountType,
@@ -104,4 +108,15 @@ export class SystemManageAPI {
   //账号权限-修改角色菜单权限
   static updateRoleMenuInfo: updateRoleMenuInfoType = (data) =>
     axios.post('/userapp/role/updateRoleMenuInfo', data);
+
+  //  地址管理-新增
+  static addressInset: addressInsetType = (data) => axios.post('/oms/user-address/insert', data);
+  //  地址管理-列表
+  static getAddressList: addressListType = (data) =>
+    axios.post('/oms/user-address/selectList', data);
+  //  地址管理-编辑
+  static editAddress: editAddressType = (data) => axios.post('/oms/user-address/update', data);
+  //  地址管理-删除
+  static deleteAddress: deleteAddressType = (params) =>
+    axios.get('/oms/user-address/deleteById', { params });
 }

src/components/EditableCell/index.tsx

-import { Form, InputNumber, Input, Select, Radio } from 'antd';
+import { Form, InputNumber, Input, Select, Radio, Switch } from 'antd';
 import React from 'react';
 import { Uploader } from '~/components/uploader';
 import { UploadOutlined } from '@ant-design/icons';
@@ -8,7 +8,7 @@ export interface EditableCellProps extends React.HTMLAttributes<HTMLElement> {
   editing: boolean;
   dataIndex: string;
   title: any;
-  inputType: 'number' | 'text' | 'select' | 'uploader' | 'radio' | 'textArea';
+  inputType: 'number' | 'text' | 'select' | 'uploader' | 'radio' | 'textArea' | 'switch';
   record: any;
   index: number;
   children: React.ReactNode;
@@ -41,7 +41,13 @@ const EditableCell: React.FC<
   const inputNode = () => {
     switch (inputType) {
       case 'number':
-        return <InputNumber placeholder={`请输入${placeholder || title}`} maxLength={maxLength} />;
+        return (
+          <InputNumber
+            placeholder={`请输入${placeholder || title}`}
+            style={{ width: '100%' }}
+            maxLength={maxLength}
+          />
+        );
       case 'select':
         return (
           <Select placeholder={`请选择${placeholder || title}`} style={{ textAlign: 'start' }}>
@@ -82,14 +88,28 @@ const EditableCell: React.FC<
             showCount
           />
         );
+      case 'switch':
+        return <Switch />;
       default:
-        return <Input placeholder={`请输入${placeholder || title}`} maxLength={maxLength} />;
+        return (
+          <Input
+            placeholder={`请输入${placeholder || title}`}
+            maxLength={maxLength}
+            style={{ width: '100%' }}
+          />
+        );
     }
   };
   return (
     <td {...restProps}>
       {editing ? (
-        <Form.Item name={dataIndex + record.id} style={{ margin: 0 }} rules={rules}>
+        <Form.Item
+          name={dataIndex + record.id}
+          style={{ margin: 0 }}
+          rules={rules}
+          //valuePropName：当 form setFieldsValue 设置switch不生效时
+          valuePropName={inputType === 'switch' ? 'checked' : undefined}
+        >
           {inputNode()}
         </Form.Item>
       ) : (

src/components/goods/commonAddOrEdit/configurePriceModal/index.tsx

-import React, { useEffect, useState } from 'react';
-import { Modal, Form, Select, Input, message, Button, ModalProps } from 'antd';
-import { InterDataType } from '~/api/interface';
-import { cooperationTagType } from '~/api/interface/produceManageType';
-import { customizeEntity } from '~/api/interface/goodsType';
-import { filterObjAttr } from '~/utils';
-
-//加盟标签返回类型
-type cooperationTagResponseType = InterDataType<cooperationTagType>;
-interface selfProps {
-  handleOk: (specPrice: any, leaseTerm: number) => void;
-  handleCancel: () => void;
-  customRowData: Partial<customizeEntity>;
-  tagInfoList: cooperationTagResponseType;
-  goodsType: number;
-}
-
-const ConfigurePriceModal: React.FC<ModalProps & selfProps> = ({
-  open,
-  handleOk,
-  handleCancel,
-  customRowData,
-  tagInfoList,
-  goodsType,
-}) => {
-  // 选择的列表
-  const [selectList, setSelectList] = useState<number[]>([]);
-
-  // 配置价格Form
-  const [cfgPriceForm] = Form.useForm<any>();
-  const deselectEvent = (id: number) => {
-    const obj: any = {};
-    obj[id] = undefined;
-    cfgPriceForm.setFieldsValue(obj);
-    const numArr: number[] = selectList.filter((i: number) => i !== id);
-    setSelectList([...numArr]);
-  };
-  const levelSelectEvent = (id: number) => {
-    selectList.push(id);
-    setSelectList([...selectList]);
-  };
-  // 将val转换为label
-  const transValtoLabel = (id: number) => {
-    const item = tagInfoList.find((i) => i.id === id);
-    return item ? item.tagName : id;
-  };
-  // 表单验证
-  const handleSubmit = async () => {
-    cfgPriceForm
-      .validateFields()
-      .then(async (values) => {
-        const specPrice = Object.keys(filterObjAttr(values, ['leaseTerm'])).reduce(
-          (pre: any, cur: string) => {
-            if (Object.keys(customRowData.productSpecCPQVO).length != 0) {
-              const priceItem: any = customRowData.productSpecCPQVO.specPrice.find(
-                (i: any) => i.cooperationTag === Number(cur),
-              );
-              pre.push({
-                id: priceItem?.id,
-                price: values[cur],
-                cooperationTag: cur,
-              });
-            } else {
-              pre.push({ price: values[cur], cooperationTag: cur });
-            }
-            return pre;
-          },
-          [],
-        );
-        handleOk([...specPrice], values.leaseTerm);
-      })
-      .catch((err) => {
-        message.warning(err.errorFields[0].errors[0]).then();
-      });
-  };
-  const handleCancelEvent = () => {
-    cfgPriceForm.resetFields();
-    handleCancel();
-  };
-  // 价格正则
-  const priceValidator = (_rule: any, value: any) => {
-    const regExp = /^[1-9]\d{0,7}(\.\d{1,2})?$|^0(\.\d{1,2})?$/;
-    const bol: boolean = regExp.test(value);
-    if (!value) {
-      return Promise.reject(new Error('请输入定价金额'));
-    }
-    if (!bol) {
-      return Promise.reject(
-        new Error('金额应为数字,小数最多两位,整数最多八位,不能输入0开头的整数'),
-      );
-    }
-    return Promise.resolve();
-  };
-
-  useEffect(() => {
-    // 新增规格则清空表单数据
-    if (Object.keys(customRowData.productSpecCPQVO).length === 0) {
-      cfgPriceForm.resetFields();
-      setSelectList([]);
-    } else {
-      cfgPriceForm.setFieldValue('leaseTerm', customRowData.productSpecCPQVO.leaseTerm);
-      const ids: number[] = [];
-      customRowData.productSpecCPQVO.specPrice.map((item: any) => {
-        cfgPriceForm.setFieldValue(Number(item.cooperationTag), item.price);
-        if (item.cooperationTag != '0') {
-          ids.push(Number(item.cooperationTag));
-        }
-        setSelectList(ids);
-      });
-    }
-  }, [customRowData]);
-
-  return (
-    <Modal
-      title='配置价格'
-      open={open}
-      onCancel={handleCancelEvent}
-      zIndex={1009}
-      footer={[
-        <Button key={1} type='default' onClick={handleCancelEvent}>
-          取消
-        </Button>,
-        <Button key={2} type='primary' onClick={handleSubmit}>
-          确认
-        </Button>,
-      ]}
-    >
-      <Form
-        labelCol={{ span: 7 }}
-        wrapperCol={{ span: 14 }}
-        form={cfgPriceForm}
-        initialValues={{ leaseTerm: 0 }}
-      >
-        {goodsType === 1 && (
-          <Form.Item
-            label='租期'
-            name='leaseTerm'
-            rules={[{ required: true, message: '请选择租期' }]}
-          >
-            <Select>
-              <Select.Option value={0}>1-7天</Select.Option>
-              <Select.Option value={1}>8-15天</Select.Option>
-              <Select.Option value={2}>16-30天</Select.Option>
-              <Select.Option value={3}>31天以上</Select.Option>
-            </Select>
-          </Form.Item>
-        )}
-        <Form.Item label='渠道等级'>
-          <Select
-            placeholder='请选择渠道等级'
-            mode='multiple'
-            filterOption={(input, option) =>
-              (option!.children as unknown as string).toLowerCase().includes(input.toLowerCase())
-            }
-            onDeselect={deselectEvent}
-            onSelect={levelSelectEvent}
-            value={selectList}
-          >
-            {tagInfoList.map((item) => (
-              <Select.Option key={item.id} value={item.id}>
-                {item.tagName}
-              </Select.Option>
-            ))}
-          </Select>
-        </Form.Item>
-        <Form.Item
-          label='市场单价'
-          name={0}
-          rules={[{ required: true, validator: priceValidator }]}
-        >
-          <Input placeholder='请输入市场单价' maxLength={11} />
-        </Form.Item>
-        {selectList.map((item: number) => (
-          <Form.Item
-            label={transValtoLabel(item)}
-            key={item}
-            name={item}
-            rules={[{ required: true, validator: priceValidator }]}
-          >
-            <Input placeholder='请输入定价金额' maxLength={11} />
-          </Form.Item>
-        ))}
-      </Form>
-    </Modal>
-  );
-};
-
-export default ConfigurePriceModal;

src/components/goods/commonAddOrEdit/goodsIntroduce/index.scss

-.goods-introduce {
-  &-title {
-    font-size: 15px;
-    font-weight: bold;
-    margin: 20px 0;
-  }
-  &-content {
-    margin-left: 50px;
-  }
-}
-.ql-container {
-  height: 400px;
-}

src/components/goods/commonAddOrEdit/goodsIntroduce/index.tsx

-import './index.scss';
-import RichText from '~/components/richText';
-import { FC } from 'react';
-import { InterDataType } from '~/api/interface';
-import { detailGoodsType } from '~/api/interface/goodsType';
-//商品返回类型
-type goodsDetailType = InterDataType<detailGoodsType>;
-
-interface selfProps {
-  getRichText: (html?: string) => void;
-  goodsDetail: goodsDetailType | undefined;
-  isDetail: boolean;
-}
-
-const GoodsIntroduce: FC<selfProps> = ({ getRichText, goodsDetail, isDetail }) => {
-  const richTextChange = (html?: string) => {
-    getRichText(html);
-  };
-  return (
-    <div className='goods-introduce'>
-      <div className='goods-introduce-title'>产品介绍图</div>
-      <div className='goods-introduce-content'>
-        <RichText
-          richTextContent={goodsDetail?.goodsDetail.content}
-          onChange={richTextChange}
-          isDetail={isDetail}
-        />
-      </div>
-    </div>
-  );
-};
-export default GoodsIntroduce;

src/components/goods/commonAddOrEdit/otherInfo/index.scss

-.other-info {
-  &-title {
-    font-size: 15px;
-    font-weight: bold;
-    margin: 20px 0;
-  }
-  &-form {
-    margin-left: 50px;
-  }
-}

src/components/goods/commonAddOrEdit/otherInfo/index.tsx

-import React, { useEffect, useState } from 'react';
-import { Checkbox, Form } from 'antd';
-import './index.scss';
-import GoodsAPI from '~/api/modules/goodsAPI';
-import { detailGoodsType, otherServiceType } from '~/api/interface/goodsType';
-import { InterDataType } from '~/api/interface';
-//商品返回类型
-type goodsDetailType = InterDataType<detailGoodsType>;
-
-interface selfProps {
-  otherServiceSelect: (id: number[]) => void;
-  goodsDetail: goodsDetailType | undefined;
-  isDetail: boolean;
-}
-//其它服务返回类型
-type otherServiceListType = InterDataType<otherServiceType>;
-
-const OtherInfo: React.FC<selfProps> = ({ otherServiceSelect, goodsDetail, isDetail }) => {
-  const [otherInfoForm] = Form.useForm();
-  //其它服务
-  const [otherServiceList, setOtherServiceList] = useState<otherServiceListType>([]);
-  const otherServiceRadioChange = (e: any) => {
-    otherServiceSelect(e);
-  };
-  //获取其它服务
-  const getOtherServiceList = () => {
-    GoodsAPI.getOtherServiceList().then(({ result }) => {
-      setOtherServiceList(result);
-    });
-  };
-
-  useEffect(() => {
-    getOtherServiceList();
-  }, []);
-
-  useEffect(() => {
-    if (goodsDetail) {
-      otherInfoForm.setFieldsValue({
-        otherService: goodsDetail.otherService.map((v) => v.saleServiceId),
-      });
-    }
-  }, [goodsDetail]);
-  return (
-    <div className='other-info'>
-      <div className='other-info-title'>其它信息</div>
-      <div className='other-info-form'>
-        <Form form={otherInfoForm} disabled={isDetail}>
-          <Form.Item label='搭配服务' name='otherService'>
-            <Checkbox.Group onChange={otherServiceRadioChange}>
-              {otherServiceList.map((item: any, index: number) => (
-                <Checkbox value={item.id} key={index}>
-                  {item.saleServiceName}
-                </Checkbox>
-              ))}
-            </Checkbox.Group>
-          </Form.Item>
-        </Form>
-      </div>
-    </div>
-  );
-};
-
-export default OtherInfo;

src/components/goods/commonAddOrEdit/stockSku/index.scss

-.stock-sku {
-  &-title {
-    font-size: 15px;
-    font-weight: bold;
-    margin: 20px 0;
-  }
-  &-content {
-    margin-left: 50px;
-  }
-  &-operate {
-    margin-bottom: 10px;
-  }
-}

src/components/goods/commonAddOrEdit/stockSku/index.tsx

-import React from 'react';
-import { Table, Button } from 'antd';
-import { PlusOutlined } from '@ant-design/icons';
-import './index.scss';
-import { ColumnsType } from 'antd/es/table';
-import { customizeEntity, skuUnitType, specEntity } from '~/api/interface/goodsType';
-import { InterDataType } from '~/api/interface';
-
-//产品-规格单位返回类型
-type unitType = InterDataType<skuUnitType>;
-
-interface selfProps {
-  addOrEditSku: (record?: specEntity) => void;
-  specData: specEntity[];
-  skuUnitList: unitType;
-  deleteSku: (record: specEntity) => void;
-  isDetail: boolean;
-}
-//机构列表
-const StockSku: React.FC<selfProps> = ({
-  addOrEditSku,
-  specData,
-  skuUnitList,
-  deleteSku,
-  isDetail,
-}) => {
-  const columns: ColumnsType<specEntity> = [
-    {
-      title: '序号',
-      align: 'center',
-      render: (_text: string, _record: specEntity, index: number) => index + 1,
-    },
-    {
-      title: '规格名称',
-      align: 'center',
-      dataIndex: 'goodsSpecName',
-    },
-    {
-      title: `方案`,
-      align: 'center',
-      dataIndex: 'skuName',
-    },
-    {
-      title: '选项来源',
-      align: 'center',
-      dataIndex: 'specIds',
-      render: (_text: string, record) => (
-        <div>
-          {record.flag !== 1
-            ? record.specIds.map((i: any, j: number) => (
-                <div key={j}>
-                  {i.specName}
-                  {i.partNo && `(${i.partNo})`}
-                </div>
-              ))
-            : record.customizeInfo &&
-              record.customizeInfo.map((i, index: number) => (
-                <div key={index}>{getSelfSpecName(i)}</div>
-              ))}
-        </div>
-      ),
-    },
-    {
-      title: '选择方式',
-      align: 'center',
-      dataIndex: 'chooseType',
-      render: (text: number) => <div>{text === 0 ? '单选' : '多选'}</div>,
-    },
-    {
-      title: '是否必选',
-      align: 'center',
-      dataIndex: 'must',
-      render: (text: number) => <div>{text ? '必选' : '非必选'}</div>,
-    },
-    {
-      title: '规格单位',
-      align: 'center',
-      dataIndex: 'skuUnitId',
-      render: (text: number) => {
-        return <div>{getSkuUnitName(text)}</div>;
-      },
-    },
-    {
-      title: '操作',
-      align: 'center',
-      width: '20%',
-      render: (_text: any, record) => {
-        return (
-          <div>
-            <Button
-              type='link'
-              style={{ marginRight: '10px' }}
-              onClick={() => addOrEditSkuClick(record)}
-            >
-              编辑
-            </Button>
-            <Button type='link' onClick={() => deleteSkuClick(record)}>
-              删除
-            </Button>
-          </div>
-        );
-      },
-    },
-  ];
-  //添加、编辑规格操作
-  const addOrEditSkuClick = (record?: specEntity) => {
-    addOrEditSku(record);
-  };
-  //删除规格操作
-  const deleteSkuClick = (record: specEntity) => {
-    deleteSku(record);
-  };
-  // 自定义选项来源名称
-  const getSelfSpecName = (obj: customizeEntity) => {
-    return `${obj.specName}(${obj.partNo || ''})`;
-  };
-  // 单位名称
-  const getSkuUnitName = (id: number) => {
-    const unitObj = skuUnitList.find((i) => i.id === id);
-    return unitObj?.unitName;
-  };
-  return (
-    <div className='stock-sku'>
-      <div className='stock-sku-title'>库存规格</div>
-      <div className='stock-sku-content'>
-        {!isDetail && (
-          <div className='stock-sku-operate'>
-            <Button icon={<PlusOutlined />} type='primary' onClick={() => addOrEditSkuClick()}>
-              添加规格
-            </Button>
-          </div>
-        )}
-
-        <Table
-          size='small'
-          bordered
-          dataSource={specData}
-          rowKey='id'
-          pagination={false}
-          columns={isDetail ? columns.filter((v) => v.title !== '操作') : columns}
-        />
-      </div>
-    </div>
-  );
-};
-export default StockSku;

src/components/layout/title/index.tsx

-import React, { useState } from 'react';
+import { useState } from 'react';
 import { Header } from 'antd/es/layout/layout';
 import { DownOutlined, UpOutlined } from '@ant-design/icons';
 import { Button, Dropdown, Image, MenuProps, Modal } from 'antd';

src/components/search-box/index.tsx

@@ -19,6 +19,7 @@ export interface searchColumns {
     name?: string;
     value?: string | number | boolean | null;
     label?: string;
+    children?: any;
   }[];
   onSelect?: (value: any) => void;
   disable?: boolean;
@@ -87,6 +88,7 @@ const Index: React.FC<propsType> = (props) => {
       // 过滤为空项
       Object.entries(data).filter((i) => i[1] !== '' && i[1] !== undefined && i[1] !== null),
     );
+    // console.log('此处 --->', obj);
     props.searchData(obj);
   };
   useImperativeHandle(props.baseRef, () => ({

src/components/uploader/index.tsx

@@ -54,7 +54,7 @@ export const Uploader: React.FC<PropsType> = (props) => {
     listType,
     fileList,
     beforeUpload: (res) => {
-      console.log('文件类型-->', res);
+      // console.log('文件类型-->', res);
       const isType = fileType?.includes(res.type);
       const isSize = res.size / 1024 / 1024 < (fileSize || 2);
       if (!isType) {

src/components/video/index.scss

+.video-preview {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  z-index: 100;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .preview-mask{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0,0,0,0.35);
+  }
+  .button{
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 40px;
+    height: 40px;
+    background: rgba(0,0,0,0.35);
+    border-radius: 50%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #fff;
+    font-size: 20px;
+    cursor: pointer;
+  }
+  .video{
+    height: 80%;
+    z-index: 200;
+  }
+}

src/components/video/index.tsx

+import React from 'react';
+import { Image } from 'antd';
+import './index.scss';
+
+// 参数类型
+interface propsType {
+  src: string;
+  width?: number;
+  height?: number;
+  autoPlay?: boolean;
+  loop?: boolean;
+  controls?: boolean;
+}
+
+const Video: React.FC<propsType> = (props) => {
+  // 组件的默认值
+  Video.defaultProps = {
+    src: 'http://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/3505c402-cbf9-41a5-9d6f-bdb350625bea.jpg',
+    width: 40,
+    height: 40,
+  };
+  // 视频是否预览
+  const [isPreview, setIsPreview] = React.useState<boolean>(false);
+  return (
+    <>
+      <Image
+        src={`${props?.src}?x-oss-process=video/snapshot,t_3618&x-oss-process=image/quality,q_25`}
+        width={props?.width}
+        height={props?.height}
+        preview={false}
+        onClick={() => {
+          setIsPreview(true);
+        }}
+      />
+      {isPreview && (
+        <div className='video-preview'>
+          <view className='preview-mask' onClick={() => setIsPreview(false)}></view>
+          {/*<Button className='button' shape='circle' icon={<CloseOutlined />} />*/}
+          {/* eslint-disable-next-line jsx-a11y/media-has-caption */}
+          <video className='video' src={props?.src} autoPlay controls></video>
+        </div>
+      )}
+    </>
+  );
+};
+
+export default Video;

src/pages/categoryManage/serviceCategoryList/comp/addEditChildren/index.tsx

+import React, { useEffect } from 'react';
+import { Form, Input, message, Modal, ModalProps } from 'antd';
+import { InterListType, InterReqType } from '~/api/interface';
+import { industryListPagesType, inspectionInsertType } from '~/api/interface/categoryManage';
+import { PlusOutlined } from '@ant-design/icons';
+import { Uploader } from '~/components/uploader';
+import { CategoryManageAPI } from '~/api';
+
+// 列表的类型
+type TableType = InterListType<industryListPagesType>;
+// 表单参数
+type ReqType = InterReqType<inspectionInsertType>;
+// 参数类型
+interface selfProps {
+  id: number;
+  data?: TableType[0]['inspectionDTOS'][0];
+  onCancel: () => void;
+}
+
+const AddEditChildrenView: React.FC<ModalProps & selfProps> = ({
+  id,
+  open,
+  title,
+  onCancel,
+  data,
+}) => {
+  // 表格数据类型
+  const [form] = Form.useForm<ReqType>();
+  // 关闭事件
+  const handleCancel = () => {
+    form.resetFields();
+    onCancel();
+  };
+  // 确定事件
+  const handleOk = () => {
+    form
+      .validateFields()
+      .then(async (values) => {
+        // console.log('表单验证 --->', values);
+        await handleSubmit(values);
+      })
+      .catch((err) => {
+        message
+          .warning({
+            content: err.errorFields[0].errors[0],
+          })
+          .then();
+      });
+  };
+  // 提交数据
+  const handleSubmit = async (values: ReqType) => {
+    const res = await CategoryManageAPI[data?.id ? 'inspectionUpdate' : 'inspectionInsert']({
+      ...values,
+      id: data?.id || undefined,
+      industryTypeId: data?.id ? data?.industryTypeId : id,
+      caseImg: values?.caseImg
+        ? JSON.stringify((values?.caseImg as any).map((i: { url: string }) => ({ fileUrl: i.url })))
+        : undefined,
+      saleState: 1,
+    });
+    if (res && res.code === '200') {
+      message.success('操作成功').then();
+      handleCancel();
+    }
+  };
+  // 获取图片
+  const getImgParse = (text: string) => {
+    try {
+      return JSON.parse(text)?.map((i: { fileUrl: string }) => ({ url: i.fileUrl }));
+    } catch (e) {
+      return [{ url: text }];
+    }
+  };
+  // componentDidMount
+  useEffect(() => {
+    if (!open) return;
+    if (!data) return;
+    form.setFieldsValue({
+      ...data,
+      caseImg: getImgParse(data?.caseImg),
+    });
+  }, [open]);
+  return (
+    <Modal title={title} open={open} onCancel={handleCancel} onOk={handleOk} destroyOnClose>
+      <Form form={form} labelAlign='right' labelCol={{ span: 5 }} wrapperCol={{ span: 10 }}>
+        <Form.Item
+          label='分类名称'
+          name='inspectionName'
+          rules={[{ required: true, message: '请输入分类名称' }]}
+        >
+          <Input placeholder='请输入分类名称' maxLength={6} allowClear />
+        </Form.Item>
+        <Form.Item
+          label='分类图标'
+          name='inspectionImg'
+          rules={[{ required: true, message: '请上传分类图标' }]}
+        >
+          <Uploader
+            listType={'picture-card'}
+            fileUpload
+            fileLength={1}
+            fileSize={10}
+            fileType={['image/png', 'image/jpeg', 'image/jpg', 'image/gif', 'image/bmp']}
+            onChange={(e) =>
+              form.setFieldValue('inspectionImg', e.at(0) ? e.at(0)?.url : undefined)
+            }
+            defaultFileList={data?.inspectionImg ? [{ url: data?.inspectionImg }] : []}
+          >
+            <PlusOutlined />
+          </Uploader>
+        </Form.Item>
+        <Form.Item
+          label='分类描述'
+          name='inspectionDescription'
+          rules={[{ required: true, message: '请输入分类描述' }]}
+        >
+          <Input placeholder='请输入分类描述' maxLength={25} allowClear />
+        </Form.Item>
+        <Form.Item
+          label='服务编号'
+          name='inspectionNo'
+          rules={[{ required: true, message: '请输入服务编号' }]}
+        >
+          <Input placeholder='请输入服务编号' maxLength={15} allowClear />
+        </Form.Item>
+        <Form.Item
+          label='业务案例图片'
+          name='caseImg'
+          rules={[{ required: true, message: '请上传业务案例图片' }]}
+        >
+          <Uploader
+            listType={'picture-card'}
+            fileUpload
+            fileLength={4}
+            fileSize={10}
+            fileType={['image/png', 'image/jpeg', 'image/jpg', 'image/gif', 'image/bmp']}
+            onChange={(e) => form.setFieldValue('caseImg', e?.length ? e : undefined)}
+            defaultFileList={data?.caseImg ? getImgParse(data?.caseImg as any) : []}
+          >
+            <PlusOutlined />
+          </Uploader>
+        </Form.Item>
+        <Form.Item
+          label='业务案例视频'
+          name='caseVideo'
+          rules={[{ required: false, message: '请上传业务案例视频' }]}
+        >
+          <Uploader
+            listType={'picture-card'}
+            fileUpload
+            fileLength={1}
+            fileSize={10}
+            fileType={['video/mp4', 'video/wmv', 'video/avi', 'video/mov', 'video/flv']}
+            onChange={(e) => form.setFieldValue('caseVideo', e.at(0) ? e.at(0)?.url : undefined)}
+            defaultFileList={data?.caseVideo ? [{ url: data?.caseVideo }] : []}
+          >
+            <PlusOutlined />
+          </Uploader>
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+
+export default AddEditChildrenView;

src/pages/categoryManage/serviceCategoryList/comp/addEditModal/index.tsx

+import React, { useEffect } from 'react';
+import { Form, Input, message, Modal, ModalProps } from 'antd';
+import { InterListType, InterReqType } from '~/api/interface';
+import { industryListPagesType, industryUpdateType } from '~/api/interface/categoryManage';
+import { PlusOutlined } from '@ant-design/icons';
+import { Uploader } from '~/components/uploader';
+import { CategoryManageAPI } from '~/api';
+
+// 列表的类型
+type TableType = InterListType<industryListPagesType>;
+// 表单参数
+type ReqType = InterReqType<industryUpdateType>;
+// 参数类型
+interface selfProps {
+  data?: TableType[0];
+  onCancel: () => void;
+}
+
+const AddEditModalView: React.FC<ModalProps & selfProps> = ({ open, title, onCancel, data }) => {
+  // 表格数据类型
+  const [form] = Form.useForm<ReqType>();
+  // 关闭事件
+  const handleCancel = () => {
+    form.resetFields();
+    onCancel();
+  };
+  // 确定事件
+  const handleOk = () => {
+    form
+      .validateFields()
+      .then(async (values) => {
+        await handleSubmit(values);
+      })
+      .catch((err) => {
+        message
+          .warning({
+            content: err.errorFields[0].errors[0],
+          })
+          .then();
+      });
+  };
+  // 提交数据
+  const handleSubmit = async (values: ReqType) => {
+    const res = await CategoryManageAPI[data?.id ? 'industryUpdate' : 'industryInsert']({
+      ...values,
+      id: data?.id || undefined,
+      saleState: 1,
+    });
+    if (res && res.code === '200') {
+      message.success('操作成功').then();
+      handleCancel();
+    }
+  };
+  // componentDidMount
+  useEffect(() => {
+    if (!open) return;
+    if (!data) return;
+    form.setFieldsValue(data);
+    // console.log('data --->', data);
+  }, [open]);
+  return (
+    <Modal title={title} open={open} onCancel={handleCancel} onOk={handleOk} destroyOnClose>
+      <Form form={form} labelAlign='right' labelCol={{ span: 4 }} wrapperCol={{ span: 10 }}>
+        <Form.Item
+          label='分类名称'
+          name='typeName'
+          rules={[{ required: true, message: '请输入分类名称' }]}
+        >
+          <Input placeholder='请输入分类名称' maxLength={15} allowClear />
+        </Form.Item>
+        <Form.Item
+          label='分类图标'
+          name='typeImg'
+          rules={[{ required: true, message: '请上传分类图标' }]}
+        >
+          <Uploader
+            listType={'picture-card'}
+            fileUpload
+            fileLength={1}
+            fileSize={10}
+            fileType={['image/png', 'image/jpeg', 'image/jpg', 'image/gif', 'image/bmp']}
+            onChange={(e) => form.setFieldValue('typeImg', e.at(0) ? e.at(0)?.url : undefined)}
+            defaultFileList={data?.typeImg ? [{ url: data?.typeImg }] : []}
+          >
+            <PlusOutlined />
+          </Uploader>
+        </Form.Item>
+        <Form.Item
+          label='分类描述'
+          name='description'
+          rules={[{ required: true, message: '请输入分类描述' }]}
+        >
+          <Input placeholder='请输入分类名称' maxLength={25} allowClear />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+
+export default AddEditModalView;

src/pages/categoryManage/serviceCategoryList/comp/addEditTagModal/index.tsx

+import React, { useEffect } from 'react';
+import { Form, Input, message, Modal, ModalProps } from 'antd';
+import { InterItemType, InterReqType } from '~/api/interface';
+import { listByInspectionIdType, industryUpdateType } from '~/api/interface/categoryManage';
+import { CategoryManageAPI } from '~/api';
+
+// 表格类型
+type TableType = InterItemType<listByInspectionIdType>;
+// 表单参数
+type ReqType = InterReqType<industryUpdateType>;
+// 参数类型
+interface selfProps {
+  id: number;
+  data?: TableType[0];
+  onCancel: () => void;
+}
+
+const AddEditTagModalView: React.FC<ModalProps & selfProps> = ({
+  id,
+  open,
+  title,
+  onCancel,
+  data,
+}) => {
+  // 表格数据类型
+  const [form] = Form.useForm<ReqType>();
+  // 关闭事件
+  const handleCancel = () => {
+    form.resetFields();
+    onCancel();
+  };
+  // 确定事件
+  const handleOk = () => {
+    form
+      .validateFields()
+      .then(async (values) => {
+        await handleSubmit(values);
+      })
+      .catch((err) => {
+        message
+          .warning({
+            content: err.errorFields[0].errors[0],
+          })
+          .then();
+      });
+  };
+  // 提交数据
+  const handleSubmit = async (values: ReqType) => {
+    const res = await CategoryManageAPI[data?.id ? 'inspectionTagUpdate' : 'inspectionTagInsert']({
+      ...values,
+      inspectionId: id,
+      id: data?.id || undefined,
+    });
+    if (res && res.code === '200') {
+      message.success('操作成功').then();
+      handleCancel();
+    }
+  };
+  // componentDidMount
+  useEffect(() => {
+    if (!open) return;
+    if (!data) return;
+    form.setFieldsValue(data);
+    // console.log('data --->', data);
+  }, [open]);
+  return (
+    <Modal title={title} open={open} onCancel={handleCancel} onOk={handleOk} destroyOnClose>
+      <Form form={form} labelAlign='right' labelCol={{ span: 4 }} wrapperCol={{ span: 10 }}>
+        <Form.Item
+          label='标签名称'
+          name='tagName'
+          rules={[{ required: true, message: '请输入标签名称' }]}
+        >
+          <Input placeholder='请输入标签名称' maxLength={15} allowClear />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+
+export default AddEditTagModalView;

src/pages/categoryManage/serviceCategoryList/components/addOrEditModal/index.tsx

-import { FC } from 'react';
-import { Form, Input, Modal, ModalProps } from 'antd';
-
-interface selfProps {
-  onCancel: () => void;
-  onOk: () => void;
-}
-
-const AddOrEditModal: FC<ModalProps & selfProps> = ({ open, onCancel, onOk }) => {
-  const handleCancel = () => {
-    onCancel();
-  };
-  const handleOk = () => {
-    onOk();
-  };
-
-  return (
-    <Modal title='新增分类' open={open} onCancel={handleCancel} onOk={handleOk}>
-      <Form>
-        <Form.Item label='分类名称'>
-          <Input placeholder='请输入分类名称' />
-        </Form.Item>
-        <Form.Item label='分类图标'></Form.Item>
-        <Form.Item label='分类描述'></Form.Item>
-      </Form>
-    </Modal>
-  );
-};
-export default AddOrEditModal;

src/pages/categoryManage/serviceCategoryList/detail/index.tsx

+import React, { useEffect, useState } from 'react';
+import { useLocation, useNavigate } from 'react-router-dom';
+import { Button, Descriptions, Image, message, Modal, Table } from 'antd';
+import { ArrowLeftOutlined, PlusOutlined } from '@ant-design/icons';
+import SearchBox from '~/components/search-box';
+import qs from 'query-string';
+import { inspectionDetailType, listByInspectionIdType } from '~/api/interface/categoryManage';
+import { InterDataType, InterItemType } from '~/api/interface';
+import { CategoryManageAPI } from '~/api';
+import { ColumnsType } from 'antd/es/table';
+import AddEditTagModalView from '~/pages/categoryManage/serviceCategoryList/comp/addEditTagModal';
+import Video from '~/components/video';
+
+// 表格类型
+type TableType = InterItemType<listByInspectionIdType>;
+
+const ServiceCategoryDetail: React.FC = () => {
+  // 路由钩子
+  const location = useLocation();
+  // 导航钩子
+  const navigate = useNavigate();
+  // 返回上一页
+  const handleBack = () => {
+    navigate(-1);
+  };
+  // 新增编辑标签是否显示
+  const [addEditVisible, setAddEditVisible] = useState(false);
+  // 编辑的数据
+  const [recordData, setRecordData] = useState<TableType[0]>();
+  // 表格数据
+  const [tableData, setTableData] = useState<TableType>([]);
+  // 加载列表
+  const getTableList = async () => {
+    // 只需要修改这个地方的接口即可
+    const res = await CategoryManageAPI.listByInspectionId({
+      id: Number(qs.parse(location.search).id),
+    });
+    if (res && res.code === '200') {
+      const { result } = res; // 解构
+      setTableData(result || []);
+    }
+  };
+  // 删除数据
+  const handleDelete = (record: TableType[0]) => {
+    Modal.confirm({
+      title: '提示',
+      content: '是否删除该场景标签？',
+      onOk: async () => {
+        const res = await CategoryManageAPI.inspectionTagDelete({
+          id: record.id,
+        });
+        if (res && res.code === '200') {
+          message.success('删除成功');
+          await getTableList();
+        }
+      },
+    });
+  };
+  // 服务详情
+  const [inspectionDetail, setInspectionDetail] = useState<InterDataType<inspectionDetailType>>();
+  // 获取服务详情
+  const getInspectionDetail = async () => {
+    const res = await CategoryManageAPI.inspectionDetail({
+      id: Number(qs.parse(location.search).id),
+    });
+    if (res && res.code === '200') {
+      setInspectionDetail(res.result);
+    }
+  };
+  // 获取图片
+  const getImgParse = (text: string) => {
+    try {
+      return JSON.parse(text);
+    } catch (e) {
+      return [{ fileUrl: text }];
+    }
+  };
+  // 组件挂载
+  useEffect(() => {
+    getInspectionDetail().then();
+    getTableList().then();
+  }, []);
+  // 表格结构
+  const columns: ColumnsType<TableType[0]> = [
+    {
+      title: '序号',
+      dataIndex: 'tagName',
+      align: 'center',
+      render: (_text, _record, index) => `${index + 1}`,
+    },
+    {
+      title: '场景标签',
+      dataIndex: 'tagName',
+      align: 'center',
+    },
+    {
+      title: '操作',
+      dataIndex: 'id',
+      align: 'center',
+      width: 200,
+      render: (_text, record) => (
+        <>
+          <Button
+            type='link'
+            size='small'
+            onClick={() => {
+              setRecordData(record);
+              setAddEditVisible(true);
+            }}
+          >
+            编辑
+          </Button>
+          <Button type='link' size='small' onClick={() => handleDelete(record)} danger>
+            删除
+          </Button>
+        </>
+      ),
+    },
+  ];
+  return (
+    <>
+      <SearchBox
+        child={
+          <Button type={'primary'} icon={<ArrowLeftOutlined />} onClick={() => handleBack()}>
+            返回
+          </Button>
+        }
+      />
+      <Descriptions
+        title='子分类详情'
+        bordered
+        style={{ marginBottom: '20px', width: '60%' }}
+        column={2}
+        labelStyle={{ width: '15%' }}
+        contentStyle={{ width: '30%' }}
+      >
+        <Descriptions.Item label='分类名称'>{inspectionDetail?.inspectionName}</Descriptions.Item>
+        <Descriptions.Item label='分类图标'>
+          <Image src={inspectionDetail?.inspectionImg} width={40} height={40} />
+        </Descriptions.Item>
+        <Descriptions.Item label='分类描述'>
+          {inspectionDetail?.inspectionDescription}
+        </Descriptions.Item>
+        <Descriptions.Item label='服务编号'>{inspectionDetail?.inspectionNo}</Descriptions.Item>
+        <Descriptions.Item label='业务案例图片'>
+          {getImgParse(inspectionDetail?.caseImg as string).map(
+            (i: { fileUrl: string }, j: React.Key) => (
+              <Image src={i.fileUrl} width={40} height={40} key={j} />
+            ),
+          )}
+        </Descriptions.Item>
+        <Descriptions.Item label='业务案例视频'>
+          {inspectionDetail?.caseVideo && (
+            <Video src={inspectionDetail?.caseVideo} width={40} height={40} />
+          )}
+        </Descriptions.Item>
+      </Descriptions>
+      <SearchBox
+        sufFixBtn={
+          <Button
+            type={'primary'}
+            icon={<PlusOutlined />}
+            onClick={() => {
+              setRecordData(undefined);
+              setAddEditVisible(true);
+            }}
+          >
+            新增场景标签
+          </Button>
+        }
+      />
+      <Table
+        style={{ width: '60%' }}
+        size='small'
+        dataSource={tableData}
+        columns={columns}
+        rowKey='id'
+        // scroll={{ x: 1500 }}
+        bordered
+        pagination={{
+          showTotal: (total, range) => `当前 ${range[0]}-${range[1]} 条记录 / 共 ${total} 条数据`,
+        }}
+      />
+      <AddEditTagModalView
+        title={recordData ? '编辑场景标签' : '新增场景标签'}
+        open={addEditVisible}
+        data={recordData}
+        id={Number(qs.parse(location.search).id)}
+        onCancel={() => {
+          setAddEditVisible(false);
+          setRecordData(undefined);
+          getTableList().then();
+        }}
+      />
+    </>
+  );
+};
+
+export default ServiceCategoryDetail;

src/pages/forumManage/dynamicList/index.tsx

@@ -199,14 +199,14 @@ const DynamicList = () => {
       okText: '审核通过',
       cancelText: '审核不通过',
       onOk: async () => {
-        const res = await ForumManageAPI.checkDynamic({ dynamicId: record.id, status: 1 });
+        const res = await ForumManageAPI.checkDynamic({ dynamicId: record.id, status: true });
         if (res && res.code === '200') {
           message.success('操作成功');
           paginationChange(pagination.pageNo, pagination.pageSize);
         }
       },
       onCancel: async () => {
-        const res = await ForumManageAPI.checkDynamic({ dynamicId: record.id, status: 2 });
+        const res = await ForumManageAPI.checkDynamic({ dynamicId: record.id, status: false });
         if (res && res.code === '200') {
           message.success('操作成功');
           paginationChange(pagination.pageNo, pagination.pageSize);

src/pages/mallManage/serviceManageOld/serviceDetail/index.tsx

+import { Button, Form, Image } from 'antd';
+import { useNavigate, useSearchParams } from 'react-router-dom';
+import './index.scss';
+import { MallManageAPI } from '~/api';
+import { useEffect, useState } from 'react';
+import { InterDataType } from '~/api/interface';
+import { serviceDetailType } from '~/api/interface/mallManageType';
+
+//服务详情-返回类型
+type detailType = InterDataType<serviceDetailType>;
+const ServiceDetail = () => {
+  const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
+
+  const [serviceDetail, setServiceDetail] = useState<detailType>();
+  //服务详情
+  const getServiceDetail = (id: number) => {
+    MallManageAPI.getServiceDetail({ id }).then(({ result }) => {
+      setServiceDetail(result);
+    });
+  };
+  //返回
+  const backRoute = () => {
+    navigate(-1);
+  };
+  useEffect(() => {
+    getServiceDetail(Number(searchParams.get('id')));
+  }, []);
+  return (
+    <div className='service-detail'>
+      <div className='service-detail-operate'>
+        <Button type='primary' onClick={backRoute}>
+          返回
+        </Button>
+      </div>
+      <div className='service-detail-form'>
+        <Form labelCol={{ span: 2 }} wrapperCol={{ span: 16 }}>
+          <Form.Item label='服务名称'>{serviceDetail?.serviceName}</Form.Item>
+          <Form.Item label='应用类型'>{serviceDetail?.applicationName}</Form.Item>
+          <Form.Item label='对应行业'>{serviceDetail?.industryName}</Form.Item>
+          <Form.Item label='展示状态'>
+            {serviceDetail?.displayState === 0 ? '上架' : '下架'}
+          </Form.Item>
+          <Form.Item label='所属单位'>{serviceDetail?.companyName}</Form.Item>
+          <Form.Item label='封面图'>
+            <Image src={serviceDetail?.coverPlan} width={100} height={100} />
+          </Form.Item>
+          <Form.Item label='分享卡片'>
+            {serviceDetail?.shareCard ? (
+              <Image src={serviceDetail.shareCard} width={100} height={100} />
+            ) : (
+              '暂无'
+            )}
+          </Form.Item>
+          <Form.Item label='视频'>
+            {serviceDetail?.video ? (
+              <video
+                src={serviceDetail?.video}
+                controls
+                style={{ width: '200px', height: '200px' }}
+              />
+            ) : (
+              '暂无'
+            )}
+          </Form.Item>
+        </Form>
+      </div>
+    </div>
+  );
+};
+export default ServiceDetail;

src/pages/rentManage/rentGoods/rentAddOrEdit/components/accessoryList/index.scss

+.accessory-list{
+  &-title{
+    font-size: 15px;
+    font-weight: bold;
+    line-height: 40px;
+  }
+}

src/pages/rentManage/rentGoods/rentAddOrEdit/components/accessoryList/index.tsx

+import './index.scss';
+import { Button, Col, Form, Row, Table, Tooltip } from 'antd';
+import { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
+import { InterDataType, InterReqType } from '~/api/interface';
+import { addRentGoodsType, leaseGoodsDetailsType } from '~/api/interface/rentManageType';
+import EditableCell from '~/components/EditableCell';
+import { MinusOutlined, PlusOutlined } from '@ant-design/icons';
+import { isEmptyBol, regPriceNumber } from '~/utils/validateUtils';
+
+//租赁商品详情返回类型
+type rentGoodsDetailType = InterDataType<leaseGoodsDetailsType>;
+//租赁-清单类型
+type leasePartsListType = Exclude<
+  InterReqType<addRentGoodsType>,
+  undefined
+>['leasePartsList'][0] & { id?: number };
+
+type EditableTableProps = Parameters<typeof Table>[0];
+type ColumnTypes = Exclude<EditableTableProps['columns'], undefined>;
+
+interface selfProps {
+  ref: any;
+  rentGoodsDetails: rentGoodsDetailType | undefined;
+}
+
+const AccessoryList = forwardRef<any, selfProps>(({ rentGoodsDetails }, ref) => {
+  const [accessoryTableForm] = Form.useForm<{ [x: string]: string | number }>();
+
+  //库存正则校验
+  const stockValidator = (_rules: any, value: number) => {
+    if (!isEmptyBol(value)) {
+      if (/^[+]{0,1}(\d+)$/.test(value.toString())) {
+        if (value > 99999999 || value < 0) {
+          return Promise.reject(new Error('库存最大为99999999且大于0'));
+        }
+        return Promise.resolve();
+      } else {
+        return Promise.reject(new Error('请输入正整数'));
+      }
+    } else {
+      return Promise.resolve();
+    }
+  };
+  //价格正则校验
+  const priceValidator = (_rules: any, value: number) => {
+    if (!isEmptyBol(value)) {
+      if (regPriceNumber(value.toString())) {
+        if (value > 99999999 || value < 0) {
+          return Promise.reject(new Error('价格最大为99999999且大于0'));
+        }
+        return Promise.resolve();
+      } else {
+        return Promise.reject(new Error('为整数且最多保留两位小数'));
+      }
+    } else {
+      return Promise.resolve();
+    }
+  };
+  const accessoryTableDefaultColumns: (ColumnTypes[number] & {
+    editable?: boolean;
+    dataIndex?: string;
+    inputType?: string;
+    rules?: any;
+    maxLength?: number;
+  })[] = [
+    {
+      title: '序号',
+      align: 'center',
+      render: (_: any, _record: any, index: number) => index + 1,
+    },
+    {
+      title: '名称',
+      editable: true,
+      dataIndex: 'name',
+      align: 'center',
+      width: '30%',
+      maxLength: 30,
+    },
+    {
+      title: '数量',
+      editable: true,
+      dataIndex: 'number',
+      align: 'center',
+      inputType: 'number',
+      width: '15%',
+      rules: [{ required: false, validator: stockValidator }],
+    },
+    {
+      title: '参考价格',
+      editable: true,
+      dataIndex: 'price',
+      align: 'center',
+      inputType: 'number',
+      rules: [{ required: false, validator: priceValidator }],
+    },
+    {
+      title: '操作',
+      align: 'center',
+      render: (_: any, _record: any, index: number) => (
+        <>
+          {index === accessoryTableData.length - 1 ? (
+            <Tooltip placement='top' title='添加一行'>
+              <Button
+                type='primary'
+                icon={<PlusOutlined />}
+                style={{ marginRight: '5px' }}
+                onClick={addAccessoryTableClick}
+              ></Button>
+            </Tooltip>
+          ) : (
+            ''
+          )}
+          {index ? (
+            <Tooltip placement='top' title='删除一行'>
+              <Button
+                type='primary'
+                icon={<MinusOutlined />}
+                onClick={() => deleteAccessoryTableClick(index)}
+              ></Button>
+            </Tooltip>
+          ) : (
+            ''
+          )}
+        </>
+      ),
+    },
+  ];
+  const accessoryTableColumns = accessoryTableDefaultColumns.map((col) => {
+    if (!col.editable) {
+      return col;
+    }
+    return {
+      ...col,
+      onCell: (record: any) => ({
+        record,
+        dataIndex: col.dataIndex,
+        title: col.title,
+        editing: col.editable,
+        inputType: col.inputType,
+        rules: col.rules,
+        maxLength: col.maxLength,
+      }),
+    };
+  });
+  const [accessoryTableData, setAccessoryTableData] = useState<leasePartsListType[]>([
+    { id: Math.random(), name: '', number: 0, price: 0 },
+  ]);
+
+  useImperativeHandle(ref, () => ({
+    accessoryTableFormSubmit,
+  }));
+
+  //新加一行
+  const addAccessoryTableClick = () => {
+    setAccessoryTableData([
+      ...accessoryTableData,
+      { id: Math.random(), name: '', number: 0, price: 0 },
+    ]);
+  };
+  //删除一行
+  const deleteAccessoryTableClick = (index: number) => {
+    accessoryTableData.splice(index, 1);
+    setAccessoryTableData([...accessoryTableData]);
+  };
+  //配件清单表单提交
+  const accessoryTableFormSubmit = () => {
+    return new Promise((resolve, reject) => {
+      accessoryTableForm
+        .validateFields()
+        .then((value: any) => {
+          resolve(
+            accessoryTableData.reduce((pre: leasePartsListType[], cur) => {
+              if (value['name' + cur.id] || value['price' + cur.id] || value['number' + cur.id]) {
+                pre.push({
+                  name: value['name' + cur.id],
+                  price: value['price' + cur.id],
+                  number: value['number' + cur.id],
+                  id: rentGoodsDetails
+                    ? rentGoodsDetails.leasePartsList?.some((v) => v.id === cur.id)
+                      ? cur.id
+                      : undefined
+                    : undefined,
+                });
+              }
+
+              return pre;
+            }, []),
+          );
+        })
+        .catch((err) => {
+          reject(err);
+        });
+    });
+  };
+
+  useEffect(() => {
+    if (rentGoodsDetails) {
+      if (rentGoodsDetails.leasePartsList) {
+        setAccessoryTableData(rentGoodsDetails.leasePartsList);
+        const defaultFormValue: { [x: string]: string | undefined | number } =
+          rentGoodsDetails.leasePartsList.reduce(
+            (pre: { [x: string]: string | undefined | number }, cur) => {
+              pre['name' + cur.id] = cur.name || undefined;
+              pre['number' + cur.id] = cur.number || undefined;
+              pre['price' + cur.id] = cur.price || undefined;
+              return pre;
+            },
+            {},
+          );
+        accessoryTableForm.setFieldsValue(defaultFormValue);
+      }
+    }
+  }, [rentGoodsDetails]);
+
+  return (
+    <div className='accessory-list'>
+      <div className='accessory-list-title'>配件清单</div>
+      <Row>
+        <Col span={2}></Col>
+        <Col span={11}>
+          <Form form={accessoryTableForm}>
+            <Table
+              columns={accessoryTableColumns as ColumnTypes}
+              bordered
+              dataSource={accessoryTableData}
+              rowKey='id'
+              pagination={false}
+              components={{
+                body: {
+                  cell: EditableCell,
+                },
+              }}
+            />
+          </Form>
+        </Col>
+      </Row>
+    </div>
+  );
+});
+export default AccessoryList;

src/pages/rentManage/rentGoods/rentAddOrEdit/components/addressInfo/index.scss

+.address-info{
+  &-title{
+    font-size: 15px;
+    font-weight: bold;
+    line-height: 40px;
+  }
+}

src/pages/rentManage/rentGoods/rentAddOrEdit/components/addressInfo/index.tsx

+import './index.scss';
+import { Button, Col, Form, Radio, Row, Select } from 'antd';
+import { OrderManageAPI, RentManageAPI, SystemManageAPI } from '~/api';
+import { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
+import { PlusOutlined } from '@ant-design/icons';
+import AddOrEditAddressModal from '~/pages/systemManage/addressManage/components/addOrEditAddressModal';
+import { InterDataType } from '~/api/interface';
+import { leaseGoodsDetailsType } from '~/api/interface/rentManageType';
+
+//租赁商品详情返回类型
+type rentGoodsDetailType = InterDataType<leaseGoodsDetailsType>;
+interface selfProps {
+  ref: any;
+  rentGoodsDetails: rentGoodsDetailType | undefined;
+}
+
+const AddressInfo = forwardRef<any, selfProps>(({ rentGoodsDetails }, ref) => {
+  const [addressInfoForm] = Form.useForm<{
+    shipAddress: number;
+    returnAddress: number;
+    logisticsCompany: string;
+    modeOfDelivery: number;
+  }>();
+
+  const [addOrEditAddressModalShow, setAddOrEditAddressModalShow] = useState<boolean>(false);
+
+  const [addressOptionList, setAddressOptionList] = useState<
+    { label: string; value: number; districtCode: string }[]
+  >([]);
+  const [expressOptionList, setExpressOptionList] = useState<{ label: string; value: string }[]>(
+    [],
+  );
+  //配送方式
+  const [shippingMethodList, setShippingMethodList] = useState<
+    { id: number; saleServiceName: string }[]
+  >([]);
+
+  useImperativeHandle(ref, () => ({
+    addressInfoFormSubmit,
+    getForm: () => addressInfoForm,
+  }));
+
+  //地址列表
+  const getAddressList = () => {
+    SystemManageAPI.getAddressList({}).then(({ result }) => {
+      if (result) {
+        const optionList = result.map((v) => ({
+          label: v.takeName + v.takePhone + `(${v.takeRegion.split('/').join('') + v.takeAddress})`,
+          value: v.id,
+          districtCode: v.districtCode,
+        }));
+        const addressItemObj = result.find((v) => v.type === 0);
+        if (addressItemObj) {
+          addressInfoForm.setFieldsValue({
+            returnAddress: addressItemObj.id,
+            shipAddress: addressItemObj.id,
+          });
+        }
+        setAddressOptionList(optionList);
+      }
+    });
+  };
+  //物流公司列表
+  const getListExpressInfo = () => {
+    OrderManageAPI.listExpressInfo().then(({ result }) => {
+      if (result) {
+        const optionList = result.map((v) => ({
+          label: v.exName,
+          value: v.exCode,
+        }));
+        setExpressOptionList(optionList);
+      }
+    });
+  };
+  //物流-配送方式
+  const getOtherService = () => {
+    RentManageAPI.getOtherServiceList().then(({ result }) => {
+      setShippingMethodList(result || []);
+    });
+  };
+  //物流表单提交
+  const addressInfoFormSubmit = () => {
+    return new Promise((resolve, reject) => {
+      addressInfoForm
+        .validateFields()
+        .then((values) => {
+          resolve({
+            ...values,
+            districtCode: addressOptionList.find((v) => v.value === values.shipAddress)
+              ?.districtCode,
+          });
+        })
+        .catch((err) => {
+          reject(err);
+        });
+    });
+  };
+  //新增地址弹窗
+  const addAddressClick = () => [setAddOrEditAddressModalShow(true)];
+  const addOrEditAddressModalOk = () => {
+    getAddressList();
+    setAddOrEditAddressModalShow(false);
+  };
+  const addOrEditAddressModalCancel = () => {
+    setAddOrEditAddressModalShow(false);
+  };
+
+  useEffect(() => {
+    getAddressList();
+    getListExpressInfo();
+    getOtherService();
+  }, []);
+
+  useEffect(() => {
+    if (rentGoodsDetails) {
+      addressInfoForm.setFieldsValue({
+        shipAddress: rentGoodsDetails.shipAddress,
+        returnAddress: rentGoodsDetails.returnAddress,
+        logisticsCompany: rentGoodsDetails.logisticsCompany,
+        modeOfDelivery: rentGoodsDetails.modeOfDelivery,
+      });
+    }
+  }, [rentGoodsDetails]);
+  return (
+    <div className='address-info'>
+      <div className='address-info-title'>物流信息</div>
+      <Form labelCol={{ span: 2 }} wrapperCol={{ span: 10 }} form={addressInfoForm}>
+        <Form.Item
+          label='发货地址'
+          name='shipAddress'
+          rules={[{ required: true, message: '请选择发货地址' }]}
+        >
+          <Select placeholder='请选择发货地址' options={addressOptionList}></Select>
+        </Form.Item>
+        <Form.Item>
+          <Row>
+            <Col span={5}></Col>
+            <Col>
+              <Button type='link' icon={<PlusOutlined />} onClick={addAddressClick}>
+                新增地址
+              </Button>
+            </Col>
+          </Row>
+        </Form.Item>
+
+        <Form.Item
+          label='归还地址'
+          name='returnAddress'
+          rules={[{ required: true, message: '请选择归还地址' }]}
+        >
+          <Select placeholder='请选择归还地址' options={addressOptionList}></Select>
+        </Form.Item>
+        <Form.Item>
+          <Row>
+            <Col span={5}></Col>
+            <Col>
+              <Button type='link' icon={<PlusOutlined />} onClick={addAddressClick}>
+                新增地址
+              </Button>
+            </Col>
+          </Row>
+        </Form.Item>
+        <Form.Item
+          label='寄出物流'
+          name='logisticsCompany'
+          rules={[{ required: true, message: '请选择寄出物流' }]}
+        >
+          <Select placeholder='请选择寄出物流' options={expressOptionList}></Select>
+        </Form.Item>
+        <Form.Item
+          label='配送方式（寄出）'
+          name='modeOfDelivery'
+          rules={[{ required: true, message: '请选择配送方式（寄出）' }]}
+        >
+          <Radio.Group>
+            {shippingMethodList.map((v) => (
+              <Radio value={v.id} key={v.id}>
+                {v.saleServiceName}
+              </Radio>
+            ))}
+          </Radio.Group>
+        </Form.Item>
+      </Form>
+      <AddOrEditAddressModal
+        open={addOrEditAddressModalShow}
+        onOk={addOrEditAddressModalOk}
+        onCancel={addOrEditAddressModalCancel}
+      />
+    </div>
+  );
+});
+export default AddressInfo;

src/pages/rentManage/rentGoods/rentAddOrEdit/components/footerOperate/index.scss

+.rent-footer-operate{
+  background: #fff;
+  height: 70px;
+  position: fixed;
+  bottom: 10px;
+  left: 180px;
+  right: 10px;
+  box-shadow: 0 -5px 1px -5px rgba(0,0,0,0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  button{
+    height: 40px;
+    width: 80px;
+    &:first-child{
+      margin-right: 50px;
+    }
+  }
+}

src/pages/rentManage/rentGoods/rentAddOrEdit/components/footerOperate/index.tsx

+import './index.scss';
+import { Button } from 'antd';
+import { useNavigate } from 'react-router-dom';
+import { FC } from 'react';
+
+interface selfProps {
+  saveRentGoods: () => void;
+}
+
+const FooterOperate: FC<selfProps> = ({ saveRentGoods }) => {
+  const navigate = useNavigate();
+
+  //返回
+  const backRoute = () => {
+    navigate(-1);
+  };
+
+  return (
+    <div className='rent-footer-operate'>
+      <Button onClick={backRoute}>返回</Button>
+      <Button type='primary' onClick={saveRentGoods}>
+        保存
+      </Button>
+    </div>
+  );
+};
+export default FooterOperate;

src/pages/rentManage/rentGoods/rentAddOrEdit/components/goodsInfo/index.scss

+.goods-info{
+  &-title{
+    font-size: 15px;
+    font-weight: bold;
+    line-height: 40px;
+  }
+}

src/pages/rentManage/rentGoods/rentAddOrEdit/components/goodsInfo/index.tsx

+import { Form, Input, Radio } from 'antd';
+import './index.scss';
+import { forwardRef, useEffect, useImperativeHandle } from 'react';
+import { InterDataType } from '~/api/interface';
+import { leaseGoodsDetailsType } from '~/api/interface/rentManageType';
+import { qualityList } from '~/utils/dictionary';
+
+//租赁商品详情返回类型
+type rentGoodsDetailType = InterDataType<leaseGoodsDetailsType>;
+type goodsInfoForm = {
+  tradeName: string;
+  sellingPoint: string;
+  level: number;
+  shelfStatus: number;
+};
+interface selfProps {
+  ref: any;
+  rentGoodsDetails: rentGoodsDetailType | undefined;
+}
+
+const GoodsInfo = forwardRef<any, selfProps>(({ rentGoodsDetails }, ref) => {
+  const [form] = Form.useForm<goodsInfoForm>();
+
+  useImperativeHandle(ref, () => ({
+    submitGoodsInfoForm,
+    getForm: () => form,
+  }));
+
+  const submitGoodsInfoForm = () => {
+    return new Promise((resolve, reject) => {
+      form
+        .validateFields()
+        .then((value) => {
+          resolve(value);
+        })
+        .catch((error) => {
+          console.log('商品信息错误--->', error);
+          reject(error);
+        });
+    });
+  };
+
+  useEffect(() => {
+    if (rentGoodsDetails) {
+      form.setFieldsValue({
+        tradeName: rentGoodsDetails.tradeName,
+        sellingPoint: rentGoodsDetails.sellingPoint,
+        level: rentGoodsDetails.level,
+        shelfStatus: rentGoodsDetails.shelfStatus,
+      });
+    }
+  }, [rentGoodsDetails]);
+
+  return (
+    <div className='goods-info'>
+      <div className='goods-info-title'>商品信息</div>
+      <Form
+        labelCol={{ span: 2 }}
+        wrapperCol={{ span: 10 }}
+        initialValues={{ level: 0, shelfStatus: 1 }}
+        form={form}
+      >
+        <Form.Item
+          label='商品标题'
+          name='tradeName'
+          rules={[{ required: true, message: '请输入商品标题' }]}
+        >
+          <Input placeholder='请输入商品标题' maxLength={30} />
+        </Form.Item>
+        <Form.Item
+          label='商品卖点'
+          name='sellingPoint'
+          rules={[{ required: true, message: '请输入商品卖点' }]}
+        >
+          <Input placeholder='请输入商品卖点' maxLength={30} />
+        </Form.Item>
+        <Form.Item label='商品成新' name='level'>
+          <Radio.Group>
+            {qualityList.map((v, index) => (
+              <Radio value={v.value} key={index}>
+                {v.label}
+              </Radio>
+            ))}
+          </Radio.Group>
+        </Form.Item>
+        <Form.Item label='商品状态' name='shelfStatus'>
+          <Radio.Group>
+            <Radio value={1}>上架</Radio>
+            <Radio value={0}>下架</Radio>
+          </Radio.Group>
+        </Form.Item>
+      </Form>
+    </div>
+  );
+});
+export default GoodsInfo;

src/components/goods/commonAddOrEdit/baseInfo/index.scss → src/pages/rentManage/rentGoods/rentAddOrEdit/components/rentAttr/index.scss

-.base-info {
-  &-title {
+.rent-attr{
+  &-title{
     font-size: 15px;
     font-weight: bold;
-    margin-bottom: 20px;
-    &::before {
-      content: '*';
-      color: red;
-    }
+    line-height: 40px;
   }
-  .goods-video-wrap{
+  .rent-goods-video-wrap{
     position: relative;
     width: 200px;
     img{

src/pages/rentManage/rentGoods/rentAddOrEdit/components/skuInfo/index.scss

+.sku-info{
+  &-title{
+    font-size: 15px;
+    font-weight: bold;
+    line-height: 40px;
+  }
+}

src/pages/rentManage/rentGoods/rentAddOrEdit/index.scss

+.rent-create-edit{
+  padding-bottom: 80px;
+}

src/pages/rentManage/rentGoods/rentAddOrEdit/index.tsx

+import GoodsInfo from './components/goodsInfo';
+import RentAttr from './components/rentAttr';
+import SkuInfo from './components/skuInfo';
+import AddressInfo from './components/addressInfo';
+import FooterOperate from './components/footerOperate';
+import AccessoryList from './components/accessoryList';
+import './index.scss';
+import { useEffect, useRef, useState } from 'react';
+import { RentManageAPI } from '~/api';
+import { filterObjAttr } from '~/utils';
+import { message } from 'antd';
+import { useNavigate, useSearchParams } from 'react-router-dom';
+import { InterDataType } from '~/api/interface';
+import { leaseGoodsDetailsType } from '~/api/interface/rentManageType';
+
+//租赁商品详情返回类型
+type rentGoodsDetailType = InterDataType<leaseGoodsDetailsType>;
+const RentAddOrEdit = () => {
+  const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
+
+  const goodsInfoRef = useRef<any>();
+  const rentAttrRef = useRef<any>();
+  const skuInfoRef = useRef<any>();
+  const accessoryListRef = useRef<any>();
+  const addressInfoRef = useRef<any>();
+
+  //租赁商品-编辑-id
+  const [rentGoodsId, setRentGoodsId] = useState<number>(0);
+  //租赁-编辑-商品详情
+  const [rentGoodsDetails, setRentGoodsDetails] = useState<rentGoodsDetailType>();
+
+  //  保存
+  const saveRentGoods = () => {
+    Promise.all([
+      goodsInfoRef.current.submitGoodsInfoForm(),
+      rentAttrRef.current.submitAttrForm(),
+      skuInfoRef.current.skuFormSubmit(),
+      accessoryListRef.current.accessoryTableFormSubmit(),
+      addressInfoRef.current.addressInfoFormSubmit(),
+    ])
+      .then((values) => {
+        const resourcesList = [
+          { type: 0, url: values[1].mainImage },
+          ...(values[1].subImage?.map((v: string) => ({ type: 1, url: v })) || []),
+          ...(values[1].goodsVideo ? [{ type: 2, url: values[1].goodsVideo }] : []),
+        ];
+        values[2].priceStock = values[2].priceStock.map((v: any) => ({
+          ...v,
+          stockOut: v.stockOut ? 1 : 0,
+        }));
+        RentManageAPI[rentGoodsId ? 'editLeaseGoods' : 'addRentGoods']({
+          ...values[0],
+          ...filterObjAttr(values[1], ['goodsImage', 'goodsVideo']),
+          ...values[2],
+          leasePartsList: values[3],
+          ...values[4],
+          resourcesList,
+          id: rentGoodsId ? rentGoodsId : undefined,
+        }).then(({ code }) => {
+          if (code === '200') {
+            message.success(rentGoodsId ? '编辑成功' : '新增成功');
+            navigate(-1);
+          }
+        });
+      })
+      .catch((error: any) => {
+        message.warning(error.errorFields[0].errors[0] || error);
+        if (error?.errorFields) {
+          goodsInfoRef.current
+            .getForm()
+            .scrollToField(error.errorFields[0].name[0], { behavior: 'smooth' });
+          rentAttrRef.current
+            .getForm()
+            .scrollToField(error.errorFields[0].name[0], { behavior: 'smooth' });
+          skuInfoRef.current
+            .getForm()
+            .scrollToField(error.errorFields[0].name[0], { behavior: 'smooth' });
+          skuInfoRef.current
+            .getSpecificationForm()
+            .scrollToField(error.errorFields[0].name[0], { behavior: 'smooth' });
+          skuInfoRef.current
+            .getSpecificationValueForm()
+            .scrollToField(error.errorFields[0].name[0], { behavior: 'smooth' });
+          addressInfoRef.current
+            .getForm()
+            .scrollToField(error.errorFields[0].name[0], { behavior: 'smooth' });
+        }
+      });
+  };
+
+  //获取租赁商品详情
+  const getRentGoodsDetail = (id: number) => {
+    RentManageAPI.getLeaseGoodsDetails({ id }).then(({ result }) => {
+      if (result) {
+        setRentGoodsDetails({ ...result });
+      }
+    });
+  };
+
+  useEffect(() => {
+    if (searchParams.get('id')) {
+      getRentGoodsDetail(Number(searchParams.get('id')));
+      setRentGoodsId(Number(searchParams.get('id')));
+    }
+  }, []);
+
+  return (
+    <div className='rent-create-edit'>
+      {/*商品信息*/}
+      <GoodsInfo ref={goodsInfoRef} rentGoodsDetails={rentGoodsDetails} />
+      {/*商品属性*/}
+      <RentAttr ref={rentAttrRef} rentGoodsDetails={rentGoodsDetails} />
+      {/*价格库存信息*/}
+      <SkuInfo ref={skuInfoRef} rentGoodsDetails={rentGoodsDetails} />
+      {/*配件清单*/}
+      <AccessoryList ref={accessoryListRef} rentGoodsDetails={rentGoodsDetails} />
+      {/*物流信息*/}
+      <AddressInfo ref={addressInfoRef} rentGoodsDetails={rentGoodsDetails} />
+      {/*底部操作栏*/}
+      <FooterOperate saveRentGoods={saveRentGoods} />
+    </div>
+  );
+};
+export default RentAddOrEdit;

src/pages/rentManage/rentGoods/rentAddOrEditOrDetail/index.scss

-.goods-info {
-  &-operate {
-    margin-top: 50px;
-    display: flex;
-    justify-content: center;
-    button {
-      width: 100px;
-      height: 40px;
-      &:first-child {
-        margin-right: 50px;
-      }
-    }
-  }
-}

src/pages/rentManage/rentGoods/rentDetail/index.scss

+.rent-detail-introduce{
+  img{
+    max-width: 100%;
+  }
+}

src/pages/rentManage/rentGoods/rentList/index.scss

+.rent-goods-info{
+  display: flex;
+  .info-meta{
+    margin-left: 5px;
+    word-break: break-all;
+    .title{
+      margin-bottom: 10px;
+    }
+  }
+}

src/pages/rentManage/rentMake/index.tsx

@@ -6,11 +6,14 @@ import { useEffect, useState } from 'react';
 import { RentManageAPI } from '~/api';
 import { InterDataType, PaginationProps } from '~/api/interface';
 import { listBrandInfoType } from '~/api/interface/rentManageType';
+import { useNavigate } from 'react-router-dom';
 
 //品牌列表返回类型
 type makeListType = InterDataType<listBrandInfoType>['list'];
 
 const RentMake = () => {
+  const navigate = useNavigate();
+
   const tableColumns: ColumnsType<makeListType[0]> = [
     {
       title: '品牌名称',
@@ -23,6 +26,7 @@ const RentMake = () => {
       dataIndex: 'modeInfoList',
       render: (text: makeListType[0]['modeInfoList']) =>
         text?.map((v) => <Tag key={v.id}>{v.modeName}</Tag>),
+      width: '30%',
     },
     {
       title: '操作',
@@ -30,11 +34,12 @@ const RentMake = () => {
       width: '15%',
       render: (_: any, record) => (
         <>
-          <Button type='link'>绑定型号</Button>
           <Button type='link' onClick={() => addOrEditRentMakeModalClick(record)}>
             编辑
           </Button>
-          <Button type='link'>详情</Button>
+          <Button type='link' onClick={() => addRentModeClick(record)}>
+            详情
+          </Button>
         </>
       ),
     },
@@ -71,6 +76,14 @@ const RentMake = () => {
     getListBrandInfo();
     setAddOrEditRentMakeModalShow(false);
   };
+  //品牌新增型号
+  const addRentModeClick = (record: makeListType[0]) => {
+    navigate({
+      pathname: '/rentManage/rentModel',
+      search: `brandInfoId=${record.id}&brandName=${record.brandName}`,
+    });
+  };
+
   //分页
   const paginationChange = (pageNo: number, pageSize: number) => {
     pagination.pageNo = pageNo;

src/pages/rentManage/rentMode/components/addOrEditRentModeModal/index.tsx

-import { Form, Input, Modal, ModalProps, Select } from 'antd';
+import { Button, Col, Form, Input, message, Modal, ModalProps, Row, Select } from 'antd';
 import { FC, useEffect, useState } from 'react';
 import { InterDataType, InterReqType } from '~/api/interface';
-import { addRentModeType, getTypeListType } from '~/api/interface/rentManageType';
+import { addRentModeType, getTypeListType, rentModeListType } from '~/api/interface/rentManageType';
 import { RentManageAPI } from '~/api';
+import { MinusOutlined, PlusOutlined } from '@ant-design/icons';
 
 interface selfProps {
   onOk: () => void;
   onCancel: () => void;
+  brandInfoId: number;
+  rentTypeList: rentTypeListType;
+  currentRentMode: modeListType[0] | undefined;
 }
 //型号新增参数类型
 type addRentParameterType = Exclude<InterReqType<addRentModeType>, undefined>;
 //类型类别返回类型
 type rentTypeListType = InterDataType<getTypeListType>['list'];
+//型号返回类型
+type modeListType = InterDataType<rentModeListType>['list'];
 
-const AddOrEditRentModeModal: FC<ModalProps & selfProps> = ({ open, onOk, onCancel }) => {
+const AddOrEditRentModeModal: FC<ModalProps & selfProps> = ({
+  open,
+  onOk,
+  onCancel,
+  brandInfoId,
+  rentTypeList,
+  currentRentMode,
+}) => {
   const [form] = Form.useForm<addRentParameterType>();
-  const [rentTypeList, setRentTypeList] = useState<rentTypeListType>([]);
+
+  //标签数组
+  const [tagList, setTagList] = useState<{ id: number; tagName: string }[]>([
+    { id: Math.random(), tagName: 'tag1' },
+  ]);
 
   const handleOk = () => {
-    form.validateFields().then((values) => {
-      RentManageAPI.addRentMode({ ...values }).then(({ code }) => {
+    form.validateFields().then((values: any) => {
+      const covertTagList = tagList.reduce((pre: string[], cur) => {
+        const tagKeyItem: string | undefined = Object.keys(values).find(
+          (key: string) => key === cur.tagName,
+        );
+        if (tagKeyItem && values[tagKeyItem]) {
+          pre.push(values[tagKeyItem]);
+        }
+        return pre;
+      }, []);
+      RentManageAPI[currentRentMode ? 'editRentMode' : 'addRentMode']({
+        productTypeId: values.productTypeId,
+        modeName: values.modeName,
+        tag: covertTagList.length ? covertTagList.join(',') : undefined,
+        brandInfoId,
+        id: currentRentMode ? currentRentMode.id : undefined,
+      }).then(({ code }) => {
         if (code === '200') {
+          message.success(currentRentMode ? '编辑成功' : '新增成功');
           form.resetFields();
+          setTagList([{ id: Math.random(), tagName: 'tag1' }]);
           onOk();
         }
       });
     });
   };
+
   const handleCancel = () => {
     form.resetFields();
+    setTagList([{ id: Math.random(), tagName: 'tag1' }]);
     onCancel();
   };
-  //获取类型列表
-  const getRentTypeList = () => {
-    RentManageAPI.getTypeList({ pageNo: 1, pageSize: 99999 }).then(({ result }) => {
-      setRentTypeList(result.list || []);
-    });
+
+  //新增标签
+  const addTagClick = () => {
+    setTagList([...tagList, { id: Math.random(), tagName: `tag${tagList.length + 1}` }]);
+  };
+  //删除标签
+  const deleteTagClick = (index: number) => {
+    form.setFieldValue(tagList[index].tagName, undefined);
+    tagList.splice(index, 1);
+    setTagList([...tagList]);
   };
 
   useEffect(() => {
-    getRentTypeList();
-  }, []);
+    if (currentRentMode) {
+      form.setFieldsValue({
+        productTypeId: currentRentMode.productTypeId,
+        modeName: currentRentMode.modeName,
+        ...currentRentMode.tag?.split(',').reduce((pre: any, cur, currentIndex) => {
+          pre['tag' + (currentIndex + 1)] = cur;
+          return pre;
+        }, {}),
+      });
+      setTagList(
+        currentRentMode.tag
+          ?.split(',')
+          .map((_v, index) => ({ id: Math.random(), tagName: `tag${index + 1}` })) || [
+          { id: Math.random(), tagName: 'tag1' },
+        ],
+      );
+    }
+  }, [currentRentMode]);
 
   return (
-    <Modal open={open} onOk={handleOk} onCancel={handleCancel} title='新增型号'>
-      <Form form={form}>
+    <Modal
+      open={open}
+      onOk={handleOk}
+      onCancel={handleCancel}
+      title={currentRentMode ? '编辑型号' : '新增型号'}
+    >
+      <Form form={form} labelCol={{ span: 4 }} wrapperCol={{ span: 20 }}>
         <Form.Item
           label='所属类别'
           name='productTypeId'
@@ -65,6 +127,42 @@ const AddOrEditRentModeModal: FC<ModalProps & selfProps> = ({ open, onOk, onCanc
         >
           <Input placeholder='请输入型号名称' maxLength={30} />
         </Form.Item>
+        {tagList.map((v, index) => (
+          <Row key={v.id}>
+            <Col span={20}>
+              <Form.Item
+                label={index ? '' : '标签'}
+                labelCol={{ span: 5 }}
+                wrapperCol={{ span: 19, offset: index ? 5 : 0 }}
+                name={v.tagName}
+              >
+                <Input placeholder='请输入标签名称' maxLength={30} />
+              </Form.Item>
+            </Col>
+            <Col span={3} offset={1}>
+              {index === tagList.length - 1 ? (
+                <Button
+                  type='primary'
+                  icon={<PlusOutlined />}
+                  style={{ marginRight: '5px' }}
+                  onClick={addTagClick}
+                ></Button>
+              ) : (
+                ''
+              )}
+
+              {index ? (
+                <Button
+                  type='primary'
+                  icon={<MinusOutlined />}
+                  onClick={() => deleteTagClick(index)}
+                ></Button>
+              ) : (
+                ''
+              )}
+            </Col>
+          </Row>
+        ))}
       </Form>
     </Modal>
   );

src/pages/rentManage/rentMode/index.tsx

 import SearchBox, { searchColumns as searchColumnsType } from '~/components/search-box';
-import { Button, Table } from 'antd';
+import { Button, Modal, Table, Tag } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { ColumnsType } from 'antd/es/table/InternalTable';
 import AddOrEditRentModeModal from '~/pages/rentManage/rentMode/components/addOrEditRentModeModal';
 import { useEffect, useState } from 'react';
 import { RentManageAPI } from '~/api';
-import { PaginationProps } from '~/api/interface';
+import { InterDataType, InterReqListType, PaginationProps } from '~/api/interface';
+import { useSearchParams, useNavigate } from 'react-router-dom';
+import { getTypeListType, rentModeListType } from '~/api/interface/rentManageType';
+
+//类型类别返回类型
+type rentTypeListType = InterDataType<getTypeListType>['list'];
+//型号返回类型
+type modeListType = InterDataType<rentModeListType>['list'];
+//型号列表参数类型
+type modeListParametersType = InterReqListType<rentModeListType>;
 
 const RentMode = () => {
-  const tableColumns: ColumnsType<any> = [
+  const [searchParams] = useSearchParams();
+  const navigate = useNavigate();
+
+  const [rentTypeList, setRentTypeList] = useState<rentTypeListType>([]);
+  const tableColumns: ColumnsType<modeListType[0]> = [
     {
       title: '型号名称',
       align: 'center',
+      dataIndex: 'modeName',
     },
     {
       title: '所属类型',
       align: 'center',
-    },
-    {
-      title: '所属品牌',
-      align: 'center',
+      dataIndex: 'productTypeId',
+      render: (text: number) => rentTypeList.find((v) => v.id === text)?.name || '',
     },
     {
       title: '标签',
       align: 'center',
+      dataIndex: 'tag',
+      render: (text: string) => text?.split(',').map((v, index) => <Tag key={index}>{v}</Tag>),
+      width: '30%',
     },
     {
       title: '操作',
       align: 'center',
+      width: '10%',
+      render: (_: any, record) => (
+        <>
+          <Button type='link' onClick={() => addOrEditRentModelClick(record)}>
+            编辑
+          </Button>
+          <Button type='link' onClick={() => deleteRentModelClick(record)}>
+            删除
+          </Button>
+        </>
+      ),
     },
   ];
 
   const searchColumns: searchColumnsType[] = [
     {
-      name: '',
-      label: '设备类型',
-      placeholder: '请选择设备类型',
+      name: 'productTypeId',
+      label: '所属类型',
+      placeholder: '请选择所属类型',
       type: 'select',
-      options: [],
+      options: rentTypeList.map((v) => ({ id: v.id, name: v.name })),
     },
   ];
-
+  const [brandInfoId, setBrandInfoId] = useState<number>(-1);
   const [addOrEditRentModelModalShow, setAddOrEditRentModelModalShow] = useState<boolean>(false);
   const [pagination, setPagination] = useState<PaginationProps & { totalCount: number }>({
     pageNo: 1,
     pageSize: 10,
     totalCount: 0,
   });
+  const [tableData, setTableData] = useState<modeListType>([]);
+  const [query, setQuery] = useState<modeListParametersType>();
+  const [currentRentMode, setCurrentRentMode] = useState<modeListType[0]>();
 
   //新增，编辑型号弹窗
-  const addOrEditRentModelClick = () => {
+  const addOrEditRentModelClick = (record?: modeListType[0]) => {
+    setCurrentRentMode(record ? { ...record } : undefined);
     setAddOrEditRentModelModalShow(true);
   };
   const addOrEditRentModelModalCancel = () => {
     setAddOrEditRentModelModalShow(false);
   };
   const addOrEditRentModelModalOk = () => {
-    setAddOrEditRentModelModalShow(true);
+    setAddOrEditRentModelModalShow(false);
+    getModeList(brandInfoId, query);
   };
-  //类型列表
-  const getModeList = () => {
+  //删除型号
+  const deleteRentModelClick = (record: modeListType[0]) => {
+    Modal.confirm({
+      title: '提示',
+      content: '确认删除该型号？',
+      onOk: () => {
+        RentManageAPI.deleteMode({ id: record.id }).then(({ code }) => {
+          if (code === '200') {
+            if (tableData.length === 1 && pagination.pageNo !== 1) {
+              pagination.pageNo -= 1;
+            }
+            getModeList(brandInfoId, query);
+          }
+        });
+      },
+    });
+  };
+  //型号列表
+  const getModeList = (brandInfoId: number, query?: modeListParametersType) => {
     RentManageAPI.getRentModeList({
       pageNo: pagination.pageNo,
       pageSize: pagination.pageSize,
+      brandInfoId,
+      ...query,
     }).then(({ result }) => {
       pagination.totalCount = result.totalCount;
+      setTableData(result.list || []);
       setPagination({ ...pagination });
     });
   };
+  //获取类型列表
+  const getRentTypeList = () => {
+    RentManageAPI.getTypeList({ pageNo: 1, pageSize: 99999 }).then(({ result }) => {
+      setRentTypeList(result.list || []);
+      searchColumns[0].options = (result.list || []).map((v) => ({ id: v.id, name: v.name }));
+    });
+  };
+  //返回
+  const backRoute = () => {
+    navigate(-1);
+  };
+  //分页
+  const paginationChange = (pageNo: number, pageSize: number) => {
+    pagination.pageNo = pageNo;
+    pagination.pageSize = pageSize;
+    getModeList(brandInfoId, query);
+  };
+  //筛选
+  const searchSuccess = (value: modeListParametersType) => {
+    pagination.pageSize = 10;
+    pagination.pageNo = 1;
+    setQuery(value);
+    getModeList(brandInfoId, value);
+  };
 
   useEffect(() => {
-    getModeList();
+    getRentTypeList();
+    setBrandInfoId(Number(searchParams.get('brandInfoId')));
+    getModeList(Number(searchParams.get('brandInfoId')));
   }, []);
   return (
     <div className='rent-model'>
       <SearchBox
         search={searchColumns}
         child={
-          <Button type='primary' icon={<PlusOutlined />} onClick={addOrEditRentModelClick}>
-            新增型号
+          <>
+            <span style={{ marginRight: '10px', color: '#1677ff' }}>
+              当前品牌：{searchParams.get('brandName')}
+            </span>
+            <Button
+              type='primary'
+              icon={<PlusOutlined />}
+              onClick={() => addOrEditRentModelClick()}
+            >
+              新增型号
+            </Button>
+          </>
+        }
+        otherChild={
+          <Button type='primary' onClick={backRoute}>
+            返回
           </Button>
         }
+        searchData={searchSuccess}
+      />
+      <Table
+        bordered
+        columns={tableColumns}
+        dataSource={tableData}
+        rowKey='id'
+        pagination={{
+          total: pagination.totalCount,
+          pageSize: pagination.pageSize,
+          current: pagination.pageNo,
+          showSizeChanger: true,
+          showQuickJumper: true,
+          onChange: (page: number, pageSize: number) => paginationChange(page, pageSize),
+          showTotal: (total, range) => `当前 ${range[0]}-${range[1]} 条记录 / 共 ${total} 条数据`,
+        }}
       />
-      <Table bordered columns={tableColumns} />
       <AddOrEditRentModeModal
         open={addOrEditRentModelModalShow}
         onCancel={addOrEditRentModelModalCancel}
         onOk={addOrEditRentModelModalOk}
+        brandInfoId={brandInfoId}
+        rentTypeList={rentTypeList}
+        currentRentMode={currentRentMode}
       />
     </div>
   );

src/pages/rentManage/rentType/components/addOrEditTypeModal/index.tsx

@@ -66,7 +66,11 @@ const AddOrEditTypeModal: FC<ModalProps & selfProps> = ({
   return (
     <Modal open={open} title='新增类型' onCancel={handleCancel} onOk={handelOk}>
       <Form form={form} labelCol={{ span: 4 }} wrapperCol={{ span: 20 }}>
-        <Form.Item label='类型名称' name='name'>
+        <Form.Item
+          label='类型名称'
+          name='name'
+          rules={[{ required: true, message: '请输入类型名称' }]}
+        >
           <Input placeholder='请输入类型名称' maxLength={30} />
         </Form.Item>
         <Form.Item label='图片' name='url' rules={[{ required: true, message: '请上传图片' }]}>

src/pages/systemManage/addressManage/components/addOrEditAddressModal/index.tsx

+import { Cascader, Form, Input, message, Modal, ModalProps, Switch } from 'antd';
+import { FC, useEffect } from 'react';
+import districtData from '~/assets/json/district.json';
+import { InterDataType, InterReqType } from '~/api/interface';
+import { addressInsetType, addressListType } from '~/api/interface/systemManageType';
+import { SystemManageAPI } from '~/api';
+
+interface selfProps {
+  onOk: () => void;
+  onCancel: () => void;
+  currentAddressItem?: addressType[0] | undefined;
+}
+//新增地址参数类型
+type addAddressParameterType = Exclude<InterReqType<addressInsetType>, undefined>;
+//地址列表返回类型
+type addressType = InterDataType<addressListType>;
+
+const AddOrEditAddressModal: FC<ModalProps & selfProps> = ({
+  open,
+  onCancel,
+  onOk,
+  currentAddressItem,
+}) => {
+  const [form] = Form.useForm<
+    Omit<addAddressParameterType, 'takeRegion' | 'type' | 'districtCode'> & {
+      takeRegion: string[];
+      type: boolean;
+      districtCode: number[];
+    }
+  >();
+
+  const handleOk = () => {
+    form.validateFields().then((values) => {
+      SystemManageAPI[currentAddressItem ? 'editAddress' : 'addressInset']({
+        ...values,
+        districtCode: values.districtCode[2].toString(),
+        takeRegion: getDistrictName(values.districtCode),
+        type: !values.type ? 1 : 0,
+        id: currentAddressItem ? currentAddressItem.id : undefined,
+      }).then(({ code }) => {
+        if (code === '200') {
+          message.success('新增地址成功');
+          form.resetFields();
+          onOk();
+        }
+      });
+    });
+  };
+  const handleCancel = () => {
+    onCancel();
+  };
+  //根据省市区code查询省市区名称
+  const getDistrictName = (codeArr: number[]) => {
+    const getFlatDistrictData = (districtData: any[]) => {
+      return districtData.reduce((pre: any, cur: any) => {
+        pre.push(cur);
+        if (cur.childInfo) {
+          pre.push(...getFlatDistrictData(cur.childInfo));
+        }
+        return pre;
+      }, []);
+    };
+    const flatDistrictData: any = getFlatDistrictData(districtData);
+    return codeArr.map((v) => flatDistrictData.find((i: any) => i.id === v)?.name).join('/');
+  };
+
+  useEffect(() => {
+    if (currentAddressItem) {
+      form.setFieldsValue({
+        takeName: currentAddressItem.takeName,
+        takePhone: currentAddressItem.takePhone,
+        districtCode: [
+          Number(currentAddressItem.districtCode.substring(0, 2) + '0000'),
+          Number(currentAddressItem.districtCode.substring(0, 4) + '00'),
+          Number(currentAddressItem.districtCode),
+        ],
+        takeAddress: currentAddressItem.takeAddress,
+        type: !currentAddressItem.type,
+      });
+    }
+  }, [currentAddressItem]);
+
+  return (
+    <Modal
+      open={open}
+      title={currentAddressItem ? '编辑地址' : '新增地址'}
+      onOk={handleOk}
+      onCancel={handleCancel}
+    >
+      <Form labelCol={{ span: 4 }} wrapperCol={{ span: 20 }} form={form}>
+        <Form.Item label='姓名' name='takeName' rules={[{ required: true, message: '请输入姓名' }]}>
+          <Input placeholder='请输入姓名' maxLength={30} />
+        </Form.Item>
+        <Form.Item
+          label='手机号'
+          name='takePhone'
+          rules={[
+            { required: true, message: '请输入手机号' },
+            // 校验手机号
+            () => ({
+              validator(_, value) {
+                if (!value || /^1[3-9]\d{9}$/.test(value)) {
+                  return Promise.resolve();
+                }
+                return Promise.reject('请输入正确的手机号');
+              },
+            }),
+          ]}
+        >
+          <Input placeholder='请输入手机号' maxLength={11} />
+        </Form.Item>
+        <Form.Item
+          label='所在地区'
+          name='districtCode'
+          rules={[{ required: true, message: '请选择所在地区' }]}
+        >
+          <Cascader
+            placeholder='请选择所在地区'
+            options={districtData}
+            fieldNames={{ label: 'name', value: 'id', children: 'childInfo' }}
+          />
+        </Form.Item>
+        <Form.Item
+          label='详细地址'
+          name='takeAddress'
+          rules={[{ required: true, message: '请输入详细地址' }]}
+        >
+          <Input.TextArea rows={4} showCount placeholder='请输入详细地址' maxLength={70} />
+        </Form.Item>
+        <Form.Item label='设为默认地址' name='type' valuePropName='checked'>
+          <Switch />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+export default AddOrEditAddressModal;

src/pages/systemManage/addressManage/index.tsx

+import SearchBox from '~/components/search-box';
+import { Button, message, Modal, Table } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
+import { ColumnsType } from 'antd/es/table';
+import AddOrEditAddressModal from '~/pages/systemManage/addressManage/components/addOrEditAddressModal';
+import { useEffect, useState } from 'react';
+import { SystemManageAPI } from '~/api';
+import { InterDataType } from '~/api/interface';
+import { addressListType } from '~/api/interface/systemManageType';
+
+//地址列表返回类型
+type addressType = InterDataType<addressListType>;
+
+const AddressManage = () => {
+  const tableColumns: ColumnsType<addressType[0]> = [
+    {
+      title: '姓名',
+      align: 'center',
+      dataIndex: 'takeName',
+    },
+    {
+      title: '电话',
+      align: 'center',
+      dataIndex: 'takePhone',
+    },
+    {
+      title: '所在地区',
+      align: 'center',
+      dataIndex: 'takeRegion',
+    },
+    {
+      title: '详细地址',
+      align: 'center',
+      dataIndex: 'takeAddress',
+    },
+    {
+      title: '状态',
+      align: 'center',
+      dataIndex: 'type',
+      render: (text: number) => (!text ? '默认' : ''),
+    },
+    {
+      title: '操作',
+      align: 'center',
+      render: (_: any, record) => (
+        <>
+          <Button type='link' onClick={() => addOrEditAddressModalClick(record)}>
+            编辑
+          </Button>
+          <Button type='link' onClick={() => deleteAddressClick(record)}>
+            删除
+          </Button>
+        </>
+      ),
+    },
+  ];
+
+  const [addressList, setAddressList] = useState<addressType>([]);
+  const [addOrEditAddressModalShow, setAddOrEditAddressModalShow] = useState<boolean>(false);
+  const [currentAddressItem, setCurrentAddressItem] = useState<addressType[0]>();
+
+  const getAddressList = () => {
+    SystemManageAPI.getAddressList({}).then(({ result }) => {
+      setAddressList(result);
+    });
+  };
+  //新增，编辑地址
+  const addOrEditAddressModalClick = (record?: addressType[0]) => {
+    setCurrentAddressItem(record ? { ...record } : undefined);
+    setAddOrEditAddressModalShow(true);
+  };
+  const addOrEditAddressModalCancel = () => {
+    setAddOrEditAddressModalShow(false);
+  };
+  const addOrEditAddressModalOk = () => {
+    getAddressList();
+    setAddOrEditAddressModalShow(false);
+  };
+
+  //地址删除
+  const deleteAddressClick = (record: addressType[0]) => {
+    Modal.confirm({
+      title: '提示',
+      content: '确认删除该地址吗？',
+      onOk: () => {
+        SystemManageAPI.deleteAddress({ id: record.id }).then(({ code }) => {
+          if (code === '200') {
+            message.success('删除成功');
+            getAddressList();
+          }
+        });
+      },
+    });
+  };
+
+  useEffect(() => {
+    getAddressList();
+  }, []);
+
+  return (
+    <div className='address-manage'>
+      <SearchBox
+        child={
+          <Button
+            type='primary'
+            icon={<PlusOutlined />}
+            onClick={() => addOrEditAddressModalClick()}
+          >
+            新增地址
+          </Button>
+        }
+      />
+      <Table bordered columns={tableColumns} dataSource={addressList} rowKey='id' />
+
+      {/*新增编辑地址*/}
+      <AddOrEditAddressModal
+        open={addOrEditAddressModalShow}
+        onCancel={addOrEditAddressModalCancel}
+        onOk={addOrEditAddressModalOk}
+        currentAddressItem={currentAddressItem}
+      />
+    </div>
+  );
+};
+export default AddressManage;

src/router/router.tsx

@@ -35,6 +35,7 @@ import {
   BankOutlined,
   VerifiedOutlined,
   AccountBookOutlined,
+  EnvironmentOutlined,
 } from '@ant-design/icons';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
@@ -93,14 +94,13 @@ const ServiceListView = React.lazy(() => import('~/pages/mallManage/serviceManag
 const ServiceDetailView = React.lazy(
   () => import('~/pages/mallManage/serviceManage/serviceDetail'),
 ); //服务详情
-const ServiceIntroduceView = React.lazy(
-  () => import('~/pages/mallManage/serviceManage/serviceIntroduce'),
-); //服务介绍
+// const ServiceIntroduceView = React.lazy(
+//   () => import('~/pages/mallManage/serviceManageOld/serviceIntroduce'),
+// ); //服务介绍
 
 const RentListView = React.lazy(() => import('~/pages/rentManage/rentGoods/rentList')); //租赁列表
-const RentAddOrEditOrDetailView = React.lazy(
-  () => import('~/pages/rentManage/rentGoods/rentAddOrEditOrDetail'),
-); //租赁新增、编辑、详情
+const RentAddOrEditView = React.lazy(() => import('~/pages/rentManage/rentGoods/rentAddOrEdit')); //租赁新增、编辑
+const RentDetailView = React.lazy(() => import('~/pages/rentManage/rentGoods/rentDetail')); //租赁详情
 const RentTypeView = React.lazy(() => import('~/pages/rentManage/rentType')); //租赁-类型管理
 const RentMakeView = React.lazy(() => import('~/pages/rentManage/rentMake')); //租赁-品牌管理
 const RentModeView = React.lazy(() => import('~/pages/rentManage/rentMode')); //租赁-型号管理
@@ -108,7 +108,7 @@ const RentModeView = React.lazy(() => import('~/pages/rentManage/rentMode')); //
 const MallGoodsView = React.lazy(() => import('~/pages/mallManage/mallGoods/goodsList')); //商城商品
 const MallAddOrEditOrDetailView = React.lazy(
   () => import('~/pages/mallManage/mallGoods/goodsAddOrEditOrDetail'),
-); //商城商品新增、编辑、租赁商品详情
+); //商城商品新增、编辑
 const MallGoodsDetailsView = React.lazy(() => import('~/pages/mallManage/mallGoods/goodsDetails')); //商城商品（新）
 
 const ProduceListView = React.lazy(() => import('~/pages/mallManage/produceManage/produceList')); //产品列表
@@ -155,6 +155,8 @@ const CompanyDetailView = React.lazy(
 import AccountLimit from '~/pages/systemManage/limitManage/roleList'; //账号权限
 import LimitInfo from '~/pages/systemManage/limitManage/limitInfo';
 import CustomListDetail from '~/pages/customManage/customList/detail';
+import ServiceCategoryDetail from '~/pages/categoryManage/serviceCategoryList/detail';
+const AddressManageView = React.lazy(() => import('~/pages/systemManage/addressManage'));
 
 // const IndustryListView = React.lazy(() => import('~/pages/mallManage/industryManage/industryList')); //行业列表
 // const IndustryDetailView = React.lazy(
@@ -601,23 +603,23 @@ export const routerList: Array<RouteObjectType> = [
         element: withLoadingComponent(<ServiceDetailView />),
         errorElement: <ErrorPage />,
         meta: {
-          id: 10120,
+          id: 1020,
           icon: <SmileOutlined />,
           title: '服务详情',
           hidden: true,
         },
       },
-      {
-        path: '/mallManage/serviceIntroduce',
-        element: withLoadingComponent(<ServiceIntroduceView />),
-        errorElement: <ErrorPage />,
-        meta: {
-          id: 10120,
-          icon: <SmileOutlined />,
-          title: '服务介绍',
-          hidden: true,
-        },
-      },
+      // {
+      //   path: '/mallManage/serviceIntroduce',
+      //   element: withLoadingComponent(<ServiceIntroduceView />),
+      //   errorElement: <ErrorPage />,
+      //   meta: {
+      //     id: 10120,
+      //     icon: <SmileOutlined />,
+      //     title: '服务介绍',
+      //     hidden: true,
+      //   },
+      // },
       {
         path: '/mallManage/mallGoods',
         element: withLoadingComponent(<MallGoodsView />),
@@ -716,7 +718,7 @@ export const routerList: Array<RouteObjectType> = [
       },
       {
         path: '/rentManage/rentGoods/add',
-        element: withLoadingComponent(<RentAddOrEditOrDetailView />),
+        element: withLoadingComponent(<RentAddOrEditView />),
         errorElement: <ErrorPage />,
         meta: {
           id: 10135,
@@ -727,7 +729,7 @@ export const routerList: Array<RouteObjectType> = [
       },
       {
         path: '/rentManage/rentGoods/edit',
-        element: withLoadingComponent(<RentAddOrEditOrDetailView />),
+        element: withLoadingComponent(<RentAddOrEditView />),
         errorElement: <ErrorPage />,
         meta: {
           id: 10136,
@@ -738,10 +740,10 @@ export const routerList: Array<RouteObjectType> = [
       },
       {
         path: '/rentManage/rentGoods/detail',
-        element: withLoadingComponent(<RentAddOrEditOrDetailView />),
+        element: withLoadingComponent(<RentDetailView />),
         errorElement: <ErrorPage />,
         meta: {
-          id: 10136,
+          id: 10176,
           icon: <SmileOutlined />,
           title: '租赁商品详情',
           hidden: true,
@@ -755,7 +757,6 @@ export const routerList: Array<RouteObjectType> = [
           id: 2010,
           icon: <SmileOutlined />,
           title: '类型管理',
-          // develop: true,
         },
       },
       {
@@ -763,10 +764,9 @@ export const routerList: Array<RouteObjectType> = [
         element: withLoadingComponent(<RentMakeView />),
         errorElement: <ErrorPage />,
         meta: {
-          id: 10138,
+          id: 2020,
           icon: <SmileOutlined />,
           title: '品牌管理',
-          // develop: true,
         },
       },
       {
@@ -776,8 +776,8 @@ export const routerList: Array<RouteObjectType> = [
         meta: {
           id: 10139,
           icon: <SmileOutlined />,
-          title: '型号管理',
-          // develop: true,
+          title: '品牌管理/型号',
+          hidden: true,
         },
       },
     ],
@@ -792,20 +792,9 @@ export const routerList: Array<RouteObjectType> = [
       title: '分类管理',
     },
     children: [
-      {
-        path: '/categoryManage/jobServicesCategory/1',
-        element: withLoadingComponent(<CategoryManage />),
-        errorElement: <ErrorPage />,
-        meta: {
-          id: 1210,
-          title: '作业服务分类',
-          icon: <SendOutlined />,
-        },
-      },
-      //  作业服务分类（新）
       // {
-      //   path: '/categoryManage/serviceCategoryList',
-      //   element: withLoadingComponent(<ServiceCategoryListView />),
+      //   path: '/categoryManage/jobServicesCategory/1',
+      //   element: withLoadingComponent(<CategoryManage />),
       //   errorElement: <ErrorPage />,
       //   meta: {
       //     id: 1210,
@@ -813,6 +802,17 @@ export const routerList: Array<RouteObjectType> = [
       //     icon: <SendOutlined />,
       //   },
       // },
+      //  作业服务分类（新）
+      {
+        path: '/categoryManage/serviceCategoryList',
+        element: withLoadingComponent(<ServiceCategoryListView />),
+        errorElement: <ErrorPage />,
+        meta: {
+          id: 1210,
+          title: '作业服务分类',
+          icon: <SendOutlined />,
+        },
+      },
       {
         path: '/categoryManage/jobServicesCategory/2',
         element: withLoadingComponent(<CategoryManage />),
@@ -844,6 +844,17 @@ export const routerList: Array<RouteObjectType> = [
           icon: <AppstoreOutlined />,
         },
       },
+      {
+        path: '/categoryManage/mallCategoryList/detail',
+        element: withLoadingComponent(<ServiceCategoryDetail />),
+        errorElement: <ErrorPage />,
+        meta: {
+          id: 18600,
+          title: '分类详情',
+          icon: '',
+          hidden: true,
+        },
+      },
       // {
       //   path: '/categoryManage/jobServicesCategory/4',
       //   element: withLoadingComponent(<CategoryManage />),
@@ -1158,12 +1169,22 @@ export const routerList: Array<RouteObjectType> = [
         element: withLoadingComponent(<CompanyDetailView />),
         errorElement: <ErrorPage />,
         meta: {
-          id: 1440,
+          id: 1450,
           title: '单位详情',
           icon: <BankOutlined />,
           hidden: true,
         },
       },
+      {
+        path: '/systemManage/addressManage',
+        element: withLoadingComponent(<AddressManageView />),
+        errorElement: <ErrorPage />,
+        meta: {
+          id: 1440,
+          title: '地址管理',
+          icon: <EnvironmentOutlined />,
+        },
+      },
     ],
   },
 ];

src/utils/dictionary.ts

@@ -37,3 +37,27 @@ export const splitCouponUseType = [
     label: '店铺券',
   },
 ];
+
+//租赁-质量字典
+export const qualityList = [
+  {
+    label: '全新',
+    value: 0,
+  },
+  {
+    label: '99新',
+    value: 1,
+  },
+  {
+    label: '95新',
+    value: 2,
+  },
+  {
+    label: '90新',
+    value: 3,
+  },
+  {
+    label: '80新',
+    value: 4,
+  },
+];

src/utils/validateUtils.ts

@@ -117,3 +117,18 @@ export const regPriceNumber = (value: string): boolean => {
 export const isEmptyBol = (value: any): boolean => {
   return _.isNull(value) || _.isNaN(value) || _.isNull(value) || _.isUndefined(value);
 };
+// 通用价格判断
+export const commonPriceValidator = (_rules: any, value: number) => {
+  if (!isEmptyBol(value)) {
+    if (regPriceNumber(value.toString())) {
+      if (value > 99999999 || value < 0) {
+        return Promise.reject(new Error('价格最大为99999999且大于0'));
+      }
+      return Promise.resolve();
+    } else {
+      return Promise.reject(new Error('为整数且最多保留两位小数'));
+    }
+  } else {
+    return Promise.reject(new Error('请输入价格'));
+  }
+};