diff --git a/README.md b/README.md index 6c317f0f826bcd8d122ee1400155499bd9ea5d15..8c152b25560cc8456ab331218003f35eb01a6aa7 100644 --- a/README.md +++ b/README.md @@ -15,4 +15,5 @@ - add chakra-ui #link:https://chakra-ui.com/docs - add react-spring #动画库 link:https://www.react-spring.dev - add use-gesture #手势交互 link:https://use-gesture.netlify.app/docs/ -- add react-quill #富文本编辑器 \ No newline at end of file +- add react-quill #富文本编辑器 +- add qrcode.react #二维码生成 \ No newline at end of file diff --git a/dev.md b/dev.md new file mode 100644 index 0000000000000000000000000000000000000000..8bb924387fa378d460ef63970f651d2fcbffbfd8 --- /dev/null +++ b/dev.md @@ -0,0 +1 @@ +### 开发文档 \ No newline at end of file diff --git a/package.json b/package.json index 475665d5db2e0494ee0cbc8b4025d00c0d45058e..07f6ef81418be5bbd6fd22aec95769155dd6a054 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "react-quill": "^2.0.0", "react-router-dom": "^6.4.3", "react-spring": "^9.6.1", - "sass": "^1.58.0", "zustand": "^4.3.2" }, "devDependencies": { diff --git a/src/store/module/temp.ts b/src/store/module/temp.ts index 97270531bf8a40cfa00040790269a8b99ffe8779..6d03937904b388b634fd308529c7697485261ded 100644 --- a/src/store/module/temp.ts +++ b/src/store/module/temp.ts @@ -2,6 +2,6 @@ import create from 'zustand' let temp: any = (set: Function, get: Function) => ({ headerDom:null, - setHeaderDom: (Dom:any) => set(() => ({ headerDom: Dom})), + setHeaderDom: (Dom:any) => set(() => ({ headerDom: Dom || null})), }); export default create(temp); \ No newline at end of file diff --git a/src/views/login/index.css b/src/views/login/index.css new file mode 100644 index 0000000000000000000000000000000000000000..7a603563cee722d40dd139836ba098dc21c4ab3a --- /dev/null +++ b/src/views/login/index.css @@ -0,0 +1,37 @@ +.main-bg{ + position: absolute; + height: calc(100% - 17vh); + width: 100%; + top: 17vh; + left: 0; + overflow: hidden; + pointer-events: none; + background: url("https://app-cdn.clickup.com/login__bg.8e44616319b55ac1.svg") center 10px no-repeat; + background-size: cover; +} + +.main-bg::before{ + content: ""; + display: block; + position: absolute; + width: 200%; + height: 300%; + top: -100%; + left: -50%; + background: url("https://app-cdn.clickup.com/login__bg-dots.4777a8eaedc1248b.svg"); + transform: rotate(-28deg); +} + + +.main-bg::after{ + content: ""; + display: block; + position: absolute; + width: 100%; + height: 100%; + top: 0; + left: 0; + background: url("https://app-cdn.clickup.com/login__bg-top.f55110285bf7cd54.svg") center top no-repeat; + background-size: 100% 50vh; +} + diff --git a/src/views/login/index.sass b/src/views/login/index.sass deleted file mode 100644 index 9ed6f87b1867518f45289cf677ccb866a6bcfa82..0000000000000000000000000000000000000000 --- a/src/views/login/index.sass +++ /dev/null @@ -1,31 +0,0 @@ -.main-bg - position: absolute - height: calc(100% - 17vh) - width: 100% - top: 17vh - left: 0 - overflow: hidden - pointer-events: none - background: url("https://app-cdn.clickup.com/login__bg.8e44616319b55ac1.svg") center 10px no-repeat - background-size: cover -.main-bg::before - content: "" - display: block - position: absolute - width: 200% - height: 300% - top: -100% - left: -50% - background: url("https://app-cdn.clickup.com/login__bg-dots.4777a8eaedc1248b.svg") - transform: rotate(-28deg) - -.main-bg::after - content: "" - display: block - position: absolute - width: 100% - height: 100% - top: 0 - left: 0 - background: url("https://app-cdn.clickup.com/login__bg-top.f55110285bf7cd54.svg") center top no-repeat - background-size: 100% 50vh diff --git a/src/views/login/index.tsx b/src/views/login/index.tsx index 901ecf4269da7c6c70179bbd2b5a2fd4a0350b79..b23902318906f26b92cdf529dcfd49b50ff6df1b 100644 --- a/src/views/login/index.tsx +++ b/src/views/login/index.tsx @@ -1,9 +1,8 @@ import { Box, Center, Image, Text, FormControl, Divider, FormLabel, Input, Card, CardBody, Button, CardFooter, InputGroup, InputLeftElement, AvatarGroup, Avatar, useToast } from "@chakra-ui/react" import { useState } from "react" import { FaJenkins, FaGrunt } from "react-icons/fa" -import { isEmpty } from "../../utils/iFunction"; import { useNavigate } from 'react-router-dom' -import "./index.sass" +import "./index.css" import store from "../../store"; import {QRCodeSVG} from 'qrcode.react'; function Login() { diff --git a/src/views/settingMenu/index.tsx b/src/views/settingMenu/index.tsx index ef5b0815613009d0634b6be973e0c0cacd2328ae..f52c97b5fd5dc773c2471ad56a2d7a0a238371e9 100644 --- a/src/views/settingMenu/index.tsx +++ b/src/views/settingMenu/index.tsx @@ -1,65 +1,52 @@ -import { Box, Text, Button } from "@chakra-ui/react" -import { useState } from "react"; +import { Box, Text, Button,FormControl,FormLabel, Switch } from "@chakra-ui/react" +import { useEffect, useState } from "react"; import store from "../../store"; -import { - Accordion, - AccordionItem, - AccordionButton, - AccordionPanel, - AccordionIcon, -} from '@chakra-ui/react' function SettingMenu() { const getARoute = store.auth(((state: { isAllRoute: Object }) => state.isAllRoute)); const [menu, setMenu] = useState(getARoute); const iAddDom = store.temp(((state: { setHeaderDom: Function }) => state.setHeaderDom)) - const [name, setName] = useState("heihei"); - const addDom = () => { - iAddDom() - } + const [showPrv, setShowPrv] = useState(false); + iAddDom( + + + 开启预览？ + + setShowPrv(!showPrv)} /> + + ) + useEffect(() => { + return () => { + iAddDom(); + } + }, []); return ( - - {name} - - - - - 预览 - - - - - { + + + { menu.menu_list.map((item: any, index: any) => ( - - {item.path_list.length > 0 && {item.menu_name}} - { - item.path_list.map((citem: any, cindex: any) => ( - - )) - } - + + {item.path_list.length > 0 && {item.menu_name}} + { + item.path_list.map((citem: any, cindex: any) => ( + + )) + } + )) - } - {menu.order_list.length > 0 && 其他} - { + } + {menu.order_list.length > 0 && 其他} + { menu.order_list.map((citem: any, cindex: any) => ( - + )) - } - - - - - + } + + ) }