From b76f6322c8d378b8fc76ae373de888aa9610b526 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Mon, 27 May 2024 21:25:36 +0800 Subject: [PATCH] eslint --- src/components/ai/text/AiHelperText.tsx | 3 +- src/components/card/CardProj.tsx | 67 +------------------ src/components/list/ListProjAgent.tsx | 2 +- src/route/CopyrightGgoods/CopyrightGgoods.tsx | 2 - src/route/ProductRelease/ProductRelease.tsx | 2 - src/route/SearchList/SearchList.tsx | 1 - src/route/TradingGoods/TradingGoods.tsx | 2 - .../TransactionOrder/TransactionOrder.tsx | 2 - src/route/proj/edit/ProjEditStep2.tsx | 4 +- src/route/proj/edit/ProjEditStep2Show.tsx | 4 +- src/util/AjaxUtils.ts | 15 +++-- 11 files changed, 18 insertions(+), 86 deletions(-) diff --git a/src/components/ai/text/AiHelperText.tsx b/src/components/ai/text/AiHelperText.tsx index 0f7f1e0..d63eb25 100644 --- a/src/components/ai/text/AiHelperText.tsx +++ b/src/components/ai/text/AiHelperText.tsx @@ -5,7 +5,6 @@ import {CheckOutlined, EditOutlined, ReloadOutlined} from "@ant-design/icons"; import { get } from "../../../util/AjaxUtils.ts"; import { useParams } from "react-router-dom"; import { - message } from "antd"; type PropsType = { @@ -33,7 +32,7 @@ export default function AiHelperText(props: PropsType) { }, []) - const [messageApi, contextHolder] = message.useMessage(); + const [messageApi] = message.useMessage(); const [text, setText] = useState(''); const [newText, setNewText] = useState(''); diff --git a/src/components/card/CardProj.tsx b/src/components/card/CardProj.tsx index 2bac3c5..7ef4ace 100644 --- a/src/components/card/CardProj.tsx +++ b/src/components/card/CardProj.tsx @@ -3,19 +3,17 @@ import './card-proj.css'; import { CheckOutlined, ClockCircleOutlined, - CloseCircleOutlined, - CreditCardOutlined, DeleteOutlined, + CloseCircleOutlined, DeleteOutlined, DownloadOutlined, DownOutlined, EditOutlined, EyeOutlined, LoadingOutlined, SearchOutlined, - SettingOutlined, WarningOutlined, FolderOutlined } from '@ant-design/icons'; -import { Button, ConfigProvider, Dropdown, Tag } from 'antd'; -import { GenerateStatus, IProj, PayStatus, ProjChargeType } from "../../interfaces/proj/IProj.ts"; +import { Button, Dropdown, Tag } from 'antd'; +import { GenerateStatus, IProj, ProjChargeType } from "../../interfaces/proj/IProj.ts"; import { useNavigate } from "react-router-dom"; import { Axios, put } from "../../util/AjaxUtils.ts"; import { useContext, useEffect, useState } from "react"; @@ -24,7 +22,6 @@ import useMessage from "antd/es/message/useMessage"; import setImg from '../../static/right/set.png' import orderImg from '../../static/right/order.png' import menuImg from '../../static/right/menu.png' -import testImg from '../../static/test.jpg' export default function CardProj(props: { item: IProj }) { const nav = useNavigate(); // const [showZpi,setShowZpi] = useState(false) @@ -60,64 +57,6 @@ export default function CardProj(props: { item: IProj }) { return 错误 } - const renderOption = () => { - if (data.pay.payStatus == PayStatus.UNPAID) { - return ( - <> -
- -
- - ) - } - return ( - <> -
- - - -
- { - data.generate.generateStatus == GenerateStatus.SUCCESS ? ( -
- - - - -
- ) : <> - } - - ) - } - const goEdit = () => { if (charge == ProjChargeType.ALL) { nav(`/proj-eall/${data.projId}`); diff --git a/src/components/list/ListProjAgent.tsx b/src/components/list/ListProjAgent.tsx index 4037382..ec55b2b 100644 --- a/src/components/list/ListProjAgent.tsx +++ b/src/components/list/ListProjAgent.tsx @@ -26,7 +26,7 @@ export default function ListProjAgent() { const [agents, setAgents] = useState([]); const [isLoading, setIsLoading] = useState(false); // eslint-disable-next-line @typescript-eslint/no-unused-vars - const [keywords, setKeywords] = useState(''); + const [keywords] = useState(''); const domHeight = window.innerHeight - 280; useEffect(() => { diff --git a/src/route/CopyrightGgoods/CopyrightGgoods.tsx b/src/route/CopyrightGgoods/CopyrightGgoods.tsx index f049c2d..d768312 100644 --- a/src/route/CopyrightGgoods/CopyrightGgoods.tsx +++ b/src/route/CopyrightGgoods/CopyrightGgoods.tsx @@ -1,5 +1,3 @@ -import React from 'react' - export default function CopyrightGgoods() { return (
diff --git a/src/route/ProductRelease/ProductRelease.tsx b/src/route/ProductRelease/ProductRelease.tsx index 7754443..1debd05 100644 --- a/src/route/ProductRelease/ProductRelease.tsx +++ b/src/route/ProductRelease/ProductRelease.tsx @@ -1,5 +1,3 @@ -import React from 'react' - export default function ProductRelease() { return (
diff --git a/src/route/SearchList/SearchList.tsx b/src/route/SearchList/SearchList.tsx index 1d44ddd..b760db3 100644 --- a/src/route/SearchList/SearchList.tsx +++ b/src/route/SearchList/SearchList.tsx @@ -1,4 +1,3 @@ -import React from 'react' import { useLocation } from 'react-router-dom'; import './searchList.css' import { Pagination, Spin, Image, message } from 'antd'; diff --git a/src/route/TradingGoods/TradingGoods.tsx b/src/route/TradingGoods/TradingGoods.tsx index d7e35ce..2a6be7c 100644 --- a/src/route/TradingGoods/TradingGoods.tsx +++ b/src/route/TradingGoods/TradingGoods.tsx @@ -1,5 +1,3 @@ -import React from 'react' - export default function TradingGoods() { return (
交易商品页面
diff --git a/src/route/TransactionOrder/TransactionOrder.tsx b/src/route/TransactionOrder/TransactionOrder.tsx index 3197170..0420e57 100644 --- a/src/route/TransactionOrder/TransactionOrder.tsx +++ b/src/route/TransactionOrder/TransactionOrder.tsx @@ -1,5 +1,3 @@ -import React from 'react' - export default function TransactionOrder() { return (
交易订单页面
diff --git a/src/route/proj/edit/ProjEditStep2.tsx b/src/route/proj/edit/ProjEditStep2.tsx index 0028a81..01d84e8 100644 --- a/src/route/proj/edit/ProjEditStep2.tsx +++ b/src/route/proj/edit/ProjEditStep2.tsx @@ -681,14 +681,14 @@ export default function ProjEditStep2() { ( + render={(_text, record: any) => ( record.type === 'PERSONAL' ? '自然人' : '企业/组织' )} /> ( + render={(_text, record: any) => ( record.idCardType === 'ID_CARD' ? '身份证' : '营业执照' )} /> diff --git a/src/route/proj/edit/ProjEditStep2Show.tsx b/src/route/proj/edit/ProjEditStep2Show.tsx index 59a1d77..f618087 100644 --- a/src/route/proj/edit/ProjEditStep2Show.tsx +++ b/src/route/proj/edit/ProjEditStep2Show.tsx @@ -678,14 +678,14 @@ export default function ProjEditStep2() { ( + render={(_text, record: any) => ( record.type === 'PERSONAL' ? '自然人' : '企业/组织' )} /> ( + render={(_text, record: any) => ( record.idCardType === 'ID_CARD' ? '身份证' : '营业执照' )} /> diff --git a/src/util/AjaxUtils.ts b/src/util/AjaxUtils.ts index 09c958f..bcbbfc7 100644 --- a/src/util/AjaxUtils.ts +++ b/src/util/AjaxUtils.ts @@ -4,13 +4,14 @@ import type {MessageInstance} from "antd/es/message/interface"; export const Axios = axios; // axios.defaults.baseURL = 'http://192.168.0.163:7025/copyright'; -axios.defaults.baseURL = 'http://192.168.0.15:7025/copyright'; -// axios.defaults.baseURL = '/copyright'; -export const WebSocketBaseUrl: string = 'ws://192.168.0.15:7025/copyright'; -// export const WebSocketBaseUrl: string = '/copyright'; -export const DevUserId: string = '80d3365e-0597-4988-979e-18ef1c3ec671'; // 18634604067 +// axios.defaults.baseURL = 'http://192.168.0.15:7025/copyright'; +// axios.defaults.baseURL = 'https://www.aimzhu.com/copyright'; +axios.defaults.baseURL = '/copyright'; +// export const WebSocketBaseUrl: string = 'wss://www.aimzhu.com/copyright'; +export const WebSocketBaseUrl: string = '/copyright'; +// export const DevUserId: string = '80d3365e-0597-4988-979e-18ef1c3ec671'; // 18634604067 // export const DevUserId: string = 'c2438eb8-2685-49a9-bf02-5111a5192d96'; // 18647109157 -// export const DevUserId: string = ''; +export const DevUserId: string = ''; type Req = { messageApi: MessageInstance; @@ -44,10 +45,12 @@ export function websocketUrl() { } const location = window.location; const protocol = location.protocol; + console.log(protocol); let wsProtocol = 'ws'; if (protocol == 'https') { wsProtocol = 'wss'; } + console.log(wsProtocol); return `${wsProtocol}://${location.host}${WebSocketBaseUrl}`; }