diff --git a/src/App.js b/src/App.js
index 10988cae7..6377ab24d 100644
--- a/src/App.js
+++ b/src/App.js
@@ -112,7 +112,7 @@ const Relaction = Loadable({
loading: Loading,
});
const LoginRegisterPage = Loadable({
- loader: () => import("./modules/loginRegister/LoginRegisterPage"),
+ loader: () => import("./modules/loginRegister/LoginRegisterPageNew"),
loading: Loading,
});
diff --git a/src/modules/loginRegister/LoginNew.jsx b/src/modules/loginRegister/LoginNew.jsx
new file mode 100644
index 000000000..7c7589986
--- /dev/null
+++ b/src/modules/loginRegister/LoginNew.jsx
@@ -0,0 +1,149 @@
+import React, { useEffect, useState } from "react";
+import { Form, Input, Button, Checkbox , Tooltip } from "antd";
+import { Link } from "react-router-dom";
+import axios from 'axios';
+// import educoderLogo from '../login/educoder.png';
+// import qqlogo from '../login/qq@2x.png';
+// import WeChatlogo from '../login/WeChat@2x.png';
+// import giteelogo from '../login/gitee.png';
+// import githublogo from '../login/github.png';
+import cookie from 'react-cookies';
+import './LoginRegisterPageNew.scss';
+import { Encrypt } from "../../common/Env";
+
+function Login(props){
+ const [message,setMessage] = useState();
+ // const [setting, setSetting] = useState(undefined);
+ const {form, location, mygetHelmetapi} = props;
+ const {getFieldDecorator } = form;
+ const {search} = location;
+
+
+ useEffect(()=>{
+ //控制密码输入框在DOM不可见value
+ clear();
+ //获取第三方登录平台信息
+ // setSetting(JSON.parse(localStorage.getItem("chromesetting")));
+ },[])
+
+ // 配置网页标题
+ useEffect(()=>{
+ if(mygetHelmetapi){
+ const {name} = mygetHelmetapi;
+ document.title = name;
+ }
+ }, [mygetHelmetapi])
+
+ // 登录表单提交
+ function handleSubmit(){
+ setMessage(undefined);
+ form.validateFields((err, values) => {
+ if (!err) {
+ axios.post(`/accounts/login.json`, {
+ login: values.username,
+ password: Encrypt(values.password),
+ autologin: values.remember?1:0,
+ }).then((response) => {
+ if (!response.data.login) {
+ response.data.status === -2 ? setMessage(response.data.message) : setMessage("错误的账号或密码");
+ } else {
+ //判断用户是否选择【下次自动登录】
+ cookie.save('autologin',values.remember);
+ cookie.save('supplyphone',true);
+ cookie.save("login",response.data.login);
+
+ const searchParams = new URLSearchParams(search.substring(1));
+ const goPage = searchParams.get("go_page");
+ //意见反馈
+ window.location.href = goPage ? goPage : `/${response.data.login}`
+ }
+ }).catch((error) => {
+ console.log('error',error);
+ })
+ }
+ });
+ }
+
+ //清除密码框的value属性->DOM看不见密码值
+ function clear(){
+ const password = document.getElementById("login_password");
+ if(password && password.type==="password"){
+ setTimeout(()=>{
+ password.removeAttribute('value');
+ },0)
+ }
+ }
+
+
+ return(
+
+
+
+
欢迎登录
+
支持持续成长演化的软件平台-群智开发
+
+
{message}
+
} />)}
+
+
+
+ {getFieldDecorator('password', {
+ rules: [
+ {
+ required:true,
+ message:"请输入登录密码"
+ }
+ ],
+ validateTrigger:"onBlur",
+ })(
+
+
+ {getFieldDecorator('remember', {
+ valuePropName: 'checked',
+ initialValue: cookie.load('autologin'),
+ })(下次自动登录)}
+
+ {/* 忘记密码？ */}
+
+
+
+ 没有账号？去注册
+
+ {
+ // setting && setting.third_party_new && setting.third_party_new.length > 0 ?
+ //
+ //
+ // 快速登录
+ // {setting.third_party_new.map((item,key)=>{
+ // return(
+ //
+ //
+ // 
+ //
+ //
+ // )
+ // })
+ // }
+ //
+ //
+ }
+
+
+ )
+
+}
+export default Form.create({ name: 'login' })(Login);
\ No newline at end of file
diff --git a/src/modules/loginRegister/LoginRegisterPageNew.jsx b/src/modules/loginRegister/LoginRegisterPageNew.jsx
new file mode 100644
index 000000000..7aa6296af
--- /dev/null
+++ b/src/modules/loginRegister/LoginRegisterPageNew.jsx
@@ -0,0 +1,25 @@
+import React from "react";
+import Login from "./LoginNew";
+import Register from "./RegisterNew";
+import ResetPassword from "./ResetPasswordNew";
+import '../loginRegister/LoginRegisterPageNew.scss';
+
+function LoginRegisterPage(props){
+ const {mygetHelmetapi} = props;
+ return(
+
+
+ {props.location.pathname === "/login" ?
+
+ :
+ props.location.pathname === "/register" ?
+
+ :
+
+ }
+
+
+
+
+
+ 欢迎注册 软件发展新技术
+ 已有账号，立即登录
+
+
+
{mess}
+
+ {/*
*/}
+
+
+
+
+ 找回密码
+ 已有账号，立即登录
+
+
{mess}
+
+
+