1227提交

config/routes.ts

@@ -96,18 +96,6 @@ export default [
       },
     ],
   },
-  {
-    name: 'Product',
-    path: '/Product',
-    icon: 'smile',
-    routes: [
-      {
-        name: 'ProductManage',
-        path: '/Product/ProductManage',
-        component: './Product/ProductManage',
-      },
-    ],
-  },
   {
     name: 'News',
     path: '/News',
@@ -178,35 +166,6 @@ export default [
       },
     ],
   },
-  {
-    name: 'ContactUs',
-    path: '/ContactUs',
-    icon: 'smile',
-    routes: [
-      {
-        name: 'LeadInfo',
-        path: '/ContactUs/LeadInfo',
-        component: './ContactUs/LeadInfo',
-      },
-      {
-        name: 'Appoint',
-        path: '/ContactUs/Appoint',
-        component: './ContactUs/Appoint',
-      },
-    ],
-  },
-  {
-    name: 'MapDot',
-    path: '/MapDot',
-    icon: 'smile',
-    routes: [
-      {
-        name: 'MapDot',
-        path: '/MapDot/MapDot',
-        component: './MapDot/MapDot',
-      },
-    ],
-  },
   {
     name: 'monitor',
     path: '/monitor',

src/pages/ContactUs/Appoint/Appoint/AppointList.less

@@ -1,17 +0,0 @@
-.LeadInfoListContainer {
-  position: static !important;
-  width: 100% !important;
-  height: 100% !important;
-  margin: 0px !important;
-  background-color: transparent !important;
-
-
-  .the-tool-options {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    > .ant-btn {
-      margin: 0px 0px 0px 10px;
-    }
-  }
-}

src/pages/ContactUs/Appoint/Appoint/AppointList.tsx

@@ -1,207 +0,0 @@
-import {
-  GetClueListType,
-  deleteClueRemove,
-  getClueListList,
-} from '@/services/contactUs/contactUs';
-import type { ActionType, ProColumns, ProTableProps } from '@ant-design/pro-components';
-import { ProTable } from '@ant-design/pro-components';
-import { Button, ConfigProvider, Empty, message } from 'antd';
-import moment from 'moment';
-import React, { forwardRef, useEffect, useImperativeHandle, useRef } from 'react';
-import './AppointList.less';
-
-export type StateType = 'none' | 'add' | 'check' | 'modify';
-export type AppointListProps = {
-  theAccess?: any; //权限;
-  ref?: React.ForwardedRef<any>; //用于取到转发的ref;
-  onStateChange?: () => any;
-};
-
-const AppointList = forwardRef((props: AppointListProps, theRef) => {
-  const [messageApi, contextHolder] = message.useMessage();
-  const theFormRef = useRef();
-
-  const actionRef = useRef<ActionType>();
-
-  // 查询表单;
-  type TableQueryParams = {
-    [property: string]: any;
-  };
-  type TheRequestType = ProTableProps<GetClueListType, TableQueryParams>['request'];
-  const handleRequest: TheRequestType = async (params, sort, filter) => {
-    console.log('handleRequest-params', params);
-    console.log('handleRequest-sort', sort);
-    console.log('handleRequest-filter', filter);
-    const result = {
-      data: [] as GetClueListType[], //表格要渲染的数据列;
-      total: 0, //不传会使用result.data的长度，如果是分页一定要传;
-      success: false, //result.success请返回true，不然表格会停止解析数据，即使有数据;
-    };
-    const theParams = {
-      type : 2,
-      ...params,
-      // emailTopic: theInputValue || '',
-    };
-    let res = await getClueListList(theParams);
-    console.log('res', res);
-    if (res.code !== 200) {
-      return result;
-    }
-
-    result.total = res.total;
-    result.success = true;
-    result.data = res.rows;
-    return result;
-  };
-  useEffect(() => {
-    actionRef?.current?.reload?.();
-  }, [props.currentId]);
-
-  const handleSumbit = async () => {
-    console.log(`重置-->`);
-
-    actionRef?.current?.reload?.();
-  };
-
-  const handleDelete = async (item: GetClueListType) => {
-    const params = {
-      clueUuid: item?.uuid || ``,
-    };
-    const res = await deleteClueRemove(params);
-    console.log(`res-->`, res);
-    if (res?.code !== 200) {
-      messageApi.error(res?.msg || `操作失败`);
-      return;
-    }
-    messageApi.success(res?.msg || `操作成功`);
-    actionRef?.current?.reload?.();
-  };
-
-  // 使用useImperativeHandle来暴露给父组件的方法
-  useImperativeHandle(theRef, () => ({
-    refresh: () => {
-      actionRef?.current?.reload?.();
-    },
-  }));
-
-  const theDOMRef = useRef<HTMLDivElement>(null);
-  const theColumns: ProColumns<GetClueListType>[] = [
-    {
-      title: '预约日期',
-      dataIndex: 'date',
-      valueType: 'dateRange',
-      hideInTable: true,
-      search: {
-        transform: (value) => {
-          console.log(`value-->`, value);
-
-          return {
-            startTime: value[0],
-            endTime: value[1],
-          };
-        },
-      },
-    },
-    {
-      title: '姓名',
-      dataIndex: 'name',
-      search: false,
-    },
-    {
-      title: '电话',
-      dataIndex: 'phone',
-      search: false,
-    },
-    {
-      title: '意向车型',
-      dataIndex: 'product',
-      search: false,
-    },
-    {
-      title: '省',
-      dataIndex: 'province',
-      search: false,
-    },
-    {
-      title: '市',
-      dataIndex: 'city',
-      search: false,
-    },
-    {
-      title: '预约门店',
-      dataIndex: 'shop',
-      search: false,
-    },
-    {
-      title: '预约提交日期时间',
-      dataIndex: 'date',
-      search: false,
-      render(text, record, index) {
-        if (!text) {
-          return `-`;
-        }
-        let theText = moment(record?.date).format('YYYY-MM-DD HH:mm:ss');
-        return theText;
-      },
-    },
-
-    {
-      title: '操作',
-      valueType: 'option',
-      fixed: 'right',
-      key: 'option',
-      width: '150px',
-      render: (text, record, _, action) => {
-        console.log(`props-->`, props);
-
-        return (
-          <div className="table-option-box">
-            <Button type="link" size="small" onClick={handleDelete.bind(null, record)}>
-              删除
-            </Button>
-          </div>
-        );
-      },
-    },
-  ];
-
-  return (
-    <ConfigProvider
-      renderEmpty={() => {
-        return <Empty imageStyle={{ height: 260, width: 260 }} description={`暂无数据`}></Empty>;
-      }}
-    >
-      {contextHolder}
-      <ProTable<GetClueListType, TableQueryParams>
-        className="AppointListContainer"
-        tableClassName="the-table-container custom-scrollbar02"
-        toolBarRender={() => {
-          return [
-            <div key="theKey" className="the-tool-options" ref={theDOMRef}>
-              <Button onClick={handleSumbit?.bind?.(null)}>导出</Button>
-            </div>,
-          ];
-        }}
-        columns={theColumns}
-        actionRef={actionRef}
-        formRef={theFormRef}
-        rowSelection={false}
-        options={false}
-        // headerTitle={`门店预约`}
-        tableAlertRender={false}
-        cardBordered
-        request={handleRequest.bind(null)}
-        scroll={{
-          x: '100%',
-        }}
-        rowKey="uuid"
-        pagination={{
-          pageSize: 10,
-          onChange: (page) => console.log(page),
-        }}
-        // dateFormatter="string"
-      />
-    </ConfigProvider>
-  );
-});
-export default AppointList;

src/pages/ContactUs/Appoint/index.tsx

@@ -1,16 +0,0 @@
-import { KeepAlive, useAccess } from '@umijs/max';
-import React from 'react';
-import './index.less';
-import AppointList from './Appoint/AppointList';
-
-const Home: React.FC = () => {
-  const access = useAccess();
-
-  return (
-    <KeepAlive name="门店预约" path="/ContactUs/Appoint">
-      <div><AppointList></AppointList></div>
-    </KeepAlive>
-  );
-};
-
-export default Home;

src/pages/ContactUs/LeadInfo/LeadInfo/LeadInfoList.less

@@ -1,17 +0,0 @@
-.LeadInfoListContainer {
-  position: static !important;
-  width: 100% !important;
-  height: 100% !important;
-  margin: 0px !important;
-  background-color: transparent !important;
-
-
-  .the-tool-options {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    > .ant-btn {
-      margin: 0px 0px 0px 10px;
-    }
-  }
-}

src/pages/ContactUs/LeadInfo/LeadInfo/LeadInfoList.tsx

@@ -1,203 +0,0 @@
-import {
-  GetClueListType,
-  deleteClueRemove,
-  getClueListList,
-} from '@/services/contactUs/contactUs';
-import type { ActionType, ProColumns, ProTableProps } from '@ant-design/pro-components';
-import { ProTable } from '@ant-design/pro-components';
-import { Button, ConfigProvider, Empty, message } from 'antd';
-import moment from 'moment';
-import React, { forwardRef, useEffect, useImperativeHandle, useRef } from 'react';
-import './LeadInfoList.less';
-
-export type StateType = 'none' | 'add' | 'check' | 'modify';
-export type LeadInfoListProps = {
-  theAccess?: any; //权限;
-  ref?: React.ForwardedRef<any>; //用于取到转发的ref;
-  onStateChange?: () => any;
-};
-
-const LeadInfoList = forwardRef((props: LeadInfoListProps, theRef) => {
-  const [messageApi, contextHolder] = message.useMessage();
-  // console.log('LeadInfoList-props', props);
-  const theFormRef = useRef();
-
-  const actionRef = useRef<ActionType>();
-
-  // 查询表单;
-  type TableQueryParams = {
-    [property: string]: any;
-  };
-  type TheRequestType = ProTableProps<GetClueListType, TableQueryParams>['request'];
-  const handleRequest: TheRequestType = async (params, sort, filter) => {
-    console.log('handleRequest-params', params);
-    console.log('handleRequest-sort', sort);
-    console.log('handleRequest-filter', filter);
-    const result = {
-      data: [] as GetClueListType[], //表格要渲染的数据列;
-      total: 0, //不传会使用result.data的长度，如果是分页一定要传;
-      success: false, //result.success请返回true，不然表格会停止解析数据，即使有数据;
-    };
-    const theParams = {
-      type : 2,
-      ...params,
-      // emailTopic: theInputValue || '',
-    };
-    let res = await getClueListList(theParams);
-    console.log('res', res);
-    if (res.code !== 200) {
-      return result;
-    }
-
-    result.total = res.total;
-    result.success = true;
-    result.data = res.rows;
-    return result;
-  };
-  useEffect(() => {
-    actionRef?.current?.reload?.();
-  }, [props.currentId]);
-
-  const handleSumbit = async () => {
-    console.log(`重置-->`);
-
-    actionRef?.current?.reload?.();
-  };
-
-  const handleDelete = async (item: GetClueListType) => {
-    const params = {
-      clueUuid: item?.uuid || ``,
-    };
-    const res = await deleteClueRemove(params);
-    console.log(`res-->`, res);
-    if (res?.code !== 200) {
-      messageApi.error(res?.msg || `操作失败`);
-      return;
-    }
-    messageApi.success(res?.msg || `操作成功`);
-    actionRef?.current?.reload?.();
-  };
-
-  // 使用useImperativeHandle来暴露给父组件的方法
-  useImperativeHandle(theRef, () => ({
-    refresh: () => {
-      actionRef?.current?.reload?.();
-    },
-  }));
-
-  const theDOMRef = useRef<HTMLDivElement>(null);
-  const theColumns: ProColumns<GetClueListType>[] = [
-    {
-      title: '留言日期',
-      dataIndex: 'date',
-      valueType: 'dateRange',
-      hideInTable: true,
-      search: {
-        transform: (value) => {
-          console.log(`value-->`, value);
-
-          return {
-            startTime: value[0],
-            endTime: value[1],
-          };
-        },
-      },
-    },
-    {
-      title: '姓名',
-      dataIndex: 'name',
-      search: false,
-    },
-    {
-      title: '电话',
-      dataIndex: 'phone',
-      search: false,
-    },
-    {
-      title: '邮箱',
-      dataIndex: 'email',
-      search: false,
-    },
-    {
-      title: '类别',
-      dataIndex: 'leawordType',
-      search: false,
-    },
-    {
-      title: '留言',
-      dataIndex: 'email',
-      search: false,
-    },
-    {
-      title: '留言日期时间',
-      dataIndex: 'date',
-      search: false,
-      render(text, record, index) {
-        if (!text) {
-          return `-`;
-        }
-        let theText = moment(record?.date).format('YYYY-MM-DD HH:mm:ss');
-        return theText;
-      },
-    },
-
-    {
-      title: '操作',
-      valueType: 'option',
-      fixed: 'right',
-      key: 'option',
-      width: '150px',
-      render: (text, record, _, action) => {
-        console.log(`props-->`, props);
-
-        return (
-          <div className="table-option-box">
-            <Button type="link" size="small" onClick={handleDelete.bind(null, record)}>
-              删除
-            </Button>
-          </div>
-        );
-      },
-    },
-  ];
-
-  return (
-    <ConfigProvider
-      renderEmpty={() => {
-        return <Empty imageStyle={{ height: 260, width: 260 }} description={`暂无数据`}></Empty>;
-      }}
-    >
-      {contextHolder}
-      <ProTable<GetClueListType, TableQueryParams>
-        className="LeadInfoListContainer"
-        tableClassName="the-table-container custom-scrollbar02"
-        toolBarRender={() => {
-          return [
-            <div key="theKey" className="the-tool-options" ref={theDOMRef}>
-              <Button onClick={handleSumbit?.bind?.(null)}>导出</Button>
-            </div>,
-          ];
-        }}
-        columns={theColumns}
-        actionRef={actionRef}
-        formRef={theFormRef}
-        rowSelection={false}
-        options={false}
-        // headerTitle={`用户留言`}
-        tableAlertRender={false}
-        cardBordered
-        request={handleRequest.bind(null)}
-        scroll={{
-          x: '100%',
-        }}
-        rowKey="uuid"
-        pagination={{
-          pageSize: 10,
-          onChange: (page) => console.log(page),
-        }}
-        // dateFormatter="string"
-      />
-    </ConfigProvider>
-  );
-});
-export default LeadInfoList;

src/pages/ContactUs/LeadInfo/index.tsx

@@ -1,16 +0,0 @@
-import { KeepAlive, useAccess } from '@umijs/max';
-import React from 'react';
-import './index.less';
-import LeadInfoList from './LeadInfo/LeadInfoList';
-
-const Home: React.FC = () => {
-  const access = useAccess();
-
-  return (
-    <KeepAlive name="用户留言" path="/ContactUs/LeadInfo">
-      <div><LeadInfoList></LeadInfoList></div>
-    </KeepAlive>
-  );
-};
-
-export default Home;

src/pages/Home/banner/index.tsx

@@ -6,7 +6,7 @@ import { Button, message, Modal, Image } from 'antd';
 import { ActionType, FooterToolbar, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
 import { PlusOutlined, DeleteOutlined, ExclamationCircleOutlined, RedoOutlined } from '@ant-design/icons';
 // import { getNoticeList, removeNotice, addNotice, updateNotice, exportNotice } from '@/services/system/notice';
-import { getBannerList, saveBanner, deleteBanner } from '@/services/home/banner';
+import { getBannerList, saveBanner, deleteBanner,push } from '@/services/home/banner';
 import BannerForm from './edit';
 import moment from 'moment';
 import { KeepAlive } from 'react-activation';
@@ -162,8 +162,12 @@ const NoticeTableList: React.FC = () => {
      */
     const publishing = async () => {
         try {
-            // 接口逻辑写这里
-
+            const resp = await push();
+            if (resp.code === 200) {
+                message.success('发布成功');
+            } else {
+                message.error(resp.msg);
+            }
         } catch (error) { }
     }
 

src/pages/JoinZZ/biddingDocument/edit.tsx

@@ -5,6 +5,7 @@ import {
   ProFormUploadButton,
   ProFormSelect,
   ProFormDatePicker,
+  ProFormTextArea,
   ProFormRadio
 } from '@ant-design/pro-components';
 import { Form, Modal, Drawer, message, Upload, Space, Button, Switch,Input,Tooltip } from 'antd';
@@ -209,7 +210,7 @@ const BiddingDocumentForm: React.FC<BiddingDocumentProps> = (props) => {
     let content = editor.getContents()
     // console.log('htmlStr----', htmlStr)
     editor.setContents(content)
-    data.date = moment(data.date).format('YYYY.MM.DD');
+    data.date = moment(data.date).format('YYYY-MM-DD');
     if(checkTop){
       data.top = 1;
     }else{
@@ -296,7 +297,7 @@ const BiddingDocumentForm: React.FC<BiddingDocumentProps> = (props) => {
             },
           ]}
         />
-        <ProFormText
+        <ProFormTextArea
           name="digest"
           label='摘要'
           labelCol={{
@@ -308,7 +309,7 @@ const BiddingDocumentForm: React.FC<BiddingDocumentProps> = (props) => {
           name="date"
           label='展示日期'
           fieldProps={{
-            format: (value) => value.format('YYYY.MM.DD'),
+            format: (value) => value.format('YYYY-MM-DD'),
           }}
           labelCol={{
             style: { width: 95 }
@@ -337,6 +338,7 @@ const BiddingDocumentForm: React.FC<BiddingDocumentProps> = (props) => {
             style: { width: 95 }
           }}
           placeholder={'中泽集团'}
+          initialValue={'中泽集团'}
         />
 
         <ProForm.Item 

src/pages/JoinZZ/vacancy/edit.tsx

@@ -209,7 +209,7 @@ const VacancyForm: React.FC<VacancyProps> = (props) => {
     let content = editor.getContents()
     // console.log('htmlStr----', htmlStr)
     editor.setContents(content)
-    data.date = moment(data.date).format('YYYY.MM.DD');
+    data.date = moment(data.date).format('YYYY-MM-DD');
     if(checkTop){
       data.top = 1;
     }else{

src/pages/MapDot/MapDot/edit.tsx

@@ -1,238 +0,0 @@
-import React, { useEffect, useState, useRef } from 'react';
-import {
-  ProForm,
-  ProFormText,
-  ProFormSelect,
-} from '@ant-design/pro-components';
-import { Form, Modal, Drawer, message, Upload, Space, Button, Switch,Input,Tooltip } from 'antd';
-import {InfoCircleOutlined} from '@ant-design/icons';
-import { useIntl, FormattedMessage } from '@umijs/max';
-import { DictValueEnumObj } from '@/components/DictTag';
-import Editor from '@/components/ueditor';
-import { upload,getArea } from '@/services/mapDot/mapDot';
-import Quill from "quill";
-import "quill/dist/quill.snow.css";
-import moment from 'moment';
-import { trim } from 'lodash';
-let editor: any;
-
-export type MapDotProps = {
-  onCancel: (flag?: boolean, formVals?: any) => void;
-  onSubmit: (values: any) => Promise<void>;
-  open: boolean;
-  currentRow: any;
-  name: string;
-  addr: string;
-  type: number;
-  img: string;
-  imgUrl: string;
-  phone: string;
-  province: string;
-  city: string;
-  lon: string;
-  lat: string;
-  use: number
-};
-
-const MapDotForm: React.FC<MapDotProps> = (props) => {
-  const [form] = Form.useForm();
-  const intl = useIntl();
-  let editorRef = useRef<HTMLDivElement>(null)
-
-  useEffect(() => {
-    console.log(props)
-    form.resetFields();
-    if(!props.open) return;
-    if(!props.currentRow) return;
-    const {name,addr,type,img,imgUrl,phone,province,city,lon,lat,use} = props.currentRow;
-    if (props.currentRow) {
-      form.setFieldsValue({
-        name,addr,type,img,imgUrl,phone,province,city,lon,lat,use
-      })
-    }
-
-    setimg(img)
-    
-    if (imgUrl && img) {
-      setFileList([
-        {
-          uid: img,
-          thumbUrl: imgUrl
-        }
-      ])
-    }
-    if (editorRef && editorRef.current && editorRef.current.children[0]) {
-      editorRef.current.children[0].innerHTML = content
-    }
-
-  }, [props.open]);
-
-  
-  const [fileList, setFileList] = useState<any>([]);
-  const [img, setimg] = useState<any>('');
-
-  const [checkTop, setCheckTop] = useState<any>('')
-  const handleOk = async () => {
-    let data = form.getFieldsValue()
-    
-    let val = await form.validateFields()
-    
-    data.beginTime = moment(data.beginTime).format('YYYY-MM-DD HH:mm:ss');
-    
-    
-    let formData = {
-      ...data,
-      img,
-    }
-    form.setFieldsValue({
-      title: '',
-      topicList: '',
-      digest: ""
-    })
-    setFileList([]);
-    setCheckTop(false)
-    props.onSubmit(formData);
-  };
-  const handleCancel = () => {
-    form.setFieldsValue({
-      title: '',
-      topicList: '',
-      digest: "",
-      top: ""
-    })
-    setFileList([]);
-    setCheckTop(false)
-    props.onCancel();
-
-  };
-
-  const handleChange = async (res) => {
-    const { fileList } = res;
-    setFileList(fileList);
-  };
-
-  const handleBeforeUpload = async (file: RcFile) => {
-    const formData = new FormData();
-    formData.append('file', file, file.name);
-    const res = await upload(formData);
-    if (res?.data?.uuid) {
-      setimg(res.data.uuid)
-    }
-    return false;
-  };
-
-
-  return (
-    <Drawer
-      width={'80%'}
-      title={props.currentRow ? '编辑' : '新建'}
-      forceRender
-      open={props.open}
-      destroyOnClose
-      onClose={handleCancel}
-      extra={
-        <Space>
-          <Button onClick={handleCancel}>取消</Button>
-          <Button type="primary" onClick={handleOk}>确认</Button>
-        </Space>
-      }
-    >
-      <ProForm
-        form={form}
-        grid={true}
-        submitter={false}
-        layout="horizontal"
-      >
-        <Form.Item 
-          name='type' 
-          label={'类型'}
-          rules={[
-            { required: true}]}>
-              <Radio.Group>
-                <Radio value={'1'}>门店</Radio>
-                <Radio value={'2'}>售后</Radio>
-                <Radio value={'3'}>充电站</Radio>
-              </Radio.Group>
-            </Form.Item>
-        <ProForm.Item
-          label={'上传图片'}
-          extra={'图片尺寸1218*915'}
-          labelCol={{
-            style: { width: 95 }
-          }}
-        >
-          <Upload
-            listType="picture-card" // 设置为图片卡片模式
-            fileList={fileList}
-            maxCount={1}
-            onChange={handleChange}
-            beforeUpload={handleBeforeUpload}
-          >
-            {fileList?.length < 1 && '+' + intl.formatMessage({ id: 'public.uploadImg' })}
-          </Upload>
-        </ProForm.Item>     
-        <ProFormText
-          name="name"
-          label='名称'
-          labelCol={{
-            style: { width: 95 }
-          }}
-          placeholder={'请输入名称'}
-          rules={[
-            {
-              required: true,
-              message: '请输入名称!',
-            },
-          ]}
-        />
-        <ProFormText
-          name="addr"
-          label='地址'
-          labelCol={{
-            style: { width: 95 }
-          }}
-          placeholder={'请输入地址'}
-          rules={[
-            {
-              required: true,
-              message: '请输入地址!',
-            },
-          ]}
-        />
-        <ProFormText
-          name="phone"
-          label='电话/简述'
-          labelCol={{
-            style: { width: 95 }
-          }}
-          placeholder={'请输入地址'}
-        />
-        <ProFormSelect
-          name="province"
-          key="province"
-          label='省'
-          request={() =>
-            getArea({type: 1}).then((res) => {
-              let tList = []
-              res.rows.forEach(item => {
-                tList.push({
-                  label: item.name,
-                  value: item.code,
-                })
-              })
-              return tList;
-            })
-
-          }
-          labelCol={{
-            style: { width: 95 }
-          }}
-          placeholder={'请选择省份'}
-        />
-        
-      </ProForm>
-    </Drawer>
-  );
-};
-
-export default MapDotForm;

src/pages/MapDot/MapDot/index.less

@@ -1,3 +0,0 @@
-.ant-pro-table-list-toolbar-title{
-    display:none;
-}

src/pages/MapDot/MapDot/index.tsx

@@ -1,301 +0,0 @@
-
-import React, { useState, useRef, useEffect } from 'react';
-import { useIntl, FormattedMessage, useAccess } from '@umijs/max';
-import type { FormInstance } from 'antd';
-import { Button, message, Modal, Image } from 'antd';
-import { ActionType, FooterToolbar, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
-import { PlusOutlined, DeleteOutlined, ExclamationCircleOutlined, RedoOutlined } from '@ant-design/icons';
-// import { getNoticeList, removeNotice, addNotice, updateNotice, exportNotice } from '@/services/system/notice';
-import { getMapDotList, saveMapDot, deleteMapDot, importData} from '@/services/mapDot/mapDot';
-import MapDotForm from './edit';
-import moment from 'moment';
-import { KeepAlive } from 'react-activation';
-import './index.less'
-import DictTag from '../../../components/DictTag';
-import { getDataEnumList } from '../../../services/system/Enum';
-
-const typeEnum = [
-    { label: '门店', value: 1 },
-    { label: '售后', value: 2 },
-    { label: '充电站', value: 3 },
-]
-const useEnum = [
-    { label: '禁用', value: 0 },
-    { label: '启用', value: 1 },
-]
-
-const NoticeTableList: React.FC = () => {
-    const formTableRef = useRef<FormInstance>();
-
-    const [modalVisible, setModalVisible] = useState<boolean>(false);
-
-    const actionRef = useRef<ActionType>();
-    const intl = useIntl();
-    const [currentRow, setCurrentRow] = useState<any>();
-    const [enumList,setEnumList] = useState()
-
-    const handleRemoveOne = async (selectedRow: API.System.Notice) => {
-        const hide = message.loading(intl.formatMessage({ id: 'public.loadingDelete' }));
-        if (!selectedRow) return true;
-        try {
-            const params = [selectedRow.uuid];
-            const resp = await deleteMapDot(params.join(','));
-            hide();
-            if (resp.code === 200) {
-                message.success(intl.formatMessage({ id: 'public.deleteSuccess' }));
-            } else {
-                message.error(resp.msg);
-            }
-            return true;
-        } catch (error) {
-            hide();
-            message.error(intl.formatMessage({ id: 'public.deleteError' }));
-            return false;
-        }
-    };
-
-    useEffect(() => {
-        getEnum()
-    }, [])
-
-    const getEnum = ()=>{
-        getDataEnumList({ enumUuid: '2024810214616101' }).then((res) => {
-            console.log(res.rows)
-
-            const enumOptions = res.rows.map((item: any) => ({
-                label: item.dataName,
-                value: item.uuid,
-            }));
-            setEnumList(enumOptions); // 设置 enumList
-        })
-    }
-    const columns: ProColumns<API.System.Notice>[] = [
-        {
-            title: '序号',
-            dataIndex: 'id',
-            valueType: 'text',
-            hideInSearch: true,
-            render: (_, record: any) => {
-                // console.log('record---',_,record)
-                return record.rowIndex;
-            },
-        },
-        {
-            title: '类别',
-            dataIndex: 'type',
-            valueType: 'radio',
-            request: async () => typeEnum,
-            render: (_, record) => {
-                return (<DictTag enums={typeEnum} value={record.type} />);
-            },
-        },
-        {
-            title: '配图',
-            dataIndex: 'imgUrl',
-            valueType: 'text',
-            hideInSearch: true,
-            render: (_, record: any) => {
-                // console.log('record---',_,record)
-                return <Image src={record.imgUrl} style={{ 'height': '40px' }}></Image>;
-            }
-        },
-        {
-            title: '名称',
-            dataIndex: 'name',
-            valueType: 'text',
-        },
-        {
-            title: '地址',
-            dataIndex: 'addr',
-            valueType: 'text',
-        },
-        {
-            title: '电话/简述',
-            dataIndex: 'phone',
-            valueType: 'text',
-        },
-        {
-            title: '省',
-            dataIndex: 'province',
-            valueType: 'text',
-        },
-        {
-            title: '市',
-            dataIndex: 'city',
-            valueType: 'text',
-        },
-        {
-            title: '经度',
-            dataIndex: 'lon',
-            valueType: 'text',
-        },
-        {
-            title: '纬度',
-            dataIndex: 'lat',
-            valueType: 'text',
-        },
-        {
-            title: '状态',
-            dataIndex: 'use',
-            valueType: 'radio',
-            request: async () => useEnum,
-            render: (_, record) => {
-                return (<DictTag enums={useEnum} value={record.use} />);
-            },
-        },
-        {
-            title: '操作',
-            dataIndex: 'option',
-            width: '120px',
-            valueType: 'option',
-            render: (_, record: any) => [
-                <Button
-                    type="link"
-                    size="small"
-                    key="edit"
-
-                    onClick={() => {
-                        setModalVisible(true);
-                        setCurrentRow(record);
-                    }}
-                >
-                    编辑
-                </Button>,
-                //   <Button
-                //   type="link"
-                //   size="small"
-                //   key="preview"
-                //   onClick={() => {
-                //     window.open('/api/system/wysiwyg/MapDotDetail/'+record.uuid);
-
-                //   }}
-                // >
-                //   <FormattedMessage id="public.preview" defaultMessage="预览" />
-                // </Button>,
-                <Button
-                    type="link"
-                    size="small"
-                    key="publish"
-                    disabled={record.status == 0 ? false : true}
-                    onClick={() => {
-                        let params = {
-                            status: 1,
-                            MapDotUuid: record.uuid,
-                        }
-                        saveMapDot(params).then((res: any) => {
-                            if (res.code == 200) {
-                                if (actionRef.current) {
-                                    actionRef.current.reload();
-                                }
-                                message.success(res.msg)
-                            } else {
-                                message.error(res.msg)
-                            }
-                        })
-
-                    }}
-                >
-                    {record.status == 0 ? '禁用' : '启用'}
-                </Button>,
-                <Button
-                    type="link"
-                    size="small"
-                    danger
-                    key="batchRemove"
-
-                    onClick={async () => {
-                        Modal.confirm({
-                            title: intl.formatMessage({ id: 'public.delete' }),
-                            content: intl.formatMessage({ id: 'public.confirmdeletemsg' }),
-                            okText: intl.formatMessage({ id: 'public.confirm' }),
-                            cancelText: intl.formatMessage({ id: 'public.cancel' }),
-                            onOk: async () => {
-                                const success = await handleRemoveOne(record);
-                                if (success) {
-                                    if (actionRef.current) {
-                                        actionRef.current.reload();
-                                    }
-                                }
-                            },
-                        });
-                    }}
-                >
-                    <FormattedMessage id="public.delete" defaultMessage="删除" />
-                </Button>,
-            ],
-        },
-    ];
-
-    return (
-        <KeepAlive name='地图打点' path="/MapDot/MapDotList">
-            <PageContainer>
-                <div style={{ width: '100%', float: 'right' }}>
-                    <ProTable<API.System.Notice>
-                        actionRef={actionRef}
-                        formRef={formTableRef}
-                        rowKey="uuid"
-                        key="MapDotList"
-                        search={{
-                            labelWidth: 120,
-                        }}
-                        toolBarRender={() => [
-                            <Button
-                                type="primary"
-                                key="add"
-                                onClick={async () => {
-                                    setCurrentRow(undefined);
-                                    setModalVisible(true);
-                                }}
-                            >
-                                <PlusOutlined /> <FormattedMessage id="public.add" defaultMessage="新建" />
-                            </Button>
-                        ]}
-                        request={(params) => {
-                            return getMapDotList({ ...params } as API.System.NoticeListParams).then((res) => {
-
-                                res.rows.forEach((item: any, index: any) => {
-                                    item.rowIndex = index + 1
-                                })
-                                const result = {
-                                    data: res.rows,
-                                    total: res.total,
-                                    success: true,
-
-                                };
-                                return result;
-                            })
-                        }
-                        }
-                        columns={columns}
-                    />
-                </div>
-                <MapDotForm
-                    onSubmit={async (values) => {
-                        let success = false;
-                        if (currentRow) {
-                            values.uuid = currentRow.uuid;
-                        }
-                        
-                        success = await saveMapDot({ ...values });
-                        if (success) {
-                            setModalVisible(false);
-                            setCurrentRow(undefined);
-                            if (actionRef.current) {
-                                actionRef.current.reload();
-                            }
-                        }
-                    }}
-                    onCancel={() => {
-                        setModalVisible(false);
-                        setCurrentRow(undefined);
-                    }}
-                    currentRow={currentRow}
-                    open={modalVisible}
-                />
-            </PageContainer>
-        </KeepAlive>
-
-    );
-};
-
-export default NoticeTableList;

src/pages/News/NewsList/edit.tsx

@@ -2,6 +2,7 @@ import React, { useEffect, useState, useRef } from 'react';
 import {
   ProForm,
   ProFormText,
+  ProFormTextArea,
   ProFormUploadButton,
   ProFormSelect,
   ProFormDatePicker,
@@ -208,7 +209,7 @@ const NewsForm: React.FC<NewsProps> = (props) => {
     let content = editor.getContents()
     // console.log('htmlStr----', htmlStr)
     editor.setContents(content)
-    data.date = moment(data.date).format('YYYY.MM.DD');
+    data.date = moment(data.date).format('YYYY-MM-DD');
     if(checkTop){
       data.top = 1;
     }else{
@@ -322,7 +323,7 @@ const NewsForm: React.FC<NewsProps> = (props) => {
           name="date"
           label='日期'
           fieldProps={{
-            format: (value) => value.format('YYYY.MM.DD'),
+            format: (value) => value.format('YYYY-MM-DD'),
           }}
           labelCol={{
             style: { width: 95 }
@@ -358,7 +359,7 @@ const NewsForm: React.FC<NewsProps> = (props) => {
           placeholder={'请选择新闻分类'}
 
         />
-        <ProFormText
+        <ProFormTextArea
           name="digest"
           label='摘要'
           labelCol={{

src/pages/News/NewsList/index.tsx

@@ -6,7 +6,7 @@ import { Button, message, Modal, Image } from 'antd';
 import { ActionType, FooterToolbar, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
 import { PlusOutlined, DeleteOutlined, ExclamationCircleOutlined, RedoOutlined } from '@ant-design/icons';
 // import { getNoticeList, removeNotice, addNotice, updateNotice, exportNotice } from '@/services/system/notice';
-import { getNewsList, saveNews, deleteNews, pushNewsDetail } from '@/services/news/news';
+import { getNewsList, saveNews, deleteNews, pushNewsDetail,push } from '@/services/news/news';
 import NewsForm from './edit';
 import { getDictValueEnum } from '@/services/system/dict';
 import moment from 'moment';
@@ -205,7 +205,19 @@ const NoticeTableList: React.FC = () => {
             ],
         },
     ];
-
+/**
+     * 一键发布
+     */
+const publishing = async () => {
+    try {
+        const resp = await push();
+        if (resp.code === 200) {
+            message.success('发布成功');
+        } else {
+            message.error(resp.msg);
+        }
+    } catch (error) { }
+}
     return (
         <KeepAlive name={intl.formatMessage({ id: 'new.newsManagement' })} path="/News/NewsList">
             <PageContainer>
@@ -232,7 +244,7 @@ const NoticeTableList: React.FC = () => {
                             <Button
                             type="primary"
                             key="fabu"
-                            onClick={()=>{}}
+                            onClick={publishing}
                         >
                             一键发布
                         </Button>,

src/pages/PartyWork/partyWork/edit.tsx

@@ -209,7 +209,7 @@ const PartyWorkForm: React.FC<PartyWorkProps> = (props) => {
     let content = editor.getContents()
     // console.log('htmlStr----', htmlStr)
     editor.setContents(content)
-    data.date = moment(data.date).format('YYYY.MM.DD');
+    data.date = moment(data.date).format('YYYY-MM-DD');
     if(checkTop){
       data.top = 1;
     }else{
@@ -264,7 +264,7 @@ const PartyWorkForm: React.FC<PartyWorkProps> = (props) => {
   return (
     <Drawer
       width={'80%'}
-      title={props.currentRow ? '新闻编辑' : '新建新闻'}
+      title={props.currentRow ? '文章编辑' : '新建文章'}
       forceRender
       open={props.open}
       destroyOnClose
@@ -323,7 +323,7 @@ const PartyWorkForm: React.FC<PartyWorkProps> = (props) => {
           name="date"
           label='展示日期'
           fieldProps={{
-            format: (value) => value.format('YYYY.MM.DD'),
+            format: (value) => value.format('YYYY-MM-DD'),
           }}
           labelCol={{
             style: { width: 95 }
@@ -376,6 +376,7 @@ const PartyWorkForm: React.FC<PartyWorkProps> = (props) => {
             style: { width: 95 }
           }}
           placeholder={'中泽集团'}
+          initialValue={'中泽集团'}
         />
 
         <ProForm.Item 

src/pages/PartyWork/partyWork/index.tsx

@@ -6,7 +6,7 @@ import { Button, message, Modal, Image } from 'antd';
 import { ActionType, FooterToolbar, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
 import { PlusOutlined, DeleteOutlined, ExclamationCircleOutlined, RedoOutlined } from '@ant-design/icons';
 // import { getNoticeList, removeNotice, addNotice, updateNotice, exportNotice } from '@/services/system/notice';
-import { getPartyWorkList, savePartyWork, deletePartyWork, pushPartyWorkDetail } from '@/services/partyWork/partyWork';
+import { getPartyWorkList, savePartyWork, deletePartyWork, pushPartyWorkDetail,push1,push2 } from '@/services/partyWork/partyWork';
 import PartyWorkForm from './edit';
 import { getDictValueEnum } from '@/services/system/dict';
 import moment from 'moment';
@@ -205,7 +205,20 @@ const NoticeTableList: React.FC = () => {
             ],
         },
     ];
-
+/**
+     * 一键发布
+     */
+const publishing = async () => {
+    try {
+        const resp1 = await push1();
+        const resp2 = await push2();
+        if (resp1.code === 200 && resp2.code === 200) {
+            message.success('发布成功');
+        } else {
+            message.error(resp1.msg + resp2.msg);
+        }
+    } catch (error) { }
+}
     return (
         <KeepAlive name={'党建工作'} path="/PartyWork/partyWork">
             <PageContainer>
@@ -228,7 +241,14 @@ const NoticeTableList: React.FC = () => {
                                 }}
                             >
                                 <PlusOutlined /> <FormattedMessage id="public.add" defaultMessage="新建" />
-                            </Button>
+                            </Button>,
+                            <Button
+                            type="primary"
+                            key="fabu"
+                            onClick={publishing}
+                            >
+                                一键发布
+                            </Button>,
                         ]}
                         request={(params) => {
                             return getPartyWorkList({ ...params } as API.System.NoticeListParams).then((res) => {

src/pages/Product/ProductManage/index.less

@@ -1,290 +0,0 @@
-.productAll{
-    width: 100%;
-    height: 100%;
-    background-color: rgba(242, 242, 242, 1);
-    display: flex;
-    .leftDiv{
-        width: 220px;
-        height: 100%;
-        background: #fff;
-        box-sizing: border-box;
-        padding: 20px 10px;
-        .leftUp{
-            width: 100%;
-        }
-        .leftDw{
-            .ant-tree{
-                .ant-tree-list{
-                    .ant-tree-node-selected{
-                        pointer-events: none;
-                    }
-                }
-            }
-        }
-    }
-    .rightDiv{
-        width: calc( 100% - 220px);
-        height: 100%;
-        box-sizing: border-box;
-        background: rgba(242, 242, 242, 1);
-        position: relative;
-        .carTabs{
-            .ant-tabs-nav{
-                padding-left: 20px;background: #fff;
-            }
-        }
-        .carRight{
-            padding: 0px 20px;
-            margin-top: 10px;
-            .carTitle{
-                margin-bottom: 20px;
-                height: 28px;
-                line-height: 28px;
-            }
-            .btn{
-                margin-left: 10px;
-                width: 94px;
-                height: 30px;
-                background: rgba(22, 155, 213, 1);
-                box-shadow:none;
-                line-height: 28px;
-                padding:0px;
-                text-align: center;
-                float: right;
-            }
-            .ant-table-wrapper{
-                background: #fff;
-            }
-        }
-        
-        .tdkStyle{
-            position: absolute;
-            right: 21px;
-            top: 7px;
-        }
-    }
-
-}
-.carModal{
-    .ant-modal-header{
-        margin-bottom: 20px;
-        padding-bottom: 10px;
-        border-bottom: 1px solid #d6d6d6;
-    }
-    .showImg{
-        width: 110px;max-height:110px;float:left;
-        img{
-            width: 100%;max-height:110px;display:block;
-        }
-        video{
-            width: 100%;max-height:110px;display:block;
-        }
-        margin-right: 20px;
-    }
-    .showFile{
-        width: 28px;float:left;margin-right: 20px;
-        img{
-            width: 100%;display:block;
-        }
-    }
-    .uploadBtn{
-        float:left;margin-right:20px;
-        button{
-            width: 90px;height:30px;border-radius:5px;
-        }
-    }
-    .designImg{
-        width: 100%;
-        input{
-            width: 102px;
-            margin-block: 0 8px;
-            margin-inline: 0 8px;
-            vertical-align: top;
-        }
-    }
-    .ant-form-horizontal .ant-form-item-control{
-        max-width: calc(100% - 160px);
-    }
-    .designTable{
-        display: flex;
-        flex-wrap: wrap;
-        div{
-            width: 40%;
-            margin-right: 10px;
-            margin-bottom: 5px;
-            text-align: center;
-        }
-        input{
-            width: 40%;
-            margin-right: 10px;
-            margin-bottom: 5px;
-        }
-    }
-    .designTableA{
-        display: flex;
-        .txt{
-            width: calc( 20% - 30px);
-            color: rgba(0, 0, 0, 0.3);
-            font-size: 14px;
-            text-align: left;
-            box-sizing: border-box;
-            padding-top: 27px;
-            &>div{
-                height: 30px;
-                margin-bottom: 5px;
-                line-height: 30px;
-            }
-        }
-        
-    }
-    .pTextDeleTitle{
-        margin-bottom: 10px;
-        display: flex;
-        justify-content: space-between;
-        align-items: flex-end;
-        width: calc(100% - 60px);
-        span{
-            display: inline-block;
-            width:48%;
-            text-align: center;
-            margin-bottom: 5px;
-        }
-    }
-    .pTextDele{
-        margin-bottom: 10px;
-        display: flex;
-        justify-content: space-between;
-        align-items: flex-end;
-        input{
-            width: calc(100% - 60px);
-        }
-        &>div{
-            width: calc(100% - 60px);
-            display: flex;
-            flex-wrap: wrap;
-            justify-content: space-between;
-            
-            input{
-                width:48%;
-            }
-        }
-    }
-    .pTextThree{
-        &>div{
-            align-items: flex-end;
-            &>span{
-                width:110px;
-                .ant-upload-list-picture-card .ant-upload-select{
-                    margin-bottom: 0;
-                }
-            }
-            input{
-                width:calc((100% - 130px)/2);
-            }
-        }
-    }
-    .pTextTwo{
-        align-items: flex-start;
-        &>div{
-            align-items: flex-start;
-            &>span{
-                width:110px;
-                .ant-upload-list-picture-card .ant-upload-select{
-                    margin-bottom: 0;
-                }
-            }
-            
-            
-            .pConTit{
-                width: calc((100% - 130px));
-                input{
-                    width:100%;
-                }
-                .pTwoTxt{
-                    width: 100%;
-                    margin: 8px 0;
-                    span{
-                        width: calc((100% - 70px)/2);
-                        text-align: center;
-                        display: inline-block;
-                    }
-                }
-                .pCon{
-                    width:100%;
-                    margin-left: auto;
-                    margin-bottom: 5px;
-                    input{
-                        width: 204px;
-                        margin-right: 5px;
-                    }
-                }
-                .light1{
-                    width: 100%;
-                    display: flex;
-                    justify-content: space-between;
-                    margin-bottom: 8px;
-                    .titleA{
-                        width:calc(100% - 60px);
-                    }
-                }
-            }
-            .titleA{
-                width:calc(100% - 130px);
-            }
-            
-        }
-    }
-    .pTextOne{
-        &>div{
-            .pConTit .pTwoTxt span{
-                width: calc(100% - 70px);
-            }
-            .pConTit .pCon input{
-                width: 413px;
-            }
-        }
-    }
-    .pTextTitle{
-        width: calc(100% - 60px);
-        display: flex;
-        justify-content: space-between;
-        margin-bottom: 10px;
-        span{
-            display: inline-block;
-            text-align: center;
-            width: calc((100% - 130px)/2);
-            &:first-child{
-                width: 110px;
-            }
-        }
-    }
-    .titleTwo{
-        span{
-            width: calc(100% - 110px);
-        }
-    }
-    .imgColor{
-        width: 100%;
-        border: 1px solid rgb(228, 232, 239);
-        padding:10px 0 0;
-        margin-bottom: 10px;
-        border-left: 0;
-        .colorTxt{
-            width: 100%;
-            height: 32px;
-            line-height: 32px;
-            margin-bottom: 5px;
-            &>button{
-                float: right;
-            }
-            &>span{
-                display: inline-block;
-                position: relative;
-                top: -7px;
-                margin-left: 10px;
-                color: rgba(0, 0, 0, 0.3);
-            }
-        }
-        
-    }
-}

src/pages/Product/ProductManage/index.tsx

@@ -1,261 +0,0 @@
-import React,{Ref,useEffect,useState,useRef } from 'react';
-import { KeepAlive, useAccess } from '@umijs/max';
-import { PlusOutlined,EditOutlined,DeleteOutlined,DownOutlined,ExclamationCircleFilled } from '@ant-design/icons';
-import {Button,Tree,Tabs,Modal,Form, Input, message  } from 'antd'
-import type { TreeDataNode,TreeProps,TabsProps } from 'antd';
-import { getProductTree,editProductTree,getDeleteTree } from '@/services/product/index.ts';
-import CarSeriesTable  from './page/carSeries';  //车系列表
-import CarModelsTable  from './page/carModels';  //车型列表
-import CarModelsDetailTable  from './page/carModelsDetail';  //车型详情
-import CarBrandDetailTable  from './page/carBrandDetail';  //车型详情
-import TestimonyTable  from './page/TestimonyDetail';  //品牌概览-用户证词
-import CarouselImage from './page/carouselImage';  //轮播图
-import { FormattedMessage,useIntl } from 'umi';
-import TdkEdit from '@/components/TdkEdit';
-
-
-import './index.less';
-
-const { confirm } = Modal;
-
-const Home: React.FC = () => {
-  //tdk弹框
-  const [isModalOpenTdk, setIsModalOpenTdk] = useState(false);
-
-//编辑tdk
-  const changeTdk=()=>{
-    setIsModalOpenTdk(true)
-  }
-  const intl = useIntl();
-
-  const [treeData,setTreeData] = useState([]);  //树形列表
-  const [productId,setProductId] = useState('');  //产品id
-  const [productLevel,setProductLevel] = useState('catege');  //产品层级
-  const [productLevelDefault,setProductLevelDefault] = useState<any>([]);  //默认展示产品层级
-  //弹框
-  const [isModalOpen, setIsModalOpen] = useState(false);
-  const [modalTitle, setModalTitle] = useState(true);
-  const [form] = Form.useForm();
-  const [oneTreeId,setOneTreeId] = useState('');  //左侧第一级品牌id
-  const [selectedInfo,setSelectedInfo] = useState<any>([]);
-
-  //加载数据
-  const getTreeData =async () => {
-    const res = await getProductTree();
-    if(res?.code == 200 &&res?.data &&res?.data.length>0){
-      let data = res.data;
-      if(productLevelDefault.length==0){
-        setProductLevelDefault([data[0].uuid]);
-        setProductId(data[0].uuid);
-        setOneTreeId(data[0].uuid);
-      }
-      setTreeData(data);
-      
-    }
-  }
-  const items: TabsProps['items'] = [
-    {
-      key: '1',
-      label: intl.formatMessage({id:'product.carlist'}) ,
-      children: <CarSeriesTable id={productId} upTree={getTreeData} />,
-    },
-    {
-      key: '2',
-      label: intl.formatMessage({id:'public.performanceIntroduction'}) ,
-      children: <CarBrandDetailTable id={productId} upTree={getTreeData}/>,
-    },
-    {
-      key: '3',
-      label: '轮播图' ,
-      children: <CarouselImage id={productId} upTree={getTreeData}/>,
-    },
-  ];
-  const items2: TabsProps['items'] = [
-    {
-      key: '1',
-      label: intl.formatMessage({id:'public.carTypeList'}) ,
-      children: <CarModelsTable id={productId} upTree={getTreeData} treeDataAll={treeData}/>,
-    }
-  ];
-  const items3: TabsProps['items'] = [
-    {
-      key: '1',
-      label: intl.formatMessage({id:'public.carTypeDetail'}) ,
-      children: <CarModelsDetailTable id={productId} upTree={getTreeData}/>,
-    },
-    // {
-    //   key: '2',
-    //   label: '车型参数',
-    //   children: 'Content of Tab Pane 2',
-    // }
-  ];
-  
-  //左侧车系选中事件
-  const onSelect: TreeProps['onSelect'] = (selectedKeys:any, info:any) => {
-    console.log(selectedKeys,info)
-    setProductId(selectedKeys[0]);
-    setSelectedInfo(info.node)
-    setProductLevelDefault(selectedKeys);
-    setProductLevel(info.node.carType);
-
-  };
-  //右侧内容选择事件
-  const onChange = (key: string) => {
-    console.log(key);
-  };
-
-  
-  //打开弹框新增品牌
-  const addTree=()=>{
-    form.setFieldsValue({
-      sort: undefined,
-      title:undefined,
-    });
-    setIsModalOpen(true);
-    setModalTitle(true);
-  }
-  //编辑品牌
-  const openTreeEdit=()=>{
-    
-      setIsModalOpen(true);
-      setModalTitle(false);
-      // let nowTreeId:any = treeData.filter((item:any)=> item.uuid == oneTreeId);
-
-      form.setFieldsValue({
-        sort: selectedInfo.sort,
-        title:selectedInfo.title,
-      });
-  }
-  //删除品牌
-  const showDeleteConfirm = () => {
-    let nowTreeId:any = treeData.filter((item:any)=> item.uuid == oneTreeId);
-    if(!selectedInfo) return;
-    confirm({
-      title: intl.formatMessage({id:'product.ifConfirmDeleteMsg'}) +"?",
-      icon: <ExclamationCircleFilled />,
-      content: intl.formatMessage({id:'product.brandName'})+":" +nowTreeId[0].title,
-      okText: intl.formatMessage({id:'public.confirm'}) ,
-      okType: 'danger',
-      cancelText: intl.formatMessage({id:'public.cancel'}) ,
-      async onOk() {
-        let res:any=await getDeleteTree(selectedInfo.uuid);
-        if(res.code==200){
-          message.success(res.msg);
-          getTreeData();
-        }else{
-          message.error(res.msg)
-        }
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
-  };
-  const handleOk = () => {
-    form.submit();
-  };
-
-  const handleCancel = () => {
-    setIsModalOpen(false);
-  };
-  //表单数据保存
-  const formSend = ()=>{
-    form.validateFields();
-    
-    let dataNow=form.getFieldsValue();
-    
-    if(modalTitle){
-      dataNow={
-        ...dataNow,
-        carType:"catege"
-      }
-    }else{
-      dataNow={
-        ...dataNow,
-        uuid:oneTreeId
-      }
-    }
-    console.log('dataNow===',dataNow)
-    console.log('productLevel===',productLevel)
-    dataNow.fatherId = selectedInfo.fatherId;
-    editProductTree(dataNow).then((res:any)=>{
-      console.log("res",res);
-      if(res.code == 200){
-        message.success(res.msg);
-        getTreeData();
-        setIsModalOpen(false);
-      }else{
-        message.error(res.msg);
-      }
-    });
-    
-  }
-
-  useEffect(() => {
-    getTreeData();
-    // setProductId(treeData[0].key);
-    // setProductLevelDefault([treeData[0].key]);
-    // console.log([treeData[0].key],'[treeData[0].key]');
-    
-    
-  }, []);
-
-  return (
-    <KeepAlive name={intl.formatMessage({id:'product.productManage'})} path="/Product/ProductManage">
-      <div className='productAll'>
-        <div className='leftDiv'>
-          <div className='leftUp'>
-            <Button type="link" icon={<PlusOutlined />} onClick={addTree} />
-            <Button type="link" icon={<EditOutlined />} onClick={openTreeEdit}/>
-            <Button type="link" icon={<DeleteOutlined />} onClick={showDeleteConfirm} />
-          </div>
-          <div className='leftDw'>
-          {treeData.length>0&&<Tree
-            selectedKeys={productLevelDefault}
-            autoExpandParent
-            fieldNames={{key:'uuid'}}
-            onSelect={onSelect}
-            treeData={treeData}
-          />}
-          </div>
-        </div>
-        <div className='rightDiv'>
-          {/* <FormattedMessage id="navBar.lang" /> */}
-          { productLevel=='catege' && <Tabs className='carTabs' defaultActiveKey="1" items={items} onChange={onChange} />}
-          {/* { productLevel=='series' && <Tabs className='carTabs' defaultActiveKey="1" items={items2} onChange={onChange} />}
-          { productLevel=='model' && <Tabs className='carTabs' defaultActiveKey="1" items={items3} onChange={onChange} />}
-          { productLevel=='catege' && <div className='tdkStyle'><Button type="primary" onClick={changeTdk}><FormattedMessage id="public.tdk" /></Button></div>} */}
-        </div>
-        <Modal title={modalTitle?intl.formatMessage({id:'product.newBrandInfo'}) :intl.formatMessage({id:'product.editBrandInfo'}) } open={isModalOpen} onOk={handleOk} onCancel={handleCancel}>
-        <Form
-            form={form}
-            labelCol={{ flex: '70px' }}
-            labelAlign="left"
-            labelWrap
-            wrapperCol={{ flex: 1 }}
-            colon={false}
-            style={{ maxWidth: 680 }}
-            onFinish={formSend}
-          >
-            <Form.Item
-              label={intl.formatMessage({id:'public.name'}) }
-              name="title"
-              rules={[{ required: true }]}
-            >
-              <Input />
-            </Form.Item>
-            <Form.Item
-              label={intl.formatMessage({id:'public.sort'})}
-              name="sort"
-            >
-              <Input />
-            </Form.Item>
-          </Form>
-        </Modal>
-      </div>
-      <TdkEdit isModalOpenTdk={isModalOpenTdk} htmlName={'products'} setIsModalOpenTdk={setIsModalOpenTdk}/>
-    </KeepAlive>
-  );
-};
-
-export default Home;

src/pages/Product/ProductManage/page/TestimonyDetail.tsx

@@ -1,274 +0,0 @@
-import React,{Ref,useEffect,useState,useRef } from 'react';
-import {Button,Tree,Tabs,Table,Modal,Space,Form, Input,TreeSelect,Select,Upload, message,Radio,ColorPicker,Image,Popconfirm } from 'antd'
-import { PlusOutlined,DeleteOutlined } from '@ant-design/icons';
-import { upload } from '@/services/news/news';
-import { getTestimonyList,editTestimony,TestimonyDelete,pushProductsBrand } from '@/services/product';
-import '../index.less';
-import { FormattedMessage,useIntl } from 'umi';
-
-const { TextArea } = Input;
-
-const TestimonyTable: React.FC<{id:any,upTree:any}> = (prop:any) => {
-  let intl = useIntl()
-  const [listData, setListData] = useState([]);  //列表数据
-
-  const [isModalOpen, setIsModalOpen] = useState(false);  //弹框
-  const [modalTitle, setModalTitle] = useState(true);  //弹框标题
-  const [form] = Form.useForm();
-
-  const [imgPc, setImgPc] = useState({id:undefined,url:''});   //pc图片
-  const [imgM, setImgM] = useState({id:undefined,url:''});   //移动端图片
-
-  //弹框确定
-  const handleOk = () => {
-    form.submit();
-  };
-  //弹框取消
-  const handleCancel = () => {
-    setIsModalOpen(false);
-  };
-  //删除数据
-  const deleteCar = async (e:any) => {
-    console.log('删除：',e);
-    let res:any=await TestimonyDelete(e.uuid);
-        if(res.code==200){
-          getListData();
-          message.success(res.msg);
-        }else{
-          message.error(res.msg)
-        }
-  };
-  //修改数据
-  const revise = (e:any) => {
-    console.log('修改',e);
-    form.setFieldsValue({ 
-      userName: e?.userName,
-      job: e?.job,
-      brandTestimony: e?.brandTestimony,
-      sort:e?.sort,
-      uuid:e?.uuid,
-    });
-    setImgPc({id:e?.pcImg,url:e?.pcImgUrl});
-    setIsModalOpen(true);
-    setModalTitle(false);
-  };
-  //新增
-  const addDom = ()=>{
-    form.resetFields();
-    form.setFieldsValue({
-      userName: undefined,
-      job:undefined,
-      brandTestimony:undefined,
-      sort:undefined,
-      uuid:undefined,
-    });
-    setImgPc({id:undefined,url:''});
-    setIsModalOpen(true);
-    setModalTitle(true);
-  }
-  //表单数据保存
-  const formSend = ()=>{
-    form.validateFields();
-    
-    
-    let dataNow=form.getFieldsValue();
-    dataNow={
-      ...dataNow,
-      menuUuid:prop.id,
-      pcImg:imgPc.id?imgPc.id:'',
-    }
-    
-    console.log(dataNow,'dataNowModel');
-    
-    editTestimony(dataNow).then((res:any)=>{
-      if(res.code == 200){
-        getListData();
-        setIsModalOpen(false);
-        message.success(res.msg);
-      }else{
-        message.error(res.msg);
-      }
-    });
-  }
-  
-  //图片上传
-  const handleBeforeUpload = async (file: any,type:any) => {
-    console.log(file,'file');
-    
-    const formData = new FormData();
-    formData.append('file', file, file.name);
-    const res = await upload(formData);
-    if (res?.data?.uuid) {
-      if(type == 'pc'){
-        setImgPc({id:res.data.uuid,url:res.data.url})
-      }
-      else{
-        setImgM({id:res.data.uuid,url:res.data.url})
-      }
-      
-    }
-    return false;
-  };
-  //图片删除
-  const imgDele = (value: string) => {
-    if(value == 'pc'){
-      setImgPc({id:undefined,url:''})
-    }else{
-      setImgM({id:undefined,url:''})
-    }
-  };
-  
-  //表格列设置
-  const columns: any = [
-    {
-      title: intl.formatMessage({id:'public.username'}),
-      dataIndex: 'userName',
-      key: 'userName',
-      width:200,
-    },
-    {
-      title: intl.formatMessage({id:'public.job'}),
-      dataIndex: 'job',
-      key: 'job',
-      align: 'center',
-      width:100,
-    },
-    {
-      title: intl.formatMessage({id:'public.testimony'}),
-      dataIndex: 'brandTestimony',
-      key: 'brandTestimony',
-      align: 'center',
-      width:400,
-    },
-    {
-      title: intl.formatMessage({id:'public.avator'}),
-      dataIndex: 'pcImg',
-      key: 'pcImg',
-      align: 'center',
-      width:150,
-      render: (text:any,record:any) => <img src={record?.pcImgUrl} style={{ height:'110px'}}/>,
-    },
-    {
-      title: intl.formatMessage({id:'public.sort'}),
-      dataIndex: 'sort',
-      key: 'sort',
-      align: 'center',
-      width:100,
-    },
-    {
-      title: intl.formatMessage({id:'public.action'}),
-      dataIndex: '',
-      align: 'center',
-      width:160,
-      render: (text:any,record:any) => {
-        return <Space size="middle"><Button type='text' onClick={()=>revise(record)}>修改</Button><Button type='text' onClick={()=>deleteCar(record)}>删除</Button></Space>
-      },
-    },
-  ];
-  //获取列表数据
-  const getListData:any =()=>{
-    if(prop.id=='')return;
-    getTestimonyList(prop.id).then((res)=>{
-      if(res.code==200){
-        if(res.rows.length>0){
-          setListData(res.rows);
-        }else{
-          setListData([]);
-        }
-      }else{
-        message.error(res.msg);
-      }
-    })
-  }
-  useEffect(() => {
-    getListData();
-    
-  }, [prop.id]);
-  
-    //发布静态化
-  const pushStatusPage:any =()=>{
-    if(prop.id==''){
-      message.error('没有id');
-      return;
-    }
-    pushProductsBrand(prop.id).then((res:any)=>{
-      if(res.code==200){
-        message.success(res.msg)
-      }else{
-        message.error(res.msg);
-      }
-    })
-  }
-    
-
-
-const uploadButton = (
-  <button style={{ border: 0, background: 'none' }} type="button">
-    <PlusOutlined />
-    <div style={{ marginTop: 8 }}>Upload</div>
-  </button>
-);
-
-  return (
-      <div className='carRight'>
-        <div className='carTitle'>
-          {intl.formatMessage({id:'public.usertestimony'})}
-          <Popconfirm title="是否确定发布?" onConfirm={pushStatusPage}>
-                <Button className='btn' type="primary">{intl.formatMessage({id:'public.publishAll'})}</Button>
-          </Popconfirm>
-          <Button className='btn' type="primary" onClick={addDom}>{intl.formatMessage({id:'public.add'})}</Button>
-        </div>
-        <Table
-          columns={columns}
-          dataSource={listData}
-          rowKey={(record:any)=>record?.uuid}
-        />
-        <Modal title={modalTitle?intl.formatMessage({id:'public.newModal'}):intl.formatMessage({id:'public.updateModal'})} className='carModal' open={isModalOpen} onOk={handleOk} onCancel={handleCancel} width={880}>
-        <Form
-            form={form}
-            labelCol={{ flex: '160px' }}
-            labelAlign="left"
-            labelWrap
-            wrapperCol={{ flex: 1 }}
-            colon={false}
-            style={{ maxWidth: 880 }}
-            onFinish={formSend}
-          >
-            <Form.Item label="uuid" name="uuid" hidden>
-              <Input />
-            </Form.Item>
-            <Form.Item label={intl.formatMessage({id:'public.username'})} name="userName">
-                <Input />
-            </Form.Item>
-            <Form.Item label={intl.formatMessage({id:'public.job'})} name="job">
-                <Input />
-            </Form.Item>
-            <Form.Item label={intl.formatMessage({id:'public.sort'})} name="sort">
-                <Input />
-            </Form.Item>
-            <Form.Item label={intl.formatMessage({id:'public.testimony'})} name="brandTestimony">
-              <TextArea rows={4} />
-            </Form.Item>
-            <Form.Item label={intl.formatMessage({id:'public.avator'})}  extra={intl.formatMessage({id:'public.pictureSize'})+"：340*340"}>
-                  {(imgPc&&imgPc?.id) && <div className='showImg'><img src={imgPc.url} /></div>}
-                  <div className='uploadBtn'>
-                      <Upload
-                          beforeUpload={(e)=>handleBeforeUpload(e,'pc')}
-                          maxCount={1}
-                          showUploadList={false}
-                          accept={'.png, .jpg, .gif'}
-                        >
-                          <Button>{intl.formatMessage({id:'public.upload'})}</Button>
-                      </Upload>
-                  </div>
-                  <div className='uploadBtn'><Button onClick={()=>{imgDele('pc')}} >{intl.formatMessage({id:'public.delete'})}</Button></div>
-              </Form.Item>
-          </Form>
-          
-        </Modal>
-
-      </div>
-  );
-};
-
-export default TestimonyTable;

src/pages/Product/ProductManage/page/carBrandDetail.tsx

@@ -1,283 +0,0 @@
-import React, { Ref, useEffect, useState, useRef } from 'react';
-import { Button, Tree, Tabs, Table, Modal, Space, Form, Input, TreeSelect, Select, Upload, message, Radio, ColorPicker, Image, Popconfirm, UploadFile, UploadProps, GetProp } from 'antd'
-import { PlusOutlined, DeleteOutlined } from '@ant-design/icons';
-import { upload } from '@/services/news/news';
-import { getCarBrandDetialList, editCarBrandDetail, carBrandDetailDelete, pushProductsBrand,getDeleteDetailPerform,getDetailPerformSave,getDetailPerformDetail } from '@/services/product';
-import { FormattedMessage, useIntl } from 'umi';
-import '../index.less';
-import modelBanner from '/public/image/model_banner.jpg';
-import brandLight1 from '/public/image/brand_light1.jpg';
-import brandLight2 from '/public/image/brand_light2.jpg';
-import brandLight3 from '/public/image/brand_light3.jpg';
-
-const { Option } = Select;
-const { TextArea } = Input;
-const modleImg: any = {
-    'banner': modelBanner,
-    'brandLight1': brandLight1,
-    'brandLight2': brandLight2,
-    'brandLight3': brandLight3,
-}
-
-type FileType = Parameters<GetProp<UploadProps, 'beforeUpload'>>[0];
-const getBase64 = (file: FileType): Promise<string> =>
-    new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.readAsDataURL(file);
-        reader.onload = () => resolve(reader.result as string);
-        reader.onerror = (error) => reject(error);
-    });
-const CarBrandDetailTable: React.FC<{ id: any, upTree: any }> = (prop: any) => {
-
-    const intl = useIntl()
-    const modleList = [
-        { value: 'banner', label: intl.formatMessage({ id: 'public.focusImg' }) },  //最上面banner图
-        { value: 'brandLight1', label: intl.formatMessage({ id: 'public.light1' }) },    //车轮播显示
-        { value: 'brandLight2', label: intl.formatMessage({ id: 'public.light2' }) }, //左标题描述配置，右图
-        { value: 'brandLight3', label: intl.formatMessage({ id: 'public.light3' }) }, //模块四  上图标题描述，下左轮播4图右标题描述
-    ]
-    const imgVideo = [
-        [{
-            label: intl.formatMessage({ id: 'public.img' }) + '(PC)',
-            extra: intl.formatMessage({ id: 'public.pictureSize' }) + '：1920*1080',
-            accept: '.png, .jpg, .gif'
-        }, {
-            label: intl.formatMessage({ id: 'public.img' }) + "(Mob)",
-            extra: intl.formatMessage({ id: 'public.pictureSize' }) + '：750*1624',
-            accept: '.png, .jpg, .gif'
-        }],
-        [{
-            label: intl.formatMessage({ id: 'public.video' }) + '(PC)',
-            extra: intl.formatMessage({ id: 'public.videoSize' }) + '：1920*1080',
-            accept: '.mp4'
-        }, {
-            label: intl.formatMessage({ id: 'public.video' }) + '(Mob)',
-            extra: intl.formatMessage({ id: 'public.videoSize' }) + '：750*1624',
-            accept: '.mp4'
-        }]
-    ];
-
-    const [listData, setListData] = useState([]);  //列表数据
-
-    const [isModalOpen, setIsModalOpen] = useState(false);  //弹框
-    const [modalTitle, setModalTitle] = useState(true);  //弹框标题
-    const [form] = Form.useForm();
-    const [formModel] = Form.useForm();
-    // const [nodes, setNodes] = useState<string>();
-
-    const [modelType, setModelType] = useState('');  //模块类型，是什么模块
-
-    const [imgPc, setImgPc] = useState({ id: undefined, url: '' });   //pc图片
-    const [imgM, setImgM] = useState({ id: undefined, url: '' });   //移动端图片
-
-
-
-    //弹框确定
-    const handleOk = () => {
-        form.submit();
-    };
-    //弹框取消
-    const handleCancel = () => {
-        setIsModalOpen(false);
-    };
-    //删除数据
-    const deleteCar = async (e: any) => {
-        console.log('删除：', e);
-        let res: any = await getDeleteDetailPerform(e.uuid);
-        if (res.code == 200) {
-            getListData();
-            message.success(res.msg);
-        } else {
-            message.error(res.msg)
-        }
-    };
-    //修改数据
-    const revise = (e: any) => {
-        console.log('修改', e);
-        form.setFieldsValue({
-            title: e?.title,
-            content: e?.content,
-            sort: e?.sort,
-            uuid: e?.uuid,
-        });
-        setImgPc({id:e.img,url:e.imgUrl})        // setNodes(e?.nodes);
-
-        setIsModalOpen(true);
-        setModalTitle(false);
-    };
-    //新增
-    const addDom = () => {
-        form.resetFields();
-        form.setFieldsValue({
-            column: undefined,
-            columnName: undefined,
-            sort: undefined,
-            uuid: undefined,
-        });
-        setImgPc({ id: undefined, url: '' });
-        setModelType('');
-        // setNodes(undefined);
-        setIsModalOpen(true);
-        setModalTitle(true);
-    }
-
-    //表单数据保存
-    const formSend = () => {
-        form.validateFields();
-
-        let dataNow = form.getFieldsValue();
-       
-        dataNow = {
-            ...dataNow,
-            img: imgPc?.id ? imgPc.id : undefined,
-            productMenuUuid: prop.id,
-        }
-
-        getDetailPerformSave(dataNow).then((res: any) => {
-            if (res.code == 200) {
-                getListData();
-                setIsModalOpen(false);
-                message.success(res.msg);
-            } else {
-                message.error(res.msg);
-            }
-        });
-    }
-
-    //图片上传
-    const handleBeforeUpload = async (file: any) => {
-        console.log(file, 'file');
-
-        const formData = new FormData();
-        formData.append('file', file, file.name);
-        const res = await upload(formData);
-        if (res?.data?.uuid) {
-            setImgPc({ id: res.data.uuid, url: res.data.url })
-
-        }
-        return false;
-    };
-    //图片删除
-    const imgDele = () => {
-        setImgPc({ id: undefined, url: '' })
-    };
-
-    //表格列设置
-    const columns: any = [
-        {
-            title: intl.formatMessage({ id: 'public.title' }),
-            dataIndex: 'title',
-            key: 'title',
-        },
-        {
-            title: intl.formatMessage({ id: 'public.desctiption' }),
-            dataIndex: 'content',
-            key: 'content',
-        },
-        
-        {
-            title: '图片',
-            dataIndex: 'imgUrl',
-            key: 'imgUrl',
-            render:(_,record)=>{
-                return <Image src={record.imgUrl} />
-            }
-        },
-       
-
-        {
-            title: intl.formatMessage({ id: 'public.action' }),
-            dataIndex: '',
-            align: 'center',
-            width: 160,
-            render: (text: any, record: any) => {
-                return <Space size="middle">
-                    <Button type='text' onClick={() => revise(record)}>{intl.formatMessage({ id: 'public.update' })}</Button>
-                    <Popconfirm title={intl.formatMessage({ id: 'public.ifconfirmdelete' })} onConfirm={() => deleteCar(record)}>
-                        <Button danger type='text'>{intl.formatMessage({ id: 'public.delete' })}</Button>
-                    </Popconfirm>
-
-                </Space>
-            },
-        },
-    ];
-    //获取列表数据
-    const getListData: any = () => {
-        if (prop.id == '') return;
-        getDetailPerformDetail(prop.id).then((res) => {
-            if (res.code == 200) {
-                if (res.rows.length > 0) {
-                    setListData(res.rows);
-                } else {
-                    setListData([]);
-                }
-            } else {
-                message.error(res.msg);
-            }
-        })
-    }
-    useEffect(() => {
-        getListData();
-
-    }, [prop.id]);
-
-
-    return (
-        <div className='carRight'>
-            <div className='carTitle'>
-                {'性能介绍'}
-                {/* <Popconfirm title={intl.formatMessage({id:'public.ifConfirmPublish'})} onConfirm={pushStatusPage}>
-                <Button className='btn' type="primary">{intl.formatMessage({id:'public.publishAll'})}</Button>
-          </Popconfirm> */}
-                {/* <Button className='btn' type="primary" onClick={previewPage}>{intl.formatMessage({id:'public.preview'})}</Button> */}
-                <Button className='btn' type="primary" onClick={addDom}>{intl.formatMessage({ id: 'public.add' })}</Button>
-            </div>
-            <Table
-                columns={columns}
-                dataSource={listData}
-                rowKey={(record: any) => record?.uuid}
-            />
-            <Modal title={modalTitle ? intl.formatMessage({ id: 'public.addIntroduce' }) : intl.formatMessage({ id: 'public.editIntroduce' })} className='carModal' open={isModalOpen} onOk={handleOk} onCancel={handleCancel} width={880}>
-                <Form
-                    form={form}
-                    labelCol={{ flex: '160px' }}
-                    labelAlign="left"
-                    labelWrap
-                    wrapperCol={{ flex: 1 }}
-                    colon={false}
-                    style={{ maxWidth: 880 }}
-                    onFinish={formSend}
-                >
-                    <Form.Item label="uuid" name="uuid" hidden>
-                        <Input />
-                    </Form.Item>
-                    <Form.Item label={intl.formatMessage({ id: 'public.title' })} rules={[{ required: true }]} name="title" >
-                        <Input />
-                    </Form.Item>
-                    <Form.Item label={intl.formatMessage({ id: 'public.description' })} rules={[{ required: true }]} name="content">
-                        <TextArea rows={4} />
-                    </Form.Item>
-                    <Form.Item label={'banner'}  >
-                        {imgPc.id && <div className='showImg'><img src={imgPc.url} /></div>}
-                        <div className='uploadBtn'>
-                            <Upload
-                                beforeUpload={(e) => handleBeforeUpload(e)}
-                                maxCount={1}
-                                accept={'.png, .jpg, .gif'}
-                            >
-                                <Button>{intl.formatMessage({ id: 'public.upload' })}</Button>
-                            </Upload>
-                        </div>
-                        <div className='uploadBtn'><Button onClick={()=>{imgDele()}} >{intl.formatMessage({id:'public.delete'})}</Button></div>
-                    </Form.Item>
-                    <Form.Item label={'排序'} name="sort">
-                        <Input />
-                    </Form.Item>
-                </Form>
-            </Modal>
-
-        </div>
-    );
-};
-
-export default CarBrandDetailTable;

src/pages/Product/ProductManage/page/carModels.tsx

@@ -1,354 +0,0 @@
-import React,{Ref,useEffect,useState,useRef } from 'react';
-import {Button,Tree,Tabs,Table,Modal,Space,Form, Input,TreeSelect,Select,Upload, message,Popconfirm,Tooltip   } from 'antd'
-import { PlusOutlined,LoadingOutlined,InfoCircleOutlined } from '@ant-design/icons';
-import { upload } from '@/services/news/news';
-import { FormattedMessage,useIntl } from 'umi';
-import { getCarList,editProductTree,getDeleteTree,pushProducts, } from '@/services/product';
-import '../index.less';
-import { trim } from 'lodash';
-
-const { Option } = Select;
-const { TextArea } = Input;
-
-const CarModelsTable: React.FC<{id:any,upTree:any,treeDataAll:any}> = (prop:any) => {
-  let intl = useIntl()
-  const [listData, setListData] = useState([]);  //列表数据
-
-  const [isModalOpen, setIsModalOpen] = useState(false);  //弹框
-  const [modalTitle, setModalTitle] = useState(true);  //弹框标题
-  const [form] = Form.useForm();
-  // const [nodes, setNodes] = useState<string>();
-
-  const [loading, setLoading] = useState(false);
-  const [imgPc, setImgPc] = useState({id:undefined,url:''});   //pc图片
-  const [imgM, setImgM] = useState({id:undefined,url:''});   //移动端图片
-  const [htmlPath, setHtmlPath] = useState(1);   //页面路径，为1成功，为2失败不能保存
-  // 页面路径是否显示
-  const [pagePathShow, setPagePathShow] = useState(true);
-  //弹框确定
-  const handleOk = () => {
-    let dataNow=form.getFieldsValue();
-    
-      if(dataNow.htmlUrl==undefined||trim(dataNow.htmlUrl).length==0){
-        setHtmlPath(3)
-      }
-    form.submit();
-  };
-  //弹框取消
-  const handleCancel = () => {
-    setIsModalOpen(false);
-  };
-  //删除数据
-  const deleteCar = async (e:any) => {
-    console.log('删除：',e);
-    let res:any=await getDeleteTree(e.uuid);
-        if(res.code==200){
-          getListData();
-          prop.upTree();
-          message.success(res.msg);
-        }else{
-          message.error(res.msg)
-        }
-  };
-  //修改数据
-  const revise = (e:any) => {
-    console.log('修改',e);
-    form.setFieldsValue(e);
-    setHtmlPath(1);
-    // setNodes(e?.nodes);
-    setImgPc({id:e?.pcImg,url:e?.pcImgUrl});
-    // setImgM({id:e?.mImg,url:e?.mImgUrl});
-    setIsModalOpen(true);
-    setModalTitle(false);
-  };
-  //新增
-  const addDom = ()=>{
-    
-    
-    form.resetFields();
-    form.setFieldsValue({ 
-      carType: undefined,
-      pText: undefined,
-      title:undefined,
-      sort:undefined,
-      uuid:undefined,
-      key:undefined,
-      htmlUrl:undefined,
-    });
-    setHtmlPath(1);
-    // setNodes(undefined);
-    setImgPc({id:undefined,url:''});
-    // setImgM({id:undefined,url:''});
-    setIsModalOpen(true);
-    setModalTitle(true);
-  }
-  //表单数据保存
-  const formSend = ()=>{
-    form.validateFields();
-    
-    let dataNow=form.getFieldsValue();
-    if(pagePathShow)dataNow.htmlUrl=trim(dataNow.htmlUrl);
-    dataNow={
-      ...dataNow,
-      // nodes,
-      pcImg:imgPc.id?imgPc.id:'',
-      // mImg:imgM.id?imgM.id:'',
-      fatherId:prop.id,
-      carType:'model'
-    }
-    
-    
-    if(pagePathShow&&htmlPath!=1){
-      return
-    }
-    editProductTree(dataNow).then((res:any)=>{
-      if(res.code == 200){
-        getListData();
-        prop.upTree();
-        setIsModalOpen(false);
-        message.success(res.msg);
-      }else{
-        message.error(res.msg);
-      }
-    });
-  }
-  //树形选择
-  const onChangeTreeSelect = (newValue: string) => {
-    console.log(newValue,'newValue');
-    
-    // setNodes(newValue);
-  };
-  //类型选择
-  const onCarTypeChange = (value: string) => {
-    form.setFieldsValue({ carType: value });
-  };
-  //图片上传
-  const handleBeforeUpload = async (file: any,type:any) => {
-    const formData = new FormData();
-    formData.append('file', file, file.name);
-    const res = await upload(formData);
-    if (res?.data?.uuid) {
-      if(type == 'pc'){
-        setImgPc({id:res.data.uuid,url:res.data.url})
-      }else{
-        setImgM({id:res.data.uuid,url:res.data.url})
-      }
-      
-    }
-    return false;
-  };
-  //图片删除
-  const imgDele = (value: string) => {
-    if(value == 'pc'){
-      setImgPc({id:undefined,url:''})
-    }else{
-      setImgM({id:undefined,url:''})
-    }
-  };
-  
-  //表格列设置
-  const columns: any = [
-    {
-      title: intl.formatMessage({id:'public.title'}),
-      dataIndex: 'title',
-      key: 'title',
-      width:200,
-    },
-    {
-      title: intl.formatMessage({id:'public.sort'}),
-      dataIndex: 'sort',
-      key: 'sort',
-      align: 'center',
-      width:100,
-    },
-    {
-      title: intl.formatMessage({id:'public.desctiption'}),
-      dataIndex: 'pText',
-      key: 'pText',
-      align: 'center',
-      width:400,
-    },
-    {
-      title: intl.formatMessage({id:'public.img'}),
-      dataIndex: 'carImg',
-      key: 'carImg',
-      align: 'center',
-      width:150,
-      render: (text,record:any) => <img src={record?.pcImgUrl} style={{ height:'110px'}}/>,
-    },
-    {
-      title: intl.formatMessage({id:'public.action'}),
-      dataIndex: '',
-      align: 'center',
-      width:160,
-      render: (text,record) => {
-        return <Space size="middle"><Button type='text' onClick={()=>revise(record)}>{intl.formatMessage({id:'public.update'})}</Button><Button type='text' onClick={()=>deleteCar(record)}>{intl.formatMessage({id:'public.delete'})}</Button></Space>
-      },
-    },
-  ];
-  
-  const getListData:any =()=>{
-    if(prop.id=='')return;
-    let showPage=true;
-    prop.treeDataAll.map((e:any)=>{
-      if(e.uuid =="9a99b2abf66e45269306c3c34bd64d8c"){
-        if(e.children.filter((item:any)=>item.uuid==prop.id).length>0){
-          showPage=false;
-        }
-      }
-    });
-    setPagePathShow(showPage);
-    getCarList(prop.id).then((res)=>{
-      if(res.code==200){
-        if(res.rows.length>0){
-          setListData(res.rows);
-        }else{
-          setListData([]);
-        }
-      }else{
-        message.error(res.msg);
-      }
-    })
-  }
-  //发布静态化
-  const pushStatusPage:any =()=>{
-    if(prop.id==''){
-      message.error('没有id');
-      return;
-    }
-    pushProducts(prop.id).then((res:any)=>{
-      if(res.code==200){
-        message.success(res.msg)
-      }else{
-        message.error(res.msg);
-      }
-    })
-  }
-  useEffect(() => {
-    getListData();
-    
-  }, [prop.id]);
-  //路径校验
-  const onPagePathChange=(val:any)=>{
-    let str=trim(val.target.value);
-    if(str.length==0||str==undefined||str==null){
-      setHtmlPath(3)
-    }else if(str.indexOf('?')!==-1||str.indexOf('*')!==-1||str.indexOf(':')!==-1||str.indexOf('"')!==-1||str.indexOf('<')!==-1||str.indexOf('>')!==-1||str.indexOf('|')!==-1||str.indexOf('\\')!==-1){
-      setHtmlPath(2)
-    }
-    else{
-      setHtmlPath(1)
-    }
-  }
-
-  return (
-      <div className='carRight'>
-        <div className='carTitle'>
-          
-          {intl.formatMessage({id:'public.carTypeList'})}
-          <Popconfirm title={intl.formatMessage({id:'public.ifConfirmPublish'})+'?'} onConfirm={pushStatusPage}>
-                <Button className='btn' type="primary">{intl.formatMessage({id:'public.publishAll'})}</Button>
-          </Popconfirm>
-          <Button className='btn' type="primary" onClick={addDom}>{intl.formatMessage({id:'public.add'})}</Button>
-        </div>
-        <Table
-          columns={columns}
-          dataSource={listData}
-          rowKey={(record:any)=>record?.uuid}
-        />
-        <Modal title={modalTitle?intl.formatMessage({id:'public.newCarTypeInfo'}):intl.formatMessage({id:'public.updateCarTypeInfo'})} className='carModal' open={isModalOpen} onOk={handleOk} onCancel={handleCancel} width={880}>
-        <Form
-            form={form}
-            labelCol={{ flex: '160px' }}
-            labelAlign="left"
-            labelWrap
-            wrapperCol={{ flex: 1 }}
-            colon={false}
-            style={{ maxWidth: 880 }}
-            onFinish={formSend}
-          >
-            <Form.Item label="uuid" name="uuid" hidden>
-              <Input />
-            </Form.Item>
-            <Form.Item label={intl.formatMessage({id:'public.carTypeName'})} name="title" rules={[{ required: true }]}>
-              <Input />
-            </Form.Item>
-            {/* <Form.Item name="carType" label="类型" rules={[{ required: true }]}>
-              <Select
-                placeholder="请选择类型"
-                onChange={onCarTypeChange}
-                allowClear
-              >
-                <Option value="series">车系</Option>
-                <Option value="overview">概览</Option>
-              </Select>
-            </Form.Item> */}
-            <Form.Item label={intl.formatMessage({id:'public.sort'})} name="sort">
-              <Input />
-            </Form.Item>
-            {/* <Form.Item label="关联节点" rules={[{ required: true }]}>
-              <TreeSelect
-                  showSearch
-                  style={{ width: '100%' }}
-                  value={nodes}
-                  dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
-                  placeholder="请选择"
-                  allowClear
-                  treeDefaultExpandAll
-                  onChange={onChangeTreeSelect}
-                  treeData={prop.treeDataMy}
-                  fieldNames={{label:'title',value:'uuid'}}
-                />
-            </Form.Item> */}
-            
-            <Form.Item label={intl.formatMessage({id:'public.description'})} name="pText">
-              <TextArea rows={4} />
-            </Form.Item>
-            <Form.Item label={intl.formatMessage({id:'public.keyword'})} name="key">
-              <Input />
-            </Form.Item>
-            {pagePathShow&&
-            <Form.Item label={intl.formatMessage({id:'public.pagePath'})} name="htmlUrl" rules={[{ required: true }]}
-            validateStatus={(htmlPath==2||htmlPath==3)?"error":""} help={htmlPath==2?intl.formatMessage({id:'public.pagePathInfo'}):htmlPath==3?intl.formatMessage({id:'public.inputPlaceholder'})+intl.formatMessage({id:'public.pagePath'}):""}
-            >
-              <Input suffix={<Tooltip title={intl.formatMessage({id:'public.pagePathMess'})}>
-          <InfoCircleOutlined style={{ color: 'rgba(0,0,0,.45)' }} />
-        </Tooltip>} onChange={onPagePathChange} placeholder={intl.formatMessage({id:'public.inputPlaceholder'})+intl.formatMessage({id:'public.pagePath'})}/>
-            </Form.Item>}
-
-            <Form.Item label={intl.formatMessage({id:'public.img'})+'(PC)'} extra={intl.formatMessage({id:'public.pictureSize'})+'：1280*720'}>
-                {imgPc.id && <div className='showImg'><img src={imgPc.url} /></div>}
-                <div className='uploadBtn'>
-                    <Upload
-                        beforeUpload={(e)=>handleBeforeUpload(e,'pc')}
-                        maxCount={1}
-                        showUploadList={false}
-                        accept={'.png, .jpg, .gif'}
-                      >
-                        <Button>{intl.formatMessage({id:'public.upload'})}</Button>
-                    </Upload>
-                </div>
-                <div className='uploadBtn'><Button onClick={()=>{imgDele('pc')}} >{intl.formatMessage({id:'public.delete'})}</Button></div>
-            </Form.Item>
-            {/* <Form.Item label="图片(移动)">
-                {imgM.id && <div className='showImg'><img src={imgM.url} /></div>}
-                <div className='uploadBtn'>
-                    <Upload
-                        beforeUpload={(e)=>handleBeforeUpload(e,'m')}
-                        maxCount={1}
-                        showUploadList={false}
-                        accept={'.png, .jpg, .gif'}
-                      >
-                        <Button>上传</Button>
-                    </Upload>
-                </div>
-                <div className='uploadBtn'><Button onClick={()=>{imgDele('m')}}>删除</Button></div>
-            </Form.Item> */}
-
-          </Form>
-        </Modal>
-      </div>
-  );
-};
-
-export default CarModelsTable;

src/pages/Product/ProductManage/page/carSeries.tsx

@@ -1,327 +0,0 @@
-import React, { Ref, useEffect, useState, useRef } from 'react';
-import { Button, Tree, Tabs, Table, Modal, Space, Form, Input, Image, TreeSelect, Select, Upload, message, Popconfirm, Tooltip, UploadFile, UploadProps, GetProp } from 'antd'
-import { PlusOutlined, LoadingOutlined, InfoCircleOutlined } from '@ant-design/icons';
-import { upload } from '@/services/news/news';
-import { getCarList, editProductTree, getDeleteTree, pushProducts, getProductDetail, editProductDetail } from '@/services/product';
-import '../index.less';
-import { FormattedMessage, useIntl } from 'umi';
-import { trim } from 'lodash';
-import { EditableProTable } from '@ant-design/pro-components';
-
-const { Option } = Select;
-const { TextArea } = Input;
-type DataSourceType = {
-  id: React.Key;
-  key?: string;
-  readonly?: string;
-  decs?: string;
-  state?: string;
-  created_at?: number;
-  update_at?: number;
-  children?: DataSourceType[];
-  value?: string;
-};
-
-
-type FileType = Parameters<GetProp<UploadProps, 'beforeUpload'>>[0];
-
-const CarListTable: React.FC<{ id: any, upTree: any }> = (prop: any) => {
-
-  const [listData, setListData] = useState([]);  //列表数据
-  let intl = useIntl()
-  const [form] = Form.useForm();
-
-  const [imgPc, setImgPc] = useState({ id: undefined, url: '' });   //pc图片
-  const [imgM, setImgM] = useState({ id: undefined, url: '' });   //移动端图片
-  const [imgParameter, setimgParameter] = useState({ id: undefined, url: '' });   //参数
-  const [imgListShow, setimgListShow] = useState({ id: undefined, url: '' });   //列表显示图
-
-  const [editableKeys, setEditableRowKeys] = useState<React.Key[]>([]);
-  const [dataSource, setDataSource] = useState<readonly DataSourceType[]>([]);
-
-  //弹框确定
-  const handleOk = () => {
-    form.submit();
-  };
-
-  //表单数据保存
-  const formSend = () => {
-    form.validateFields();
-    let dataNow = form.getFieldsValue();
-
-    dataNow = {
-      ...dataNow,
-      bannerPc: imgPc.id ? imgPc.id : '',
-      bannerM: imgM.id ? imgM.id : '',
-      img: imgListShow.id ? imgListShow.id : '',
-      config: imgParameter.id ? imgParameter.id : '',
-      productMenuUuid: prop.id,
-    }
-    if (dataSource.length > 0) {
-      let list = [];
-      for (let i in dataSource) {
-        list.push({ [dataSource[i].key]: dataSource[i].value })
-      }
-      dataNow.perform = JSON.stringify(list)
-
-    }
-
-    editProductDetail(dataNow).then((res: any) => {
-      if (res.code == 200) {
-        prop.upTree();
-        message.success(res.msg);
-      } else {
-        message.error(res.msg);
-      }
-    });
-  }
-  //图片上传
-  const handleBeforeUpload = async (file: any, type: any) => {
-    const formData = new FormData();
-    formData.append('file', file, file.name);
-    const res = await upload(formData);
-    if (res?.data?.uuid) {
-      if (type == '1') {
-        setImgPc({ id: res.data.uuid, url: res.data.url })
-      } else if (type == '2') {
-        setImgM({ id: res.data.uuid, url: res.data.url })
-      } else if (type == '3') {
-        setimgParameter({ id: res.data.uuid, url: res.data.url })
-      } else if (type == '4') {
-        setimgListShow({ id: res.data.uuid, url: res.data.url })
-      }
-
-    }
-    return false;
-  };
-  //图片删除
-  const imgDele = (value: string) => {
-    if (value == 'pc') {
-      setImgPc({ id: undefined, url: '' })
-    } else {
-      setImgM({ id: undefined, url: '' })
-    }
-  };
-
-  //表格列设置
-  const columns: any = [
-    {
-      title: intl.formatMessage({ id: 'public.key' }),
-      dataIndex: 'key',
-      key: 'key',
-    },
-    {
-      title: intl.formatMessage({ id: 'public.value' }),
-      dataIndex: 'value',
-      key: 'value',
-    },
-    {
-      title: intl.formatMessage({ id: 'public.action' }),
-      align: 'center',
-      width: 140,
-      valueType: 'option',
-      render: (text: string, record: any, _, action) => [
-        <a
-          key="editable"
-          onClick={() => {
-            action?.startEditable?.(record.id);
-          }}
-        >
-          编辑
-        </a>,
-        <a
-          key="delete"
-          onClick={() => {
-            setDataSource(dataSource.filter((item) => item.id !== record.id));
-          }}
-        >
-          删除
-        </a>,
-      ],
-    },
-  ];
-
-  useEffect(() => {
-    getDetail()
-  }, [prop.id]);
-
-  const getDetail = async () => {
-    try {
-      const res = await getProductDetail(prop.id);
-      if (res.code == 200) {
-        form.setFieldsValue({
-          uuid: res.data.uuid,
-          title: res.data.title,
-          digest: res.data.digest,
-        })
-        if (res.data.bannerPc) {
-          setImgPc({ id: res.data.bannerPc, url: res.data.bannerPcUrl })
-        }else{
-          setImgPc({ id: undefined, url: undefined })
-        }
-        if (res.data.bannerM) {
-          setImgM({ id: res.data.bannerM, url: res.data.bannerMUrl })
-        }else{
-          setImgM({ id: undefined, url: undefined })
-        }
-        if (res.data.config) {
-          setimgParameter({ id: res.data.config, url: res.data.configUrl })
-        }else{
-          setimgParameter({ id: undefined, url: undefined })
-        }
-        if (res.data.img) {
-          setimgListShow({ id: res.data.img, url: res.data.imgUrl })
-        }else{
-          setimgListShow({ id: undefined, url: undefined })
-        }
-        if(res.data.perform){
-          let list = JSON.parse(res.data.perform);
-          list = list.map((item,index)=>{
-            const key = Object.keys(item)[0]; // 获取对象的第一个键
-            return {
-              key: key, 
-              value: item[key],
-              id:(Math.random() * 1000000).toFixed(0)
-            }
-          })
-          console.log(list)
-          setDataSource(list)
-        }else{
-          setDataSource([])
-
-        }
-      }
-    } catch (error) { }
-  }
-
-
-  return (
-    <div className='carRight'>
-      <div className='carTitle'>
-        {intl.formatMessage({ id: 'product.carlist' })}
-        <Button className='btn' type="primary" onClick={handleOk}>{intl.formatMessage({ id: 'public.save' })}</Button>
-      </div>
-
-      <Form
-        form={form}
-        labelCol={{ flex: '160px' }}
-        labelAlign="left"
-        labelWrap
-        wrapperCol={{ flex: 1 }}
-        colon={false}
-        style={{ maxWidth: 880 }}
-        onFinish={formSend}
-      >
-        <Form.Item label="uuid" name="uuid" hidden>
-          <Input />
-        </Form.Item>
-        <Form.Item label={intl.formatMessage({ id: 'public.title' })} name="title" rules={[{ required: true }]}>
-          <Input />
-        </Form.Item>
-
-        <Form.Item label={intl.formatMessage({ id: 'public.description' })} name="digest">
-          <TextArea rows={4} />
-        </Form.Item>
-        <Form.Item label={intl.formatMessage({ id: 'public.performanceIndex' })}>
-          <EditableProTable
-            rowKey="id"
-            headerTitle={false}
-            maxLength={5}
-
-            recordCreatorProps={
-              {
-                position: 'bottom',
-                record: () => ({ id: (Math.random() * 1000000).toFixed(0) }),
-                onClick: () => {
-                  // 你可以在这里执行添加新行的逻辑
-                  if (dataSource.length >= 4) {
-                    message.warning('最多添加四条数据')
-                    return false
-                  }
-                  // const newData = { id: (Math.random() * 1000000).toFixed(0) };
-                  // setDataSource((prev) => [...prev, newData]);
-                },
-              }
-            }
-            loading={false}
-            columns={columns}
-
-            value={dataSource}
-            onChange={setDataSource}
-            editable={{
-              type: 'multiple',
-              editableKeys,
-              onSave: async (rowKey, data, row) => {
-                console.log(rowKey, data, row);
-                // await waitTime(2000);
-              },
-              onChange: setEditableRowKeys,
-            }}
-          />
-        </Form.Item>
-        {/* extra={intl.formatMessage({id:'public.pictureSize'})+"：1280*720"} */}
-        <Form.Item label="banner(PC)">
-          {imgPc.id && <div className='showImg'><img src={imgPc.url} /></div>}
-          <div className='uploadBtn'>
-            <Upload
-              beforeUpload={(e) => handleBeforeUpload(e, '1')}
-              maxCount={1}
-              showUploadList={false}
-              accept={'.png, .jpg, .gif'}
-            >
-              <Button>上传</Button>
-            </Upload>
-          </div>
-          <div className='uploadBtn'><Button onClick={() => { imgDele('1') }}>删除</Button></div>
-        </Form.Item>
-        <Form.Item label="banner(移动端)">
-          {imgM.id && <div className='showImg'><img src={imgM.url} /></div>}
-          <div className='uploadBtn'>
-            <Upload
-              beforeUpload={(e) => handleBeforeUpload(e, '2')}
-              maxCount={1}
-              showUploadList={false}
-              accept={'.png, .jpg, .gif'}
-            >
-              <Button>上传</Button>
-            </Upload>
-          </div>
-          <div className='uploadBtn'><Button onClick={() => { imgDele('2') }}>删除</Button></div>
-        </Form.Item>
-        <Form.Item label="参数图片">
-          {imgParameter.id && <div className='showImg'><img src={imgParameter.url} /></div>}
-          <div className='uploadBtn'>
-            <Upload
-              beforeUpload={(e) => handleBeforeUpload(e, '3')}
-              maxCount={1}
-              showUploadList={false}
-              accept={'.png, .jpg, .gif'}
-            >
-              <Button>上传</Button>
-            </Upload>
-          </div>
-          <div className='uploadBtn'><Button onClick={() => { imgDele('3') }}>删除</Button></div>
-        </Form.Item>
-        <Form.Item label="列表显示图片">
-          {imgListShow.id && <div className='showImg'><img src={imgListShow.url} /></div>}
-          <div className='uploadBtn'>
-            <Upload
-              beforeUpload={(e) => handleBeforeUpload(e, '4')}
-              maxCount={1}
-              showUploadList={false}
-              accept={'.png, .jpg, .gif'}
-            >
-              <Button>上传</Button>
-            </Upload>
-          </div>
-          <div className='uploadBtn'><Button onClick={() => { imgDele('4') }}>删除</Button></div>
-        </Form.Item>
-
-
-
-      </Form>
-    </div>
-  );
-};
-
-export default CarListTable;

src/pages/Product/ProductManage/page/carouselImage.tsx

@@ -1,195 +0,0 @@
-import React, { Ref, useEffect, useState, useRef } from 'react';
-import { Button, Tree, Tabs, Table, Modal, Space, Form, Input, Image, TreeSelect, Select, Upload, message, Popconfirm, Tooltip, UploadFile, UploadProps, GetProp } from 'antd'
-import { PlusOutlined, LoadingOutlined, InfoCircleOutlined } from '@ant-design/icons';
-import { upload } from '@/services/news/news';
-import { getCarList, editProductTree, getDeleteTree, getDeleteBanner,getProductBannerSave, getProductBannerDetail, editProductDetail } from '@/services/product';
-import '../index.less';
-import { FormattedMessage, useIntl } from 'umi';
-import { trim } from 'lodash';
-import { EditableProTable } from '@ant-design/pro-components';
-
-const { Option } = Select;
-const { TextArea } = Input;
-type DataSourceType = {
-    id: React.Key;
-    key?: string;
-    readonly?: string;
-    decs?: string;
-    state?: string;
-    created_at?: number;
-    update_at?: number;
-    children?: DataSourceType[];
-    value?: string;
-};
-
-
-type FileType = Parameters<GetProp<UploadProps, 'beforeUpload'>>[0];
-const getBase64 = (file: FileType): Promise<string> =>
-    new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.readAsDataURL(file);
-        reader.onload = () => resolve(reader.result as string);
-        reader.onerror = (error) => reject(error);
-    });
-const CarListTable: React.FC<{ id: any, upTree: any }> = (prop: any) => {
-
-    let intl = useIntl()
-    const [form] = Form.useForm();
-
-    const [imgPc, setImgPc] = useState({ id: undefined, url: '' });   //pc图片
-    const [dataSource, setDataSource] = useState<readonly DataSourceType[]>([]);
-    const [listData,setListData] = useState([]);
-    const [fileUploadList, setFileUploadList] = useState({});
-    const [fileList, setFileList] = useState<UploadFile[]>();
-    const [previewOpen, setPreviewOpen] = useState(false);
-    const [previewImage, setPreviewImage] = useState('');
-    const [isModalOpen,setIsModalOpen] = useState<boolean>(false);
-
-    //弹框确定
-    const handleOk = () => {
-        form.submit();
-    };
-
-    //表单数据保存
-    const formSend = () => {
-        form.validateFields();
-        let dataNow = form.getFieldsValue();
-
-        dataNow = {
-            ...dataNow,
-            img:imgPc.id ? imgPc.id : '',
-            productMenuUuid: prop.id,
-        }
-
-        console.log('保存数据-----》', dataNow)
-        getProductBannerSave(dataNow).then((res: any) => {
-            if (res.code == 200) {
-                message.success(res.msg);
-                getDetail()
-                setIsModalOpen(false)
-                setImgPc({ id: undefined, url: '' });
-                form.resetFields();
-            } else {
-                message.error(res.msg);
-            }
-        });
-    }
-    //图片上传
-    const handleBeforeUpload = async (file: any) => {
-        const formData = new FormData();
-        formData.append('file', file, file.name);
-        const res = await upload(formData);
-        if (res?.data?.uuid) {
-            setImgPc({ id: res.data.uuid, url: res.data.url })
-        }
-        return false;
-    };
-
-    useEffect(() => {
-        getDetail()
-    }, [prop.id]);
-    
-    const getDetail = async () => {
-        try {
-            const res = await getProductBannerDetail(prop.id);
-            if(res.code == 200){
-                setListData(res.rows)
-            }
-            console.log(res)
-        } catch (error) {
-
-        }
-    }
-    const deleteCar = async (e: any) => {
-        console.log('删除：', e);
-        let res: any = await getDeleteBanner(e.uuid);
-        if (res.code == 200) {
-            getDetail();
-            message.success(res.msg);
-        } else {
-            message.error(res.msg)
-        }
-    };
-    //表格列设置
-    const columns: any = [
-        {
-            title: '图片地址',
-            dataIndex: 'imgUrl',
-            key: 'imgUrl',
-            align: 'center',
-            render: (text: any) => {
-                return <Image src={text} />;
-            }
-        },
-
-        {
-            title: intl.formatMessage({ id: 'public.action' }),
-            dataIndex: '',
-            align: 'center',
-            width: 100,
-            render: (text: any, record: any) => {
-                return <Space size="middle">
-                    <Popconfirm title={intl.formatMessage({ id: 'public.ifconfirmdelete' })} onConfirm={() => deleteCar(record)}>
-                        <Button danger type='text'>{intl.formatMessage({ id: 'public.delete' })}</Button>
-                    </Popconfirm>
-
-                </Space>
-            },
-        },
-    ];
-
-    const imgDele = () => {
-          setImgPc({ id: undefined, url: '' })
-      };
-    
-
-    return (
-        <div className='carRight'>
-            <div className='carTitle'>
-                {'轮播图'}
-                {/* <Popconfirm title={intl.formatMessage({id:'public.ifConfirmPublish'})} onConfirm={pushStatusPage}>
-                <Button className='btn' type="primary">{intl.formatMessage({id:'public.publishAll'})}</Button>
-          </Popconfirm> */}
-
-                <Button className='btn' type="primary" onClick={()=>setIsModalOpen(true)}>{intl.formatMessage({ id: 'public.uploadImg' })}</Button>
-            </div>
-            <Table
-                columns={columns}
-                dataSource={listData}
-                rowKey={(record: any) => record?.uuid}
-            />
-            <Modal title={'上传轮播图'} className='carModal' open={isModalOpen} onOk={handleOk} onCancel={()=>setIsModalOpen(false)} width={880}>
-                <Form
-                    form={form}
-                    labelCol={{ flex: '160px' }}
-                    labelAlign="left"
-                    labelWrap
-                    wrapperCol={{ flex: 1 }}
-                    colon={false}
-                    style={{ maxWidth: 880 }}
-                    onFinish={formSend}
-                >
-                    <Form.Item label={'banner'}  >
-                        {imgPc.id && <div className='showImg'><img src={imgPc.url} /></div>}
-                        <div className='uploadBtn'>
-                            <Upload
-                                beforeUpload={(e) => handleBeforeUpload(e)}
-                                maxCount={1}
-                                accept={'.png, .jpg, .gif'}
-                            >
-                                <Button>{intl.formatMessage({ id: 'public.upload' })}</Button>
-                            </Upload>
-                        </div>
-                        <div className='uploadBtn'><Button onClick={()=>{imgDele()}} >{intl.formatMessage({id:'public.delete'})}</Button></div>
-                    </Form.Item>
-                    <Form.Item label={'排序'} name="sort">
-                        <Input />
-                    </Form.Item>
-
-                </Form>
-            </Modal>
-        </div>
-    );
-};
-
-export default CarListTable;

src/pages/SocialRespon/socialRespon/edit.tsx

@@ -2,6 +2,7 @@ import React, { useEffect, useState, useRef } from 'react';
 import {
   ProForm,
   ProFormText,
+  ProFormTextArea,
   ProFormUploadButton,
   ProFormSelect,
   ProFormDatePicker,
@@ -209,7 +210,7 @@ const SocialResponForm: React.FC<SocialResponProps> = (props) => {
     let content = editor.getContents()
     // console.log('htmlStr----', htmlStr)
     editor.setContents(content)
-    data.date = moment(data.date).format('YYYY.MM.DD');
+    data.date = moment(data.date).format('YYYY-MM-DD');
     if(checkTop){
       data.top = 1;
     }else{
@@ -264,7 +265,7 @@ const SocialResponForm: React.FC<SocialResponProps> = (props) => {
   return (
     <Drawer
       width={'80%'}
-      title={props.currentRow ? '新闻编辑' : '新建新闻'}
+      title={props.currentRow ? '文章编辑' : '新建文章'}
       forceRender
       open={props.open}
       destroyOnClose
@@ -296,7 +297,7 @@ const SocialResponForm: React.FC<SocialResponProps> = (props) => {
             },
           ]}
         />
-        <ProFormText
+        <ProFormTextArea
           name="digest"
           label='摘要'
           labelCol={{
@@ -308,7 +309,7 @@ const SocialResponForm: React.FC<SocialResponProps> = (props) => {
           name="date"
           label='展示日期'
           fieldProps={{
-            format: (value) => value.format('YYYY.MM.DD'),
+            format: (value) => value.format('YYYY-MM-DD'),
           }}
           labelCol={{
             style: { width: 95 }
@@ -361,6 +362,7 @@ const SocialResponForm: React.FC<SocialResponProps> = (props) => {
             style: { width: 95 }
           }}
           placeholder={'中泽集团'}
+          initialValue={'中泽集团'}
         />
 
         <ProForm.Item 

src/pages/SocialRespon/socialRespon/index.tsx

@@ -6,7 +6,7 @@ import { Button, message, Modal, Image } from 'antd';
 import { ActionType, FooterToolbar, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
 import { PlusOutlined, DeleteOutlined, ExclamationCircleOutlined, RedoOutlined } from '@ant-design/icons';
 // import { getNoticeList, removeNotice, addNotice, updateNotice, exportNotice } from '@/services/system/notice';
-import { getSocialResponList, saveSocialRespon, deleteSocialRespon, pushSocialResponDetail } from '@/services/socialRespon/socialRespon';
+import { getSocialResponList, saveSocialRespon, deleteSocialRespon, pushSocialResponDetail,push } from '@/services/socialRespon/socialRespon';
 import SocialResponForm from './edit';
 import { getDictValueEnum } from '@/services/system/dict';
 import moment from 'moment';
@@ -195,7 +195,19 @@ const NoticeTableList: React.FC = () => {
             ],
         },
     ];
-
+/**
+     * 一键发布
+     */
+const publishing = async () => {
+    try {
+        const resp = await push();
+        if (resp.code === 200) {
+            message.success('发布成功');
+        } else {
+            message.error(resp.msg);
+        }
+    } catch (error) { }
+}
     return (
         <KeepAlive name={'党建工作'} path="/SocialRespon/partyWork">
             <PageContainer>
@@ -218,7 +230,14 @@ const NoticeTableList: React.FC = () => {
                                 }}
                             >
                                 <PlusOutlined /> <FormattedMessage id="public.add" defaultMessage="新建" />
-                            </Button>
+                            </Button>,
+                            <Button
+                            type="primary"
+                            key="fabu"
+                            onClick={publishing}
+                            >
+                                一键发布
+                            </Button>,
                         ]}
                         request={(params) => {
                             return getSocialResponList({ ...params } as API.System.NoticeListParams).then((res) => {

src/services/contactUs/contactUs.ts

@@ -1,68 +0,0 @@
-import { request } from '@umijs/max';
-// <联系我们-=-线索信息>----新增或修改一个线索;
-// params: ModifyClueListType;
-// return: ModifyClueListResponse;
-export interface ModifyClueListType {
-    shop?: string; //预约门店;
-    city?: string; //城市;
-    province?: string; //预约省;
-    product?: string;//预约意向车型
-    date?: string; //咨询日期;
-    leaword?: string; //留言;
-    leawordType?: string;//留言类型
-    email?: string; //邮箱;
-    phone?: string; //电话;
-    name?: string; //用户姓名;
-    type?: number; //咨询类型;
-    uuid?: string; //线索id;
-  }
-  export interface ModifyClueListResponse {
-    msg: string;
-    code: number;
-  }
-  export function modifyClueList(params: ModifyClueListType) {
-    return request<ModifyClueListResponse>(`/api/system/clue/list`, {
-      method: 'POST',
-      data: params,
-    });
-  }
-  
-  // <联系我们-=-线索信息>----删除一个线索;
-  // params: DeleteClueRemoveType;
-  // return: DeleteClueRemoveResponse;
-  export interface DeleteClueRemoveType {
-    clueUuid: string; //经销商id;
-  }
-  export interface DeleteClueRemoveResponse extends Partial<ModifyClueListType> {
-    [porperty: string]: any;
-  }
-  export function deleteClueRemove(params: DeleteClueRemoveType) {
-    return request<DeleteClueRemoveResponse>(`/api/system/clue/remove`, {
-      method: 'DELETE',
-      params: params,
-    });
-  }
-  
-  // <联系我们-=-线索信息>----查询多个线索;
-  export interface GetClueListType extends Partial<ModifyClueListType> {
-    endTime?: string; //结束时间;
-    startTime?: string; //开始时间;
-    type?: number; //留资类型;
-    pageNum?: number; //分页-当前处于第几页。
-    pageSize?: number; //分页-一页最多多少条数据。
-  }
-  export interface GetClueListItem extends Partial<ModifyClueListType> {
-    [porperty: string]: any;
-  }
-  export interface GetClueListResponse {
-    total: number;
-    rows: GetClueListItem[];
-    code: number;
-    msg: string;
-  }
-  export function getClueListList(params: GetClueListType) {
-    return request<GetDealerListResponse>(`/api/system/clue/list`, {
-      method: 'GET',
-      params: params,
-    });
-  }

src/services/home/banner.ts

@@ -40,3 +40,13 @@ export async function deleteBanner(bannerUuid:any) {
   });
 }
 
+//发布
+export async function push(params: any) {
+  return request('/api/staticize/static/index', {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8',
+    },
+    params,
+  });
+}

src/services/mapDot/mapDot.ts

@@ -1,57 +0,0 @@
-import { request } from '@umijs/max'; 
-
-// 查询
-export async function getMapDotList(params: any) {
-    return request('/api/system/mapDot/list', {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json;charset=UTF-8',
-      },
-      params,
-    });
-  }
-
-// 保存
-export async function saveMapDot(data: any) {
-  return request('/api/system/mapDot/save', {
-    method: 'post',
-    data: data, 
-  });
-}
-
-// 上传图片
-export async function upload(data: any) {
-  return request('/api/file/upload', {
-    method: 'post',
-    data: data,
-  });
-}
-
-//删除
-export async function deleteMapDot(mapDotUuid:any) {
-  return request(`/api/system/mapDot/remove`, {
-    method: 'DELETE',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-    params:{
-      mapDotUuid:mapDotUuid
-    },
-  });
-}
-
-// 上传图片
-export async function importData(data: any) {
-  return request('/api/system/mapDot/importData', {
-    method: 'post',
-    data: data,
-  });
-}
-
-// 地区
-export async function getArea(data: any) {
-  return request('/api/system/area/list', {
-    method: 'post',
-    data: data, 
-  });
-}

src/services/news/news.ts

@@ -53,10 +53,21 @@ export async function deleteNews(newsUuid:any) {
 
 //发布新闻
 export async function pushNewsDetail(params: any) {
-  return request('/api/system/static/newsDetail?newsUuid='+params.newsUuid, {
+  return request('/api/system/static/articleDetail/news/'+params.newsUuid, {
     method: 'GET',
     headers: {
       'Content-Type': 'application/json;charset=UTF-8',
     },
   });
 }
+
+//发布
+export async function push(params: any) {
+  return request('/api/staticize/static/news', {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8',
+    },
+    params,
+  });
+}

src/services/partyWork/partyWork.ts

@@ -51,12 +51,34 @@ export async function deletePartyWork(partyWorkUuid:any) {
   });
 }
 
-//发布新闻
+//发布
 export async function pushPartyWorkDetail(params: any) {
-  return request('/api/system/static/partyWorkDetail?partyWorkUuid='+params.partyWorkUuid, {
+  return request('/api/system/static/articleDetail/partyWork/'+params.partyWorkUuid, {
     method: 'GET',
     headers: {
       'Content-Type': 'application/json;charset=UTF-8',
     },
   });
 }
+
+//发布
+export async function push1(params: any) {
+  return request('/api/staticize/static/partyBuilding', {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8',
+    },
+    params,
+  });
+}
+
+//发布
+export async function push2(params: any) {
+  return request('/api/staticize/static/enterprisePartyBuilding', {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8',
+    },
+    params,
+  });
+}

src/services/product/index.ts

@@ -1,246 +0,0 @@
-import { request } from '@umijs/max'; 
-
-//删除产品banner
-export async function getDeleteDetailPerform(param:any) {
-  return request('/api/system/product/detailPerform/remove?bannerId='+param, {
-    method: 'DELETE',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-  });
-}
-
-//新增编辑产品banner
-export async function getDetailPerformSave(param:any) {
-  return request('/api/system/product/detailPerform/save', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-    data:param
-  });
-}
-
-//获取产品banner
-export async function getDetailPerformDetail(param) {
-  return request('/api/system/product/detailPerform/list?menuId='+param, {
-    method: 'GET',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-  });
-}
-
-//删除产品banner
-export async function getDeleteBanner(param:any) {
-  return request('/api/system/product/detailBanner/remove?bannerId='+param, {
-    method: 'DELETE',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-  });
-}
-
-//新增编辑产品banner
-export async function getProductBannerSave(param:any) {
-  return request('/api/system/product/detailBanner/save', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-    data:param
-  });
-}
-
-//获取产品banner
-export async function getProductBannerDetail(param) {
-  return request('/api/system/product/detailBanner/list?menuId='+param, {
-    method: 'GET',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-  });
-}
-
-//获取产品概览详情
-export async function getProductDetail(param) {
-  return request('/api/system/product/detail/list?menuId='+param, {
-    method: 'GET',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-  });
-}
-//新增编辑产品数列表
-export async function editProductDetail(param:any) {
-  return request('/api/system/product/detail/save', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-    data:param
-  });
-}
-
-//获取产品树列表
-export async function getProductTree() {
-    return request('/api/system/product/menu/list', {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json;charset=UTF-8',
-      },
-    });
-}
-//新增编辑产品数列表
-export async function editProductTree(param:any) {
-  return request('/api/system/product/menu/save', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-    data:param
-  });
-}
-//删除产品数列表
-export async function getDeleteTree(param:any) {
-  return request('/api/system/product/menu/remove?menuId='+param, {
-    method: 'DELETE',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-  });
-}
-
-//获取车系列表
-export async function getCarList(param:any) {
-  return request('/api/system/product/menu/childList?menuId='+param, {
-    method: 'GET',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    }
-  });
-}
-
-//获取车型详情列表
-export async function getCarDetialList(param:any) {
-  return request('/api/system/product/carDetail/list?menuId='+param, {
-    method: 'GET',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    }
-  });
-}
-//新增编辑车型详情数据
-export async function editCarDetail(param:any) {
-  return request('/api/system/product/carDetail/save', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-    data:param
-  });
-}
-//删除车型详情数据
-export async function carDetailDelete(param:any) {
-  return request('/api/system/product/carDetail/remove?carDetailId='+param, {
-    method: 'DELETE',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-  });
-}
-
-//获取品牌详情列表
-export async function getCarBrandDetialList(param:any) {
-  return request('/api/system/product/brandDetail/list?menuId='+param, {
-    method: 'GET',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    }
-  });
-}
-//新增编辑品牌详情数据
-export async function editCarBrandDetail(param:any) {
-  return request('/api/system/product/brandDetail/save', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-    data:param
-  });
-}
-//删除品牌详情数据
-export async function carBrandDetailDelete(param:any) {
-  return request('/api/system/product/brandDetail/remove?productDetailId='+param, {
-    method: 'DELETE',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-  });
-}
-
-//获取品牌详情列表
-export async function getTestimonyList(param:any) {
-  return request('/api/system/product/testimony/list?menuId='+param, {
-    method: 'GET',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    }
-  });
-}
-//新增编辑品牌详情数据
-export async function editTestimony(param:any) {
-  return request('/api/system/product/testimony/save', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-    data:param
-  });
-}
-//删除品牌详情数据
-export async function TestimonyDelete(param:any) {
-  return request('/api/system/product/testimony/remove?brandTestimonyId='+param, {
-    method: 'DELETE',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-  });
-}
-
-//发布品牌详情
-export async function pushProductsBrand(params: any) {
-  return request('/api/staticize/productsBrand?menuUuid='+params, {
-    method: 'GET',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-  });
-}
-//发布车型列表
-export async function pushProducts(params: any) {
-  return request('/api/staticize/noSelect/products', {
-    method: 'GET',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-  });
-}
-//发布车型详情
-export async function pushProductsDetail(params: any) {
-  return request('/api/staticize/productsDetail?menuUuid='+params, {
-    method: 'GET',
-    headers: {
-      'Content-Type': 'application/json;charset=UTF-8',
-    },
-  });
-}
-
-//上传exl文件
-// 上传图片
-export async function uploadExl(data: any) {
-  return request('/api/system/product/importData', {
-    method: 'post',
-    data: data,
-  });
-}

src/services/socialRespon/socialRespon.ts

@@ -51,12 +51,23 @@ export async function deleteSocialRespon(socialResponUuid:any) {
   });
 }
 
-//发布新闻
+//发布
 export async function pushSocialResponDetail(params: any) {
-  return request('/api/system/static/socialResponDetail?socialResponUuid='+params.socialResponUuid, {
+  return request('/api/system/static/articleDetail/socialRespon/'+params.socialResponUuid, {
     method: 'GET',
     headers: {
       'Content-Type': 'application/json;charset=UTF-8',
     },
   });
 }
+
+//发布
+export async function push(params: any) {
+  return request('/api/staticize/static/socialRespon', {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8',
+    },
+    params,
+  });
+}