Gitlink
/
forgeplus-react
0
0
Fork 37
Code Issues Pull Requests 5 Releases 1 Wiki Activity

Merge pull request '优化第三方登录以及解决报错' (#819) from gitlink_ssr_head into pre_gitlink_ssr

This commit is contained in:
durian 2026-03-16 16:41:52 +08:00
parent 6f63ac9b29 26951984e5
commit 483b6539b3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/loginRegister/LoginRegisterPage.jsx
View File

@ -42,7 +42,7 @@ function LoginRegisterPage(props){
<ResetPassword mygetHelmetapi={mygetHelmetapi}/>
:
props.location.pathname === "/register" ?
<Register mygetHelmetapi={mygetHelmetapi}/>
<Register mygetHelmetapi={mygetHelmetapi} {...props}/>
:
<Login {...props}/>
}

2
src/modules/loginRegister/Register.jsx
View File

@ -270,7 +270,7 @@ function Register(props){
],
validateTrigger:"onBlur",
validateFirst: true,
})(<Input autoFocus placeholder="请输入4-15位用户名，以字母开头，只能使用字母和数字" autoComplete="off"/>)}
})(<Input placeholder="请输入4-15位用户名，以字母开头，只能使用字母和数字" autoComplete="off"/>)}
</Form.Item>
<Form.Item>
{getFieldDecorator('email',{

4
src/modules/loginRegister/component/otherLogin.jsx
View File

@ -49,7 +49,7 @@ function OtherLogin({location,main_site_url}){
<div className='dfpanel'>
{setting.third_party_new.map((item,key)=>{
return(
key < 4 && <a onClick={()=>{cookie.remove("go_page");cookie.save("go_page",`${main_site_url}${location.pathname}`,{ expires: 0, path: `/` });window.location.href=`${item.url}`;}} className="ml15 mr15">
key < 4 && <a onClick={()=>{cookie.remove("go_page");cookie.save("go_page",`${main_site_url}${["/login", "/register"].includes(location.pathname) ? '/' : location.pathname}`,{ expires: 0, path: `/` });window.location.href=`${item.url}`;}} className="ml15 mr15">
<Tooltip overlayClassName='theTop' title={`使用${item.name === "qq" ? "QQ":item.name === "wechat" ? "微信" : item.name}账号登录`}>
<img src={renderLogo(item.name)} width={item.name==="ccf"?"50px":"40px"} alt={`${item.name}登录`}/>
</Tooltip>
@ -62,7 +62,7 @@ function OtherLogin({location,main_site_url}){
<Popover placement="left" content={<div className='thirdPanel'>
{
setting.third_party_new.map((i,k)=>{
return k>=4 &&<a onClick={()=>{cookie.remove("go_page");cookie.save("go_page",`${main_site_url}${location.pathname}`,{ expires: 0, path: `/` });window.location.href=`${i.url}`;}}>
return k>=4 &&<a onClick={()=>{cookie.remove("go_page");cookie.save("go_page",`${main_site_url}${["/login", "/register"].includes(location.pathname) ? '/' : location.pathname}`,{ expires: 0, path: `/` });window.location.href=`${i.url}`;}}>
<Tooltip overlayClassName='theTop' title={`使用${i.name === "qq" ? "QQ":i.name === "wechat" ? "微信" : i.name}账号登录`}>
<img src={renderLogo(i.name)} height={35}/>
</Tooltip>