commit f8f8184430dc6bc268f620a2d611051e7b97ded6
author zhaoyumao <2451882060@qq.com> Mon Jun 09 00:00:46 2025 +0800
committer zhaoyumao <2451882060@qq.com> Mon Jun 09 00:00:46 2025 +0800
tree e14e9240edd660858016446fa68dd38b57c69fdd
parent 4367e46811418aa4c48df8e4eb267d6802204597

合并冲突

Change-Id: I3b6ac5ae87aad8fe746eceecc8f92fc5574b50a8

src/pages/User/Center/index.tsx

diff --git a/src/pages/User/Center/index.tsx b/src/pages/User/Center/index.tsx
index 2ce308c..8622219 100644
--- a/src/pages/User/Center/index.tsx
+++ b/src/pages/User/Center/index.tsx
@@ -38,11 +38,11 @@
 export type tabKeyType = 'base' | 'password';
 
 const Center: React.FC = () => {
-  
+
   const [tabKey, setTabKey] = useState<tabKeyType>('base');
-  
+
   const [cropperModalOpen, setCropperModalOpen] = useState<boolean>(false);
-  
+
   //  获取用户信息
   const { data: userInfo, loading } = useRequest(async () => {
     return { data: await getUserInfo()};
@@ -188,7 +188,7 @@
       </Row>
       <AvatarCropper
         onFinished={() => {
-          setCropperModalOpen(false);     
+          setCropperModalOpen(false);
         }}
         open={cropperModalOpen}
         data={currentUser.avatar}

src/pages/User/Login/index.tsx

diff --git a/src/pages/User/Login/index.tsx b/src/pages/User/Login/index.tsx
index 585f97b..e29032e 100644
--- a/src/pages/User/Login/index.tsx
+++ b/src/pages/User/Login/index.tsx
@@ -85,7 +85,7 @@
 };
 
 const Login: React.FC = () => {
-  const [userLoginState, setUserLoginState] = useState<API.LoginResult>({code: 200});
+  const [userLoginState, setUserLoginState] = useState<API.LoginResult>({ code: 200 });
   const [type, setType] = useState<string>('account');
   const { initialState, setInitialState } = useModel('@@initialState');
   const [captchaCode, setCaptchaCode] = useState<string>('');
@@ -255,7 +255,7 @@
           }
           subTitle={
             <span style={{ color: '#b3c7f9', fontSize: 16 }}>
-              探索你的专属星球，畅享PT世界
+              探索你的专属星球，畅享PT世界  JRX MSY ZYT HXQ LJB
             </span>
           }
           initialValues={{
@@ -509,7 +509,7 @@
                   color: '#fff',
                   fontSize: 14,
                 }}>
-              <FormattedMessage id="pages.login.rememberMe"  defaultMessage="自动登录" />
+                <FormattedMessage id="pages.login.rememberMe" defaultMessage="自动登录" />
               </a>
             </ProFormCheckbox>
             <a