diff --git a/src/assets/images/newMain/rightBack.png b/src/assets/images/newMain/rightBack.png new file mode 100644 index 0000000000000000000000000000000000000000..9ecfafeb43630cff13c5cd123321ef8e3e0d1002 Binary files /dev/null and b/src/assets/images/newMain/rightBack.png differ diff --git a/src/components/ModeSwitch/index.css b/src/components/ModeSwitch/index.css index fb3316e23d142ec9b37b3e93df5b3a7fbe3f5a4e..8c1984fbcdcd76df3b6ddcbf8b62ec30c9a71987 100644 --- a/src/components/ModeSwitch/index.css +++ b/src/components/ModeSwitch/index.css @@ -1,7 +1,7 @@ .container { width: 257px; - height: 40px; - border-radius: 25px; + border-radius: 29px; + height: 58px; background: #123D66; position: relative; cursor: pointer; @@ -10,8 +10,8 @@ .container .slider { position: absolute; width: 131px; - height: 40px; - border-radius: 25px; + border-radius: 29px; + height: 58px; background: linear-gradient(180deg, #1cc0ff, #5294ff 100%); transition: transform 0.3s ease; transform: translateX(0); @@ -32,7 +32,7 @@ width: 80px; font-size: 20px; font-family: '钉钉进步体'; - font-weight: 400; + font-weight: 700; line-height: 24px; text-align: center; transition: color 0.3s ease; diff --git a/src/components/ModeSwitch/index.less b/src/components/ModeSwitch/index.less index 3c8c8e168961cdff23dcc9d04f0ce2c0fd010104..ecbea9f9d942ed137e67c552c18e75e6c1dfaff2 100644 --- a/src/components/ModeSwitch/index.less +++ b/src/components/ModeSwitch/index.less @@ -1,7 +1,9 @@ .container { width: 257px; - height: 40px; - border-radius: 25px; + border-radius: 29px; + height: 58px; + // height: 40px; + // border-radius: 25px; background: #123D66; position: relative; cursor: pointer; @@ -10,8 +12,10 @@ .slider { position: absolute; width: 131px; - height: 40px; - border-radius: 25px; + border-radius: 29px; + height: 58px; + // height: 40px; + // border-radius: 25px; background: linear-gradient(180deg, rgb(28, 192, 255), rgb(82, 148, 255) 100%); transition: transform 0.3s ease; transform: translateX(0); @@ -34,7 +38,7 @@ width: 80px; font-size: 20px; font-family: '钉钉进步体'; - font-weight: 400; + font-weight: 700; line-height: 24px; text-align: center; transition: color 0.3s ease; diff --git a/src/components/ModeSwitch/index.tsx b/src/components/ModeSwitch/index.tsx index 0feb5f43042ee35d53bd3793e5ed0417f3f385a5..5a30f7563368d1e189f577ed4a8c9bb864112b94 100644 --- a/src/components/ModeSwitch/index.tsx +++ b/src/components/ModeSwitch/index.tsx @@ -10,10 +10,10 @@ interface ModeSwitchProps { const ModeSwitch: React.FC = ({ checked, onChange }) => { return (
onChange(!checked)}> -
+
- 专题模式 - 统览模式 + 统览模式 + 专题模式
); diff --git a/src/layouts/Header/index.css b/src/layouts/Header/index.css index d1098d7e9da4d784e407c8b1a349c366b3a86d0a..bfa9c9341f0d7eb20fb408d9a576ca5bcd6cea5a 100644 --- a/src/layouts/Header/index.css +++ b/src/layouts/Header/index.css @@ -66,14 +66,3 @@ .container .rightCard:active { transform: scale(0.95); } -.container .modeSwitch { - min-width: 100px; - height: 32px; -} -.container .modeSwitch .ant-switch-inner { - font-size: 20px; - font-weight: 700; -} -.container .modeSwitch.ant-switch-checked { - background: #1890ff; -} diff --git a/src/layouts/Header/index.less b/src/layouts/Header/index.less index 0066b0da12d5e2adb19a2c0b4912c8e3a49d2d16..a5ced47947e3db6364ffb1555b2ce91816476633 100644 --- a/src/layouts/Header/index.less +++ b/src/layouts/Header/index.less @@ -85,19 +85,4 @@ } } - .modeSwitch { - min-width: 100px; - height: 32px; - - // :global { - .ant-switch-inner { - font-size: 20px; - font-weight: 700; - } - - &.ant-switch-checked { - background: #1890ff; - } - // } - } } diff --git a/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/Card/index.tsx b/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/Card/index.tsx index 3688c0660692441ac55b12ec0c3173be7e7aca3f..5856d96d9d67b67816be076e16c776b73e02d03d 100644 --- a/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/Card/index.tsx +++ b/src/pages/NewHome/NewRightContent/IndustryOperationNew/components/Card/index.tsx @@ -1,4 +1,5 @@ -import { RightOutlined } from '@ant-design/icons'; +// import { RightOutlined } from '@ant-design/icons'; +import rightBack from '@/assets/images/newMain/rightBack.png'; import { ConfigProvider, Flex, Popover } from 'antd'; import classNames from 'classnames'; import React, { PropsWithChildren } from 'react'; @@ -53,7 +54,8 @@ const Card: React.FC> = (props) => { [styles.bindClick]: !Boolean(jumpSystem?.length), })} > - + + {/* */}
diff --git a/src/pages/NewHome/NewRightContent/ResourceElements/components/Card/index.css b/src/pages/NewHome/NewRightContent/ResourceElements/components/Card/index.css index 02778ca8c0dd4ced41e511c99f5a1ecbc6a3cbf3..c59e8b08d7c917fb9b49fba677de52ff540e0665 100644 --- a/src/pages/NewHome/NewRightContent/ResourceElements/components/Card/index.css +++ b/src/pages/NewHome/NewRightContent/ResourceElements/components/Card/index.css @@ -43,16 +43,16 @@ .container .rightBtn:active { opacity: 0.6; } -.container .otherSystem { +.otherSystem { display: flex; flex-direction: column; gap: 10px; padding: 10px; } -.container .otherSystem span { +.otherSystem span { color: #fff; cursor: pointer; } -.container .otherSystem span:hover { - color: #1CC0FF; +.otherSystem span:hover { + color: #1cc0ff; } diff --git a/src/pages/NewHome/NewRightContent/ResourceElements/components/Card/index.less b/src/pages/NewHome/NewRightContent/ResourceElements/components/Card/index.less index cc6d9ba2b81d13f2bc361370238c64619ed82a90..9060f630a027cd992aa3d686c86fc38f98bb4eee 100644 --- a/src/pages/NewHome/NewRightContent/ResourceElements/components/Card/index.less +++ b/src/pages/NewHome/NewRightContent/ResourceElements/components/Card/index.less @@ -55,21 +55,6 @@ opacity: 0.6; } } - // .rightBtn { - // width: 24px; - // height: 24px; - // border-radius: 12px; - // background: linear-gradient(180deg, #1CC0FF 0%, #5294FF 100%); - // display: flex; - // align-items: center; - // justify-content: center; - // cursor: pointer; - // opacity: 0.2; - - // &:not(.bindClick) { - // opacity: 1; - // } - // } } .otherSystem { display: flex; diff --git a/src/pages/NewHome/NewRightContent/ResourceElements/components/Card/index.tsx b/src/pages/NewHome/NewRightContent/ResourceElements/components/Card/index.tsx index 50256ad6f85c1953f17eaf40e9c720cad0c9db47..5df213ac59082dcf2458e0ddff24438e7efe42fc 100644 --- a/src/pages/NewHome/NewRightContent/ResourceElements/components/Card/index.tsx +++ b/src/pages/NewHome/NewRightContent/ResourceElements/components/Card/index.tsx @@ -1,8 +1,9 @@ -import { RightOutlined } from '@ant-design/icons'; +// import { RightOutlined } from '@ant-design/icons'; import { ConfigProvider, Flex, Popover } from 'antd'; import classNames from 'classnames'; import React, { PropsWithChildren } from 'react'; import styles from './index.less'; +import rightBack from '@/assets/images/newMain/rightBack.png'; interface PropsType { title: string; @@ -55,7 +56,7 @@ const Card: React.FC> = (props) => { [styles.bindClick]: !Boolean(jumpSystem?.length), })} > - +