diff --git a/src/assets/fonts/YA9dr0Wd4kDdMthQOCfzsw.woff2 b/src/assets/fonts/YA9dr0Wd4kDdMthQOCfzsw.woff2 new file mode 100644 index 0000000..14f13f4 Binary files /dev/null and b/src/assets/fonts/YA9dr0Wd4kDdMthQOCfzsw.woff2 differ diff --git a/src/assets/fonts/YA9dr0Wd4kDdMthROCc.woff2 b/src/assets/fonts/YA9dr0Wd4kDdMthROCc.woff2 new file mode 100644 index 0000000..e1ca039 Binary files /dev/null and b/src/assets/fonts/YA9dr0Wd4kDdMthROCc.woff2 differ diff --git a/src/assets/fonts/YA9dr0Wd4kDdMthfOCfzsw.woff2 b/src/assets/fonts/YA9dr0Wd4kDdMthfOCfzsw.woff2 new file mode 100644 index 0000000..08bd5aa Binary files /dev/null and b/src/assets/fonts/YA9dr0Wd4kDdMthfOCfzsw.woff2 differ diff --git a/src/assets/images/photo-1531685250784-7569952593d2.jpg b/src/assets/images/photo-1531685250784-7569952593d2.jpg new file mode 100644 index 0000000..cd79902 Binary files /dev/null and b/src/assets/images/photo-1531685250784-7569952593d2.jpg differ diff --git a/src/assets/images/photo-1629968417850-3505f5180761.jpg b/src/assets/images/photo-1629968417850-3505f5180761.jpg new file mode 100644 index 0000000..ef1ac9d Binary files /dev/null and b/src/assets/images/photo-1629968417850-3505f5180761.jpg differ diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx index 3c20c39..1e740f1 100644 --- a/src/components/Footer/index.tsx +++ b/src/components/Footer/index.tsx @@ -1,11 +1,10 @@ -import React from 'react'; +import React from 'react' const FooterComponent: React.FC = () => { + return ( +
+ schisandra ©{new Date().getFullYear()} Created by schisandra +
+ ) +} - return ( -
- schisandra ©{new Date().getFullYear()} Created by schisandra -
- ); -}; - -export default FooterComponent; +export default FooterComponent diff --git a/src/views/404/404.tsx b/src/views/404/404.tsx index ef5e3fe..9c88ce4 100644 --- a/src/views/404/404.tsx +++ b/src/views/404/404.tsx @@ -146,7 +146,13 @@ export default () => {
4
Oops. Looks like you took a wrong turn.
- + diff --git a/src/views/Home/index.tsx b/src/views/Home/index.tsx new file mode 100644 index 0000000..daa9162 --- /dev/null +++ b/src/views/Home/index.tsx @@ -0,0 +1,3 @@ +export default () => { + return
+} diff --git a/src/views/User/Register/index.less b/src/views/User/Login/index.module.less similarity index 92% rename from src/views/User/Register/index.less rename to src/views/User/Login/index.module.less index 284cbf9..2660e05 100644 --- a/src/views/User/Register/index.less +++ b/src/views/User/Login/index.module.less @@ -4,21 +4,27 @@ align-items: center; justify-content: center; flex-direction: column; + position: absolute; + top: 0; + left: 0; + width: 100%; height: 100vh; - width: 100vw; - overflow: auto; + overflow: hidden; +} +.content_content{ + border-radius: 20px; } .login_content { // margin-top: 40px; - // position: relative; - width: 782px; + position: relative; + width: 790px; background-color: rgb(255, 255, 255); // height: 100%; overflow: hidden; box-shadow: rgb(0 0 0 / 15%) 0px 2px 15px; //float: right; - //height: 538px; + height: 550px; position: relative; padding: 30px 0 30px 0; @@ -101,7 +107,7 @@ .mp_code { padding: 0px 60px; - width: 361px; + //width: 361px; height: 490px; background-color: rgb(255, 255, 255); border-right: 0.5px solid rgb(196, 203, 215); diff --git a/src/views/User/Login/index.tsx b/src/views/User/Login/index.tsx index 0aec894..858f9d9 100644 --- a/src/views/User/Login/index.tsx +++ b/src/views/User/Login/index.tsx @@ -14,9 +14,9 @@ import { CSSProperties } from 'react' import { useState } from 'react' import logo from '@/assets/icons/schisandra.svg' import qrCode from '@/assets/images/login_qrcode-landaiqing.jpg' -import './index.less' +import styles from './index.module.less' import { observer } from 'mobx-react' -import FooterComponent from "@/components/Footer"; +import FooterComponent from '@/components/Footer' // import useStore from '@/utils/store/useStore.tsx' type LoginType = 'account' | 'phone' @@ -29,10 +29,10 @@ const iconStyles: CSSProperties = { export default observer(() => { // @ts-ignore - const [generateMpRegCodeData, setGenerateMpRegCodeData] = useState({}) + const [generateMpRegCodeData, setGenerateMpRegCodeData] = useState({}) const [form] = Form.useForm() // @ts-ignore - const [base64Code, setBase64Code] = useState({ data: '' }) + const [base64Code, setBase64Code] = useState({ data: '' }) const clickGetBase64CodeMethod = async () => { await getBase64CodeMethod() } @@ -72,18 +72,18 @@ export default observer(() => { console.log(formData) } return ( -
-
- - - +
+
+ + + - 微信扫码登录 + 微信扫码登录 @@ -93,7 +93,7 @@ export default observer(() => {
微信扫码 - 关注公众号 + 关注公众号
登录更快更安全 @@ -101,19 +101,19 @@ export default observer(() => { } // type="success" showIcon={true} - className={'alert'} + className={styles.alert} icon={} />
- + logo { /> 五味子云相册 -
随时随地分享你的美好瞬间
+
随时随地分享你的美好瞬间
{
- + 注册
- +
) }) diff --git a/src/views/User/Login/index.less b/src/views/User/Register/index.module.less similarity index 94% rename from src/views/User/Login/index.less rename to src/views/User/Register/index.module.less index 284cbf9..28d92f4 100644 --- a/src/views/User/Login/index.less +++ b/src/views/User/Register/index.module.less @@ -4,21 +4,24 @@ align-items: center; justify-content: center; flex-direction: column; + position: absolute; + top: 0; + left: 0; + width: 100%; height: 100vh; - width: 100vw; - overflow: auto; + overflow: hidden; } .login_content { // margin-top: 40px; // position: relative; - width: 782px; + width: 790px; background-color: rgb(255, 255, 255); // height: 100%; overflow: hidden; box-shadow: rgb(0 0 0 / 15%) 0px 2px 15px; //float: right; - //height: 538px; + height: 550px; position: relative; padding: 30px 0 30px 0; @@ -101,7 +104,7 @@ .mp_code { padding: 0px 60px; - width: 361px; + //width: 361px; height: 490px; background-color: rgb(255, 255, 255); border-right: 0.5px solid rgb(196, 203, 215); diff --git a/src/views/User/Register/index.tsx b/src/views/User/Register/index.tsx index 266be85..5649589 100644 --- a/src/views/User/Register/index.tsx +++ b/src/views/User/Register/index.tsx @@ -5,18 +5,18 @@ import { useState } from 'react' import logo from '@/assets/icons/schisandra.svg' // import background from '@/assets/images/background.png' import qrCode from '@/assets/images/login_qrcode-landaiqing.jpg' -import './index.less' +import styles from './index.module.less' import { observer } from 'mobx-react' -import FooterComponent from "@/components/Footer"; +import FooterComponent from '@/components/Footer' // import useStore from '@/utils/store/useStore.tsx' type LoginType = 'phone' export default observer(() => { - // @ts-ignore - const [generateMpRegCodeData, setGenerateMpRegCodeData] = useState({}) + // @ts-expect-error + const [generateMpRegCodeData, setGenerateMpRegCodeData] = useState({}) const [form] = Form.useForm() // @ts-ignore - const [base64Code, setBase64Code] = useState({ data: '' }) + const [base64Code, setBase64Code] = useState({ data: '' }) const clickGetBase64CodeMethod = async () => { await getBase64CodeMethod() } @@ -47,18 +47,18 @@ export default observer(() => { console.log(formData) } return ( -
-
+
+
- - + + - 微信扫码登录 + 微信扫码登录 @@ -68,7 +68,7 @@ export default observer(() => {
微信扫码 - 关注公众号 + 关注公众号
登录更快更安全 @@ -76,19 +76,19 @@ export default observer(() => { } // type="success" showIcon={true} - className={'alert'} + className={styles.alert} icon={} />
- + logo { /> 五味子云相册 -
随时随地分享你的美好瞬间
+
随时随地分享你的美好瞬间
{ 注册 - + 登录
- +
) })