diff --git a/src/components/card/CardProj.tsx b/src/components/card/CardProj.tsx index 8c25865..446171d 100644 --- a/src/components/card/CardProj.tsx +++ b/src/components/card/CardProj.tsx @@ -1,4 +1,4 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ + import './card-proj.css'; // import { useDispatch } from 'react-redux' import { GlobalDispatchContext, reloadUser } from "../../context/GlobalContext.ts"; diff --git a/src/components/invoice/order/InvoiceOrderSelectedList.tsx b/src/components/invoice/order/InvoiceOrderSelectedList.tsx index 21735d9..e5dc645 100644 --- a/src/components/invoice/order/InvoiceOrderSelectedList.tsx +++ b/src/components/invoice/order/InvoiceOrderSelectedList.tsx @@ -4,8 +4,8 @@ import { } from "antd"; import useMessage from "antd/es/message/useMessage"; import { useEffect, useState } from "react"; -import { get } from "../../../util/AjaxUtils.ts"; -import { IListPage } from "../../../interfaces/listpage/IListPage.ts"; +// import { get } from "../../../util/AjaxUtils.ts"; +// import { IListPage } from "../../../interfaces/listpage/IListPage.ts"; import { getInvoiceRechargeList } from "../../../request/api.ts" diff --git a/src/components/list/ListProjAgent.tsx b/src/components/list/ListProjAgent.tsx index 355b3e8..fd35251 100644 --- a/src/components/list/ListProjAgent.tsx +++ b/src/components/list/ListProjAgent.tsx @@ -25,7 +25,6 @@ export default function ListProjAgent() { const [total, setTotal] = useState(0); const [agents, setAgents] = useState([]); const [isLoading, setIsLoading] = useState(false); - // eslint-disable-next-line @typescript-eslint/no-unused-vars const [keywords] = useState(''); const domHeight = window.innerHeight - 280; diff --git a/src/components/menu/menu-with-bottom-button.css b/src/components/menu/menu-with-bottom-button.css index c0b176a..03784ab 100644 --- a/src/components/menu/menu-with-bottom-button.css +++ b/src/components/menu/menu-with-bottom-button.css @@ -2,168 +2,234 @@ /* padding: 15px; */ } -.bot { - width: 230px; - height: 56px; - font-size: 18px; - /* color: #FFAF22; */ - background: #FFFBEF; +@media (min-width: 1551px) { + .bot { + width: 230px; + height: 56px; + font-size: 18px; + /* color: #FFAF22; */ + background: #FFFBEF; - color: #FFAF22; - display: flex; - align-items: center; - border-top: 1px solid #fde9ab; - border-bottom: 1px solid #fde9ab; -} + color: #FFAF22; + display: flex; + align-items: center; + border-top: 1px solid #fde9ab; + border-bottom: 1px solid #fde9ab; + } -.bot-lift { - display: flex; - align-items: center; - font-size: 18px; -} + .bot-lift { + width: 100%; + display: flex; + align-items: center; + /* justify-content: center; */ + font-size: 18px; + /* background-color: skyblue; */ + /* padding-left: 40px; */ + box-sizing: border-box; + } -.bot-lift img { - width: 15px; - height: 15px; - margin-left: 39px; - margin-right: 9px; -} + .bot-lift img { + width: 15px; + height: 15px; + margin-left: 50px; + margin-right: 9px; + } -.bot-lift .sell-buy { - width: 19px; - height: 19px; - border-radius: 50%; - border: 2px solid #FFAF22; - font-size: 12px; - text-align: center; - line-height: 19px; - font-weight: 700; - margin-left: 23px; - margin-right: 6px; -} + .bot-lift .sell-buy { + width: 19px; + height: 19px; + border-radius: 50%; + border: 2px solid #FFAF22; + font-size: 12px; + text-align: center; + line-height: 19px; + font-weight: 700; + margin-left: 23px; + margin-right: 6px; + } + + .bot-right { + display: flex; + align-items: center; + font-size: 14px; + cursor: pointer; + width: 53px; + /* background-color: red; */ + margin-left: 96px; + + } + + .bot-right img { + /* margin-left: 96px; */ + margin-right: 10px; + width: 14px; + height: 13px; + } + + .menu-with-bot-button ul { + padding-top: 12px; + padding-bottom: 12px; + width: 230px; + } + + .menu-with-bot-button ul li { + /* height: 50px; + margin-left: 66px; + font-weight: 400; + font-size: 16px; + color: #313131; + line-height: 50px; + cursor: pointer; */ + height: 50px; + margin-left: 35px; + font-weight: 400; + font-size: 16px; + color: #313131; + line-height: 50px; + cursor: pointer; + /* background-color: red; */ + text-indent: 32px; + /* background-color: pink; */ + position: relative; + } + + .botIcon { + position: absolute; + color: white; + width: 50px; + right: 30px; + top: 0; + /* background-color: red; */ + + } + + .menu-with-bot-button ul li.active { + /* text-decoration-line: underline; */ + width: 213px; + height: 50px; + background: #FF9F08; + border-radius: 25px; + color: white; + text-indent: 59px; + + } -.bot-right { - display: flex; - align-items: center; - font-size: 14px; - cursor: pointer; - width: 53px; - /* background-color: red; */ - margin-left: 96px; } -.bot-right img { - /* margin-left: 96px; */ - margin-right: 10px; - width: 14px; - height: 13px; -} +@media (max-width: 1550px) { + .bot { + width: 230px; + width: 191px; + height: 56px; + font-size: 18px; + /* color: #FFAF22; */ + background: #FFFBEF; -.menu-with-bot-button ul { - padding-top: 12px; - padding-bottom: 12px; - width: 230px; -} + color: #FFAF22; + display: flex; + align-items: center; + border-top: 1px solid #fde9ab; + border-bottom: 1px solid #fde9ab; + } -.menu-with-bot-button ul li { - /* height: 50px; - margin-left: 66px; - font-weight: 400; - font-size: 16px; - color: #313131; - line-height: 50px; - cursor: pointer; */ - height: 50px; - margin-left: 35px; - font-weight: 400; - font-size: 16px; - color: #313131; - line-height: 50px; - cursor: pointer; - /* background-color: red; */ - text-indent: 32px; - /* background-color: pink; */ - position: relative; -} -.botIcon{ - position: absolute; - color: white; - width: 50px; - right: 30px; - top: 0; - /* background-color: red; */ -} + .bot-lift { + display: flex; + align-items: center; + font-size: 18px; -.menu-with-bot-button ul li.active { - /* text-decoration-line: underline; */ - width: 213px; - height: 50px; - background: #FF9F08; - border-radius: 25px; - color: white; - text-indent: 59px; + } -} + .bot-lift img { + width: 15px; + height: 15px; + margin-left: 39px; + margin-right: 9px; + } -/* .icon{ - color: white; - margin-left: 101px; -} */ + .bot-lift .sell-buy { + width: 19px; + height: 19px; + border-radius: 50%; + border: 2px solid #FFAF22; + font-size: 12px; + text-align: center; + line-height: 19px; + font-weight: 700; + margin-left: 23px; + margin-right: 6px; + } + + .bot-right { + display: flex; + align-items: center; + font-size: 14px; + cursor: pointer; + width: 53px; + /* background-color: red; */ + margin-left: 96px; + + } + + .bot-right img { + /* margin-left: 96px; */ + margin-right: 10px; + width: 14px; + height: 13px; + } + + .menu-with-bot-button ul { + padding-top: 12px; + padding-bottom: 12px; + width: 230px; + + } + + .menu-with-bot-button ul li { + /* height: 50px; + margin-left: 66px; + font-weight: 400; + font-size: 16px; + color: #313131; + line-height: 50px; + cursor: pointer; */ + height: 50px; + margin-left: 35px; + font-weight: 400; + font-size: 16px; + color: #313131; + line-height: 50px; + cursor: pointer; + /* background-color: red; */ + text-indent: 32px; + /* 修改 */ + text-indent: 22px; + /* background-color: pink; */ + position: relative; + } + + .botIcon { + position: absolute; + color: white; + width: 50px; + right: 30px; + top: 0; + /* background-color: red; */ + display: none; + } + + .menu-with-bot-button ul li.active { + /* text-decoration-line: underline; */ + width: 213px; + /* 修改 */ + width: 171px; + height: 50px; + background: #FF9F08; + border-radius: 25px; + color: white; + text-indent: 59px; + text-indent: 50px; - - - - - - - - - - - - -/* -.menu-with-top-button .top-button { - width: 268px; - height: 56px; - background: #FFFBEF; - font-size: 18px; - color: #FFAF22; -} */ - -/* .menu-with-top-button ul { - padding: 10px; -} */ - -/* .menu-with-top-button ul li { - display: flex; - align-items: center; - justify-content: center; - padding: 5px; - cursor: pointer; -} */ - -/* .menu-with-top-button ul li.active { - text-decoration-line: underline; - text-underline-offset: 5px; -} */ - -/* .menu-with-top-button ul li:hover { - text-decoration-line: underline; - text-underline-offset: 5px; -} */ - -/* .menu-with-top-button ul li:last-child { - margin-bottom: 0; -} - -.menu-with-top-button ul li .menu-icon { - width: 30px; - height: 30px; -} - -.menu-with-top-button ul li .menu-name { - padding-left: 5px; -} */ \ No newline at end of file + } +} \ No newline at end of file diff --git a/src/route/ProductRelease/ProductRelease.tsx b/src/route/ProductRelease/ProductRelease.tsx index 08850f9..e7e8d2e 100644 --- a/src/route/ProductRelease/ProductRelease.tsx +++ b/src/route/ProductRelease/ProductRelease.tsx @@ -8,7 +8,9 @@ import { } from 'antd'; import EditModal from './components/EditModal/EditModal' // import type { CheckboxProps } from 'antd'; -import { SearchOutlined, ClearOutlined } from '@ant-design/icons'; +import { + // SearchOutlined, + ClearOutlined } from '@ant-design/icons'; import type { DatePickerProps } from 'antd'; import locale from 'antd/es/date-picker/locale/zh_CN'; import React, { useState, useEffect } from 'react'; @@ -55,16 +57,16 @@ export default function ProductRelease() { setType(undefined) } // 点击搜索 - const searchKeyWords = () => { - setPage(1) - console.log( - // dayjs(date).format(dateFormat) - belongType, language, date, type - ); - if (date) { - console.log(dayjs(date).format(dateFormat)); - } - } + // const searchKeyWords = () => { + // setPage(1) + // console.log( + // // dayjs(date).format(dateFormat) + // belongType, language, date, type + // ); + // if (date) { + // console.log(dayjs(date).format(dateFormat)); + // } + // } // 点击清除 const clearKeyWords = () => { @@ -219,7 +221,7 @@ export default function ProductRelease() { ]} value={type} /> - + */}