Merge remote-tracking branch 'origin/develop' into 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: af3ca9e6decf9b435111bd06c43d76e125edef45
+  newTag: 4ba9c70d63f7e3c4082c2ce7ef778561943ed998

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/mallManageType.ts

@@ -174,3 +174,196 @@ 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>>;

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/mallManage.ts

@@ -13,6 +13,12 @@ import {
   deleteServiceType,
   serviceDetailType,
   exChangeServiceType,
+  listCompanyInspectionPageType,
+  companyInspectionInsertType,
+  companyInspectionUpdateType,
+  getCompanyInspectionByIdType,
+  listInspectionPriceUnitType,
+  companyInspectionRemoveType,
 } from '~/api/interface/mallManageType';
 
 export class MallManageAPI {
@@ -56,4 +62,22 @@ 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 });
 }

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;

src/components/uploader/index.tsx

@@ -54,6 +54,7 @@ export const Uploader: React.FC<PropsType> = (props) => {
     listType,
     fileList,
     beforeUpload: (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) => {
+        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,
+      saleState: 1,
+    });
+    if (res && res.code === '200') {
+      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: 5 }} wrapperCol={{ span: 10 }}>
+        <Form.Item
+          label='分类名称'
+          name='inspectionName'
+          rules={[{ required: true, message: '请输入分类名称' }]}
+        >
+          <Input placeholder='请输入分类名称' maxLength={15} 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={1}
+            fileSize={10}
+            fileType={['image/png', 'image/jpeg', 'image/jpg', 'image/gif', 'image/bmp']}
+            onChange={(e) => form.setFieldValue('caseImg', e.at(0) ? e.at(0)?.url : undefined)}
+            defaultFileList={data?.caseImg ? [{ url: data?.caseImg }] : []}
+          >
+            <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') {
+      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') {
+      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);
+    }
+  };
+  // 组件挂载
+  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='业务案例图片'>
+          <Image src={inspectionDetail?.caseImg} width={40} height={40} />
+        </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/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/router/router.tsx

@@ -94,9 +94,9 @@ 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 RentAddOrEditView = React.lazy(() => import('~/pages/rentManage/rentGoods/rentAddOrEdit')); //租赁新增、编辑
@@ -155,6 +155,7 @@ 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')); //行业列表
@@ -595,6 +596,7 @@ export const routerList: Array<RouteObjectType> = [
           id: 1020,
           icon: <SmileOutlined />,
           title: '服务管理',
+          develop: true,
         },
       },
       {
@@ -602,23 +604,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 />),
@@ -846,6 +848,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 />),

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('请输入价格'));
+  }
+};