From a0ef17ce87d822dd49fe186548291c9a26099efc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <durian@example.org>
Date: Mon, 16 Mar 2026 16:46:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BB=A5=E5=8F=8A=E8=A7=A3=E5=86=B3=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/loginRegister/LoginRegisterPage.jsx    | 2 +-
 src/modules/loginRegister/Register.jsx             | 2 +-
 src/modules/loginRegister/component/otherLogin.jsx | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/loginRegister/LoginRegisterPage.jsx b/src/modules/loginRegister/LoginRegisterPage.jsx
index 2eaea2625..0e93eaa0d 100644
--- a/src/modules/loginRegister/LoginRegisterPage.jsx
+++ b/src/modules/loginRegister/LoginRegisterPage.jsx
@@ -42,7 +42,7 @@ function LoginRegisterPage(props){
           <ResetPassword mygetHelmetapi={mygetHelmetapi}/>
           : 
           props.location.pathname === "/register" ? 
-          <Register mygetHelmetapi={mygetHelmetapi}/> 
+          <Register mygetHelmetapi={mygetHelmetapi} {...props}/> 
           : 
           <Login {...props}/>
         }
diff --git a/src/modules/loginRegister/Register.jsx b/src/modules/loginRegister/Register.jsx
index 171c03c9c..1cda2145c 100644
--- a/src/modules/loginRegister/Register.jsx
+++ b/src/modules/loginRegister/Register.jsx
@@ -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',{
diff --git a/src/modules/loginRegister/component/otherLogin.jsx b/src/modules/loginRegister/component/otherLogin.jsx
index 3ee8e4fd4..e92a7feda 100644
--- a/src/modules/loginRegister/component/otherLogin.jsx
+++ b/src/modules/loginRegister/component/otherLogin.jsx
@@ -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>